lp://qastaging/~albert-nan/magentoerpconnect/NaN

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/~magentoerpconnect-core-editors/magentoerpconnect/magentoerpconnect_generic

MagentoERPConnect core editors: Pending requested 2010-04-03

Diff: 708 lines (+271/-75)

11 files modified

__init__.py (+3/-2)
__terp__.py (+2/-0)
country.py (+39/-0)
country_view.xml (+38/-0)
invoice.py (+10/-5)
magerp_core.py (+1/-1)
magerp_osv.py (+20/-3)
product.py (+17/-9)
sale.py (+89/-30)
sale_view.xml (+15/-2)
settings/external.mappinglines.template.csv (+37/-23)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

302. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Added context to several calls.

301. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Mergeed latest trunk changes.

300. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Ensure product.product -> export_inventory() function does not return 'None' but 'False'.

299. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Removed 'mag_' prefix in sale.order

298. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-11

[IMP] Several changes including:
- Added country to taxes.
- Added hability to import invoice numbers.

297. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-03

[FIX] Added context in all calls.

296. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-03-30

[FIX] Ensure 'None' is never returned as it's not serializable in XML-RPC protocol. Use False instead.

295. By Jordi Esteve (www.zikzakmedia.com) on 2010-03-26

[ADD] Magento shop - Auto Import

294. By Jordi Esteve (www.zikzakmedia.com) on 2010-03-26

1. [ADD] Schedules functions
run_import_orders_scheduler
run_update_orders_scheduler
run_export_catalog_scheduler
run_export_stock_levels_scheduler
run_update_images_scheduler
2. [BUG] datetime.now() replace for time.strftime('%Y-%m-%d %H:%M:%S')
3. [BUG] shop.last_products_export_date not value (start project and Export Catalog)

293. By openlabs1 <fortune@fortune-laptop> on 2010-03-22

[FIX]Currently all items are shown as is in stock, whether stock exists or not (magento seems stupid). This fix will tell magento whether its available or not