Merge lp://staging/~julie-w/unifield-server/US-9193 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~julie-w/unifield-server/US-9193 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
802 lines (+137/-98) (has conflicts) 7 files modified
bin/addons/msf_printed_documents/printed_report.py (+29/-17) bin/addons/msf_profile/i18n/fr_MF.po (+94/-70) bin/addons/register_accounting/register_accounting_report.xml (+4/-4) bin/addons/register_accounting/report/bank_reconciliation.rml (+1/-1) bin/addons/register_accounting/report/cash_inventory.rml (+4/-4) bin/addons/register_accounting/report/fully_report_xls.mako (+2/-2) bin/tools/translate.py (+3/-0) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp://staging/~julie-w/unifield-server/US-9193 |
| 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
