lp://staging/~jfb-tempo-consulting/unifield-server/US-7353-no7158
Created by
jftempo
and last modified
- Get this branch:
- bzr branch lp://staging/~jfb-tempo-consulting/unifield-server/US-7353-no7158
Branch merges
Propose for merging
No branches
dependent on this one.
- UniField Reviewer Team: Pending requested
-
Diff: 1067 lines (+577/-73) (has conflicts)17 files modifiedbin/addons/msf_audittrail/data/audittrail_data_products.yml (+1/-1)
bin/addons/msf_doc_import/wizard/wizard_import_product_line.py (+1/-1)
bin/addons/msf_profile/data/patches.xml (+8/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+37/-0)
bin/addons/msf_profile/msf_profile.py (+31/-0)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-1)
bin/addons/product/product.py (+2/-0)
bin/addons/product_asset/product_asset.py (+1/-1)
bin/addons/product_attributes/__openerp__.py (+1/-0)
bin/addons/product_attributes/product_attributes.py (+367/-50)
bin/addons/product_attributes/product_attributes_view.xml (+9/-13)
bin/addons/product_attributes/wizard/__init__.py (+1/-1)
bin/addons/product_attributes/wizard/product_merged.py (+64/-0)
bin/addons/product_attributes/wizard/product_merged_view.xml (+26/-0)
bin/addons/sync_common/common.py (+1/-0)
bin/addons/sync_so/so_po_common.py (+10/-4)
bin/sql_db.py (+15/-1)
Related source package recipes
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/unifield-server
