Merge lp://staging/~dorian-kemps/unifield-server/US-11046 into lp://staging/unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 6423 |
Proposed branch: | lp://staging/~dorian-kemps/unifield-server/US-11046 |
Merge into: | lp://staging/unifield-server |
Diff against target: |
528 lines (+30/-243) 13 files modified
bin/addons/msf_profile/data/patches.xml (+5/-0) bin/addons/msf_profile/i18n/fr_MF.po (+2/-39) bin/addons/msf_profile/msf_profile.py (+9/-0) bin/addons/product/product.py (+2/-3) bin/addons/product/product_view.xml (+4/-4) bin/addons/product_attributes/product_attributes.py (+6/-1) bin/addons/product_attributes/product_attributes_view.xml (+2/-2) bin/addons/stock/__openerp__.py (+0/-1) bin/addons/stock/product_view.xml (+0/-27) bin/addons/stock/wizard/__init__.py (+0/-1) bin/addons/stock/wizard/stock_change_standard_price.py (+0/-118) bin/addons/stock/wizard/stock_change_standard_price_view.xml (+0/-35) bin/addons/stock_override/stock_view.xml (+0/-12) |
To merge this branch: | bzr merge lp://staging/~dorian-kemps/unifield-server/US-11046 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+438781@code.staging.launchpad.net |
To post a comment you must log in.