← Back to branch summary

~openerp-connector-core-editors/openerp-connector/7.0-e-commerce-addons-shipping-setup-product

~openerp-connector-core-editors/openerp-connector/7.0-e-commerce-addons-shipping-setup-product

Viewing all changes in revision 331.

Committer: Guewen Baconnier
Date: 2013-07-26 16:18:03 UTC
mfrom: (329.2.4 7.0-e-commerce-addons)
Revision ID: guewen.baconnier@camptocamp.com-20130726161803-l42hftulyn3ctnlk

[MRG] from master branch, resolved conflict

files removed:
connector_ecommerce/old_stuff.py

connector_ecommerce/old_xml_stuff.xml

files modified:
connector_ecommerce/payment_method.py

connector_ecommerce/sale.py

Show diffs side-by-side

added added

removed removed

connector_ecommerce/old_stuff.py

connector_ecommerce/old_xml_stuff.xml

connector_ecommerce/payment_method.py

connector_ecommerce/sale.py

Older »