lp:~sebastien.beau/magentoerpconnect/oerp6.1-stable-minor-improvement

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:magentoerpconnect/oerp6.1-stable

MagentoERPConnect core editors: Pending requested 2013-06-09

Diff: 224 lines (+63/-28)

10 files modified

magentoerpconnect/delivery.py (+3/-2)
magentoerpconnect/invoice.py (+1/-1)
magentoerpconnect/magerp_osv.py (+3/-1)
magentoerpconnect/sale.py (+32/-3)
magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv (+1/-1)
magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv (+0/-10)
magentoerpconnect/stock.py (+3/-0)
magentoerpconnect_bundle_split/sale.py (+6/-6)
magentoerpconnect_magento_invoice/account.py (+14/-3)
magentoerpconnect_product_variant/settings/1.5.0.0/external.mappinglines.template.csv (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

699. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[IMP] magentoerpconnect: to support more kind of filter when doing a search check if the filter is not already a list/tupple if it's the case then we do not put the list in a list

698. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[MERGE] merge with stable and solve conflict

697. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_product_variant: remove broken mapping

696. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_magento_invoice: fix the invoice date, it should be the same in the to system

695. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_bundle_split: fix indentation

694. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[IMP] complete mapping for invoice

693. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[IMP] improve message error when carrier method have an invalid magento code

692. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[REF] refactor the carrier mapping, move it out of the mapping and replace it by a python function. It's more simple to overwrite. This is needed for exemple for the delivery module connected to the French carrier

691. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[FIX] magentoerpconnect: fix import of order without shipping address

690. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[FIX] remove useless "space"