Merge lp://staging/~dorian-kemps/unifield-server/US-11433-11636 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 6508 |
| Proposed branch: | lp://staging/~dorian-kemps/unifield-server/US-11433-11636 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
725 lines (+261/-33) (has conflicts) 6 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+56/-8) bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+28/-2) bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml (+20/-5) bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako (+25/-0) bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+103/-10) bin/addons/msf_supply_doc_export/wizard/po_follow_up_view.xml (+29/-8) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp://staging/~dorian-kemps/unifield-server/US-11433-11636 |
| 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
