Merge lp://staging/~jfb-tempo-consulting/unifield-server/US-7353-no7158 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-server/US-7353-no7158 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
1067 lines (+577/-73) (has conflicts) 17 files modified
bin/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) Text conflict in bin/addons/msf_profile/data/patches.xml Text conflict in bin/addons/msf_profile/i18n/fr_MF.po Text conflict in bin/addons/msf_profile/msf_profile.py |
| To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-server/US-7353-no7158 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 5702. By jftempo
-
the active test hell
- 5701. By jftempo
-
US-7353 Show UD
- 5700. By jftempo
-
US-7353: ST+NS must be active
- 5699. By jftempo
-
Filter
- 5698. By jftempo
-
COO: deactivate UD + merge + sync: product is kept active at proj
- 5697. By jftempo
-
Merge prod: m2o autocomplete list must search only on NSL
- 5696. By jftempo
-
Merge all UD prod
- 5695. By jftempo
-
Sync merge: keep cost price
- 5694. By jftempo
-
Sync merge: keep cost and field prices
- 5693. By jftempo
-
Wizard merge: order of checks
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
