Merge lp://staging/~mukunde/unifield-server/US-11130 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 6500 |
| Proposed branch: | lp://staging/~mukunde/unifield-server/US-11130 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
588 lines (+250/-11) (has conflicts) 16 files modified
bin/addons/account_mcdb/account_analytic_line.py (+74/-1) bin/addons/account_mcdb/account_mcdb.py (+16/-0) bin/addons/account_mcdb/mcdb_view_account.xml (+5/-1) bin/addons/account_mcdb/report/combined_journals_report.mako (+10/-4) bin/addons/account_mcdb/report/combined_journals_report.py (+6/-2) bin/addons/account_mcdb/report/combined_journals_report.rml (+9/-3) bin/addons/account_override/account_move_line.py (+69/-0) bin/addons/account_override/res_company.py (+2/-0) bin/addons/finance/account_analytic_line_view.xml (+2/-0) bin/addons/msf_instance/msf_instance_company_configuration.xml (+3/-0) bin/addons/msf_profile/data/patches.xml (+6/-0) bin/addons/msf_profile/i18n/fr_MF.po (+29/-0) bin/addons/msf_profile/msf_profile.py (+9/-0) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+4/-0) bin/addons/res_currency_functional/account_move_line_view.xml (+2/-0) bin/addons/sync_common/common.py (+4/-0) Text conflict in bin/addons/msf_profile/data/patches.xml Text conflict in bin/addons/msf_profile/i18n/fr_MF.po Text conflict in bin/addons/msf_profile/msf_profile.py Text conflict in bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv Text conflict in bin/addons/sync_common/common.py |
| To merge this branch: | bzr merge lp://staging/~mukunde/unifield-server/US-11130 |
| 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
