Merge lp://staging/~camptocamp/openerp-swiss-localization/payment-slip-evolution-dunning-fees-support-nbi into lp://staging/~camptocamp/openerp-swiss-localization/7.0
| Status: | Rejected |
|---|---|
| Rejected by: | Nicolas Bessi - Camptocamp |
| Proposed branch: | lp://staging/~camptocamp/openerp-swiss-localization/payment-slip-evolution-dunning-fees-support-nbi |
| Merge into: | lp://staging/~camptocamp/openerp-swiss-localization/7.0 |
| Diff against target: |
1806 lines (+531/-855) 22 files modified
ChangeLog (+6/-0) l10n_ch_credit_control_payment_slip_report/__init__.py (+3/-2) l10n_ch_credit_control_payment_slip_report/__openerp__.py (+24/-20) l10n_ch_credit_control_payment_slip_report/account.py (+40/-0) l10n_ch_credit_control_payment_slip_report/credit_control_communication.py (+53/-13) l10n_ch_credit_control_payment_slip_report/credit_control_printer.py (+5/-8) l10n_ch_credit_control_payment_slip_report/report.xml (+1/-1) l10n_ch_payment_slip/__openerp__.py (+0/-1) l10n_ch_payment_slip/company.py (+1/-1) l10n_ch_payment_slip/invoice.py (+46/-61) l10n_ch_payment_slip/partner.py (+7/-9) l10n_ch_payment_slip/report/__init__.py (+0/-6) l10n_ch_payment_slip/report/bvr.mako (+0/-304) l10n_ch_payment_slip/report/multi_bvr.mako (+5/-4) l10n_ch_payment_slip/report/multi_report_webkit_html.py (+153/-17) l10n_ch_payment_slip/report/multi_report_webkit_html_view.xml (+108/-4) l10n_ch_payment_slip/report/report_webkit_html.py (+0/-141) l10n_ch_payment_slip/report/report_webkit_html_view.xml (+0/-118) l10n_ch_payment_slip/report/webkit_parser.py (+0/-53) l10n_ch_payment_slip/wizard/bvr_import.py (+79/-51) l10n_ch_payment_slip_base_transaction_id/__init__.py (+0/-2) l10n_ch_payment_slip_base_transaction_id/invoice.py (+0/-39) |
| To merge this branch: | bzr merge lp://staging/~camptocamp/openerp-swiss-localization/payment-slip-evolution-dunning-fees-support-nbi |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yannick Vaucher @ Camptocamp | code review, no tests | Approve | |
| Romain Deheele - Camptocamp | Pending | ||
| Camptocamp | Pending | ||
|
Review via email:
|
|||
Description of the change
To work on OCB depends on lp:~camptocamp/ocb-addons/fix-1308364-nbi
To work on official depends on https:/
Depends on https:/
This commit represtents an evolution of l10n_ch.
It removes duplicated code used for backwarad compatibility on BVR/ESR report. Only Multi-BVR/ESR report will remain.
It fixes multi-BVR/ESR report hack due to following bug:
https:/
It refactors and corrects l10n_ch_
| Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote | # |
| Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote | # |
| Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote | # |
Unmerged revisions
- 217. By Yannick Vaucher @ Camptocamp
-
newish style for self.pool
- 216. By Yannick Vaucher @ Camptocamp
-
[PEP8] in multi_report_
webkit_ html.py - 215. By Yannick Vaucher @ Camptocamp
-
remove import of orm imported twice
- 214. By Yannick Vaucher @ Camptocamp
-
fix indent
- 213. By Yannick Vaucher @ Camptocamp
-
add missing contexts
- 212. By Yannick Vaucher @ Camptocamp
-
TYPO
- 211. By Yannick Vaucher @ Camptocamp
-
add a summary
- 210. By Nicolas Bessi - Camptocamp
-
[FIX] community conventions
- 209. By Nicolas Bessi - Camptocamp
-
[IMP] Change log
- 208. By Nicolas Bessi - Camptocamp
-
[FIX] addons description et version
Made few changes