Merge lp://qastaging/~rr.clearcorp/openerp-ccorp-addons/6.1-rent into lp://qastaging/openerp-ccorp-addons/7.0
Proposed by
Ronald Rubi
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~rr.clearcorp/openerp-ccorp-addons/6.1-rent |
| Merge into: | lp://qastaging/openerp-ccorp-addons/7.0 |
| Diff against target: |
4285 lines (+3162/-196) (has conflicts) 51 files modified
TODO-6.1/ccorp_account/i18n/es.po (+2/-2) TODO-6.1/ccorp_account/i18n/pt_BR.po (+186/-0) TODO-6.1/ccorp_purchase/i18n/pt_BR.po (+146/-0) TODO-7.0/account_multicompany_relation/account_multicompany_relation.py (+16/-14) TODO-7.0/account_multicompany_relation/i18n/pt_BR.po (+287/-0) TODO-7.0/account_webkit_report_library/common_library.py (+4/-4) TODO-7.0/base_partner_merge_ccorp/i18n/pt_BR.po (+117/-0) TODO-7.0/base_partner_sequence_ccorp/i18n/es.po (+2/-2) TODO-7.0/base_partner_sequence_ccorp/i18n/pt_BR.po (+39/-0) TODO-7.0/base_partner_sequence_ccorp/i18n/sv.po (+2/-2) TODO-7.0/product_cost_group/i18n/pt_BR.po (+33/-0) TODO-7.0/purchase_order_archive/i18n/pt_BR.po (+99/-0) TODO-7.0/rent/rent.py (+12/-9) TODO-7.0/rent/rent_view.xml (+1/-0) account_general_ledger_report/__init__.py (+24/-0) account_general_ledger_report/__openerp__.py (+45/-0) account_general_ledger_report/i18n/es_CR.po (+158/-0) account_general_ledger_report/report/__init__.py (+23/-0) account_general_ledger_report/report/account_general_ledger_report.mako (+181/-0) account_general_ledger_report/report/account_general_ledger_report.py (+177/-0) account_general_ledger_report/report/report.xml (+15/-0) account_general_ledger_report/report_menus.xml (+13/-0) account_general_ledger_report/wizard/__init__.py (+23/-0) account_general_ledger_report/wizard/account_general_ledger_report_wizard.py (+40/-0) account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml (+28/-0) account_invoice_global_discount/i18n/ar.po (+2/-2) account_invoice_global_discount/i18n/es.po (+2/-2) account_invoice_global_discount/i18n/pt_BR.po (+92/-0) account_journal_period_report/i18n/es_CR.po (+110/-0) account_journal_period_report/report/account_journal_period_report.mako (+3/-6) account_journal_period_report/report/account_journal_period_report.py (+25/-2) account_move_reverse/account_move_reverse.py (+1/-1) account_move_reverse/i18n/pt_BR.po (+105/-0) account_voucher_reverse/i18n/pt_BR.po (+38/-0) base_import_exchange_rates/__init__.py (+0/-1) base_import_exchange_rates/__openerp__.py (+19/-6) base_import_exchange_rates/currency_rate_update.py (+102/-102) cic_payroll/i18n/pt_BR.po (+35/-0) hr_payroll_report/report/hr_payroll_report.mako (+14/-2) purchase_order_report/report/purchase_order_report.mako (+39/-22) purchase_order_report/report/purchase_order_report.py (+1/-1) res_currency_sequence/__init__.py (+23/-0) res_currency_sequence/__openerp__.py (+46/-0) res_currency_sequence/i18n/es_CR.po (+42/-0) res_currency_sequence/res_currency_sequence.py (+68/-0) res_currency_sequence/res_currency_sequence_view.xml (+41/-0) sale_order_ccorp_report/i18n/es.po.OTHER (+118/-0) sale_order_ccorp_report/i18n/es_CR.po.OTHER (+192/-0) sale_order_ccorp_report/i18n/pt_BR.po (+118/-0) sale_order_ccorp_report/report/sale_order.mako.OTHER (+166/-0) sale_order_global_discount/sale_order_global_discount.py (+87/-16) Conflict adding file account_general_ledger_report. Moved existing file to account_general_ledger_report.moved. Conflict adding file account_journal_period_report/i18n. Moved existing file to account_journal_period_report/i18n.moved. Text conflict in base_import_exchange_rates/__openerp__.py Text conflict in hr_payroll_report/report/hr_payroll_report.mako Text conflict in purchase_order_report/report/purchase_order_report.mako Conflict adding file res_currency_sequence. Moved existing file to res_currency_sequence.moved. Conflict adding files to sale_order_ccorp_report. Created directory. Conflict because sale_order_ccorp_report is not versioned, but has versioned children. Versioned directory. Conflict adding files to sale_order_ccorp_report/i18n. Created directory. Conflict because sale_order_ccorp_report/i18n is not versioned, but has versioned children. Versioned directory. Contents conflict in sale_order_ccorp_report/i18n/es.po Contents conflict in sale_order_ccorp_report/i18n/es_CR.po Conflict adding files to sale_order_ccorp_report/report. Created directory. Conflict because sale_order_ccorp_report/report is not versioned, but has versioned children. Versioned directory. Contents conflict in sale_order_ccorp_report/report/sale_order.mako Text conflict in sale_order_global_discount/sale_order_global_discount.py |
| To merge this branch: | bzr merge lp://qastaging/~rr.clearcorp/openerp-ccorp-addons/6.1-rent |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ClearCorp drivers | Pending | ||
|
Review via email:
|
|||
Description of the change
[FIX] Fix rent invoicing
To post a comment you must log in.
Unmerged revisions
- 755. By Ronald Rubi
-
[FIX] Fix account_
invoice_ line create when invoice_ type='product' - 754. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 753. By Ronald Rubi
-
[FIX] Fix invoice_type in account invoice line, rent module
- 752. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 751. By Ronald Rubi
-
[MRG] Fix account_
move_reverse, bad matching lines - 750. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 749. By Ronald Rubi
-
[MRG] Workaround functional fields in sale_order
- 748. By Ronald Rubi
-
[MRG] Fix duplicate in account_moves
- 747. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 746. By Ronald Rubi
-
[MRG] Delete spaces in hr_payroll_
report/ report/ hr_payroll_ report. mako
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
