lp://staging/magentoerpconnect/oerp6.0-stable

Branch merges

Propose for merging

3 branches proposed for merging into this one.

No branches dependent on this one.

Rejected for merging into lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/oerp7.0-refactor

Guewen Baconnier @ Camptocamp: Needs Information on 2012-07-24

Diff: 1624 lines (+1251/-2) (has conflicts)

18 files modified

magento_product_auto_sku/__init__.py (+21/-0)
magento_product_auto_sku/__openerp__.py (+32/-0)
magento_product_auto_sku/data.xml (+18/-0)
magento_product_auto_sku/product.py (+45/-0)
magentoerpconnect/__openerp__.py (+4/-0)
magentoerpconnect/magerp_core.py (+67/-0)
magentoerpconnect/magerp_core_view.xml (+20/-0)
magentoerpconnect/magerp_data.xml (+50/-1)
magentoerpconnect/partner.py (+4/-0)
magentoerpconnect/partner_view.xml (+34/-0)
magentoerpconnect/product.py (+392/-0)
magentoerpconnect/product_view.xml (+8/-0)
magentoerpconnect/sale.py (+314/-1)
magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv (+64/-0)
magentoerpconnect/stock.py (+41/-0)
order_duplication_patch/__init__.py (+19/-0)
order_duplication_patch/__openerp__.py (+36/-0)
order_duplication_patch/sale.py (+82/-0)

api

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

437. By Sébastien BEAU - http://www.akretion.com on 2011-10-14

[FIX] replace author by MagentoERPconnect Core Editors and replace the website by https://launchpad.net/magentoerpconnect

436. By Sébastien BEAU - http://www.akretion.com on 2011-10-15

[FIX] fix bug when vat country code is not present in the vat number, lp:823297

435. By Guewen Baconnier @ CampToCamp <email address hidden> on 2011-03-29

[IMP] include_in_menu and page_layout attributes on product categories

434. By Sébastien BEAU - http://www.akretion.com on 2011-09-30

[FIX] product discount doesn't work with tax, as by default tax should be supported this functionality is removed and replaced by a simple percentage on each product in order to have a correct taxe on the invoice

433. By Guewen Baconnier @ Camptocamp <email address hidden> on 2011-09-26

[FIX] of previous commit: do not update date on assigned products created early

432. By Guewen Baconnier @ Camptocamp <email address hidden> on 2011-09-26

[FIX] product assign on a non existing product: ensure a product is exported before assign it

431. By Sébastien BEAU - http://www.akretion.com on 2011-09-26

[FIX] fix forgotten lib import

430. By Sharoon Thomas http://openlabs.co.in on 2011-09-15

Fix indentation and a whitespace

429. By Sharoon Thomas http://openlabs.co.in on 2011-09-15

Remove duplicate method

428. By Sharoon Thomas http://openlabs.co.in on 2011-09-15

Fix indentation error