Merge lp:~julie-w/unifield-server/US-1293 into lp:unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 4201 |
| Proposed branch: | lp:~julie-w/unifield-server/US-1293 |
| Merge into: | lp:unifield-server |
| Diff against target: |
194 lines (+96/-6) (has conflicts) 7 files modified
bin/addons/account_override/account.py (+20/-2) bin/addons/finance/account_view.xml (+1/-0) bin/addons/msf_doc_import/account.py (+21/-1) bin/addons/msf_profile/i18n/fr_MF.po (+45/-0) bin/addons/register_accounting/account_bank_statement.py (+1/-1) bin/addons/register_accounting/account_move_line.py (+4/-1) bin/addons/register_accounting/account_view.xml (+4/-1) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp:~julie-w/unifield-server/US-1293 |
| 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
