Merge lp://staging/~jfb-tempo-consulting/unifield-server/US-10874 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 6516 |
| Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-server/US-10874 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
2277 lines (+1171/-326) (has conflicts) 22 files modified
bin/addons/account_mcdb/account_view.xml (+4/-0) bin/addons/account_override/account_move_line.py (+22/-0) bin/addons/account_reconciliation/account_move_line.py (+8/-1) bin/addons/account_reconciliation/wizard/account_reconcile.py (+7/-0) bin/addons/base/ir/ir_model.py (+9/-4) bin/addons/finance/account_view.xml (+2/-0) bin/addons/msf_profile/data/patches.xml (+7/-0) bin/addons/msf_profile/i18n/fr_MF.po (+321/-6) bin/addons/msf_profile/msf_profile.py (+11/-0) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-2) bin/addons/register_accounting/__openerp__.py (+0/-1) bin/addons/register_accounting/account_bank_statement.py (+347/-21) bin/addons/register_accounting/account_cash_statement.py (+4/-0) bin/addons/register_accounting/account_move_line.py (+3/-0) bin/addons/register_accounting/account_view.xml (+28/-9) bin/addons/register_accounting/wizard/__init__.py (+1/-22) bin/addons/register_accounting/wizard/auto_book_transfer_error.py (+73/-0) bin/addons/register_accounting/wizard/hard_posting.py (+0/-80) bin/addons/register_accounting/wizard/temp_posting.py (+158/-57) bin/addons/register_accounting/wizard/wizard_hard_posting.xml (+0/-75) bin/addons/register_accounting/wizard/wizard_temp_posting.xml (+161/-47) bin/addons/res_currency_functional/account_move_line_view.xml (+3/-1) 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 |
| To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-server/US-10874 |
| 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
