← Back to branch summary

~prestashoperpconnect-core-editors/prestashoperpconnect/7.0

~prestashoperpconnect-core-editors/prestashoperpconnect/7.0

Viewing all changes in revision 286.

Committer: Arthur Vuillard
Date: 2014-02-05 11:16:49 UTC
mfrom: (276.1.8 prestashoperpconnect-import-product-combinations)
Revision ID: arthur.vuillard@akretion.com-20140205111649-ppsaqqurapamld67

Merge branch lp:~arthru/prestashoperpconnect/import-product-combinations

files added:
prestashoperpconnect/product_combination.py

files modified:
prestashoperpconnect/__init__.py

prestashoperpconnect/__openerp__.py

prestashoperpconnect/product.py

prestashoperpconnect/security/ir.model.access.csv

prestashoperpconnect/unit/binder.py

prestashoperpconnect/unit/import_synchronizer.py

prestashoperpconnect/unit/mapper.py

Show diffs side-by-side

added added

removed removed

prestashoperpconnect/__init__.py

prestashoperpconnect/__openerp__.py

prestashoperpconnect/product.py

prestashoperpconnect/product_combination.py

prestashoperpconnect/security/ir.model.access.csv

prestashoperpconnect/unit/binder.py

prestashoperpconnect/unit/import_synchronizer.py

prestashoperpconnect/unit/mapper.py

Older »