Merge lp://qastaging/~camptocamp/account-consolidation/7.0-fix_1334639-afe into lp://qastaging/~account-core-editors/account-consolidation/6.1
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~camptocamp/account-consolidation/7.0-fix_1334639-afe |
| Merge into: | lp://qastaging/~account-core-editors/account-consolidation/6.1 |
| Diff against target: |
5877 lines (+4196/-909) 40 files modified
account_consolidation/__init__.py (+4/-3) account_consolidation/__openerp__.py (+67/-67) account_consolidation/account.py (+56/-59) account_consolidation/account_move_line.py (+52/-0) account_consolidation/account_move_line_view.xml (+30/-0) account_consolidation/account_view.xml (+7/-6) account_consolidation/analysis_view.xml (+39/-0) account_consolidation/company.py (+38/-41) account_consolidation/company_view.xml (+2/-1) account_consolidation/consolidation_menu.xml (+3/-0) account_consolidation/data.xml (+13/-0) account_consolidation/demo/consolidation_demo.xml (+17/-19) account_consolidation/i18n/account_consolidation.pot (+488/-0) account_consolidation/i18n/fr.po (+488/-0) account_consolidation/test/consolidation_checks.yml (+4/-3) account_consolidation/test/test_data.yml (+147/-147) account_consolidation/wizard/consolidation_base.py (+251/-166) account_consolidation/wizard/consolidation_check.py (+91/-84) account_consolidation/wizard/consolidation_check_view.xml (+43/-24) account_consolidation/wizard/consolidation_consolidate.py (+321/-259) account_consolidation/wizard/consolidation_consolidate_view.xml (+39/-30) account_parallel_currency/AUTHORS.txt (+1/-0) account_parallel_currency/__init__.py (+23/-0) account_parallel_currency/__openerp__.py (+56/-0) account_parallel_currency/account.py (+506/-0) account_parallel_currency/account_demo.xml (+504/-0) account_parallel_currency/account_view.xml (+64/-0) account_parallel_currency/company_view.xml (+16/-0) account_parallel_currency/i18n/account_parallel_currency.pot (+343/-0) account_parallel_currency/res_company.py (+33/-0) account_parallel_currency/security/security.xml (+11/-0) account_parallel_currency/test/customer_invoice.yml (+143/-0) account_parallel_currency/test/mapping_parallel_accounts.yml (+25/-0) account_parallel_currency/wizard/__init__.py (+22/-0) account_parallel_currency/wizard/do_mapping.py (+92/-0) account_parallel_currency/wizard/do_mapping.xml (+32/-0) account_parallel_currency_centralized/__init__.py (+21/-0) account_parallel_currency_centralized/__openerp__.py (+40/-0) account_parallel_currency_centralized/account.py (+53/-0) account_parallel_currency_centralized/account_demo.xml (+11/-0) |
| To merge this branch: | bzr merge lp://qastaging/~camptocamp/account-consolidation/7.0-fix_1334639-afe |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lorenzo Battistini (community) | Needs Resubmitting | ||
| Account Core Editors | Pending | ||
|
Review via email:
|
|||
Description of the change
add link module between account_
Note that this MP removes the specific code originally found in account.tax.code, since AFAIK there is no centralized field on this model and I thought it was likely a copy-paste error.
| Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote | # |
Unmerged revisions
- 23. By Alexandre Fayolle - camptocamp
-
new link module account_
parallel_ currency_ centralized linking account_
parallel_ currency and account_ financial_ report_ webkit - 22. By Lorenzo Battistini
-
[MRG] fix usage of undefined field 'centralized'
- 21. By Nicolas Bessi - Camptocamp
-
[FIX] missing domain in multi currency consolidation
- 20. By Vincent Renaville@camptocamp
-
[MRG] - Translations
- Add a check to see if all "normal" account is linked to a consolidated account
- Add label in consolidation check wizard to help the user to understand the check test purpose - 19. By Pedro Manuel Baeza
-
[IMP] Translation template files for all modules.
- 18. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[MRG] This module handles parallel accounting entries based on different currencies.
- 17. By Nicolas Bessi - Camptocamp
-
[MRG] bug fixes for lp:1149429 and lp:1133189
- 16. By Joël Grand-Guillaume @ camptocamp
-
[MIGR] Migration of account_
consolidation to OpenERP version 7.0 - 15. By Guewen Baconnier @ Camptocamp
-
[MIGR] set modules not installable (need migration)
wrong target