Merge lp://staging/~dorian-kemps/unifield-server/US-1022 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~dorian-kemps/unifield-server/US-1022 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
685 lines (+432/-7) (has conflicts) 7 files modified
bin/addons/kit/__openerp__.py (+2/-1) bin/addons/kit/report/__init__.py (+1/-0) bin/addons/kit/report/kit_report.py (+1/-0) bin/addons/kit/report/kitting_order_report.py (+41/-0) bin/addons/kit/report/kitting_order_report.rml (+319/-0) bin/addons/kit/report/kitting_order_report.xml (+15/-0) bin/addons/msf_profile/i18n/fr_MF.po (+53/-6) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp://staging/~dorian-kemps/unifield-server/US-1022 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
