Merge lp://qastaging/~rr.clearcorp/openerp-ccorp-addons/7.0-base_import_exchange_rates into lp://qastaging/openerp-ccorp-addons/6.1
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~rr.clearcorp/openerp-ccorp-addons/7.0-base_import_exchange_rates |
Merge into: | lp://qastaging/openerp-ccorp-addons/6.1 |
Diff against target: |
27075 lines (+19291/-4407) (has conflicts) 289 files modified
TODO-6.1/company_webkit/__init__.py (+0/-1) TODO-6.1/company_webkit/__openerp__.py (+0/-44) TODO-6.1/company_webkit/company_webkit.py (+0/-282) TODO-6.1/company_webkit/company_webkit_view.xml (+0/-28) TODO-7.0/sneldev_magento/wizard/export_tools.py (+0/-2) TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_export.py (+0/-2) TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_import.py (+1/-4) TODO-7.0/sneldev_magento/wizard/sneldev_magento_customers_import.py (+0/-2) TODO-7.0/sneldev_magento/wizard/sneldev_magento_orders_import.py (+1/-3) TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_export.py (+0/-2) TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_import.py (+0/-3) TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_export.py (+1/-4) TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_init.py (+0/-2) TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_start.py (+1/-3) TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_stop.py (+1/-3) account_account_extended_ccorp/__init__.py (+26/-0) account_account_extended_ccorp/__openerp__.py (+47/-0) account_account_extended_ccorp/account_account_extended_ccorp.py (+31/-0) account_account_extended_ccorp/account_account_extended_ccorp_view.xml (+20/-0) account_account_extended_ccorp/account_move_line_extended.py (+55/-0) account_account_extended_ccorp/account_move_line_extended.xml (+35/-0) account_account_extended_ccorp/i18n/en_US.po (+27/-0) account_account_extended_ccorp/i18n/es_CR.po (+49/-0) account_asset_extended_ccorp/__init__.py (+25/-0) account_asset_extended_ccorp/__openerp__.py (+46/-0) account_asset_extended_ccorp/account_asset_extended_ccorp.py (+77/-0) account_asset_extended_ccorp/account_asset_extended_ccorp_view.xml (+27/-0) account_asset_extended_ccorp/i18n/account_asset_extended.pot (+49/-0) account_asset_extended_ccorp/i18n/es_CR.po (+49/-0) account_general_ledger_report/__init__.py (+24/-0) account_general_ledger_report/__openerp__.py (+47/-0) account_general_ledger_report/i18n/es_CR.po (+280/-0) account_general_ledger_report/report/__init__.py (+23/-0) account_general_ledger_report/report/account_general_ledger_report.mako (+182/-0) account_general_ledger_report/report/account_general_ledger_report.py (+179/-0) account_general_ledger_report/report/report.xml (+16/-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 (+39/-0) account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml (+62/-0) account_invoice_global_discount/__init__.py (+3/-0) account_invoice_global_discount/__openerp__.py (+8/-5) account_invoice_global_discount/account_invoice_global_discount.py (+2/-1) account_invoice_global_discount/account_invoice_global_discount_view.xml (+155/-113) account_invoice_global_discount/account_invoice_global_discount_wizard.xml (+0/-9) account_invoice_global_discount/wizard/__init__.py (+20/-30) account_invoice_global_discount/wizard/discount_wizard.py (+49/-87) account_invoice_global_discount/wizard/discount_wizard_view.xml (+31/-0) account_invoice_journal_defaults/__openerp__.py (+6/-8) account_invoice_journal_defaults/account_invoice_journal_defaults.py (+78/-23) account_invoice_journal_defaults/account_invoice_journal_defaults_view.xml (+23/-11) account_invoice_webkit_report/__openerp__.py (+7/-4) account_invoice_webkit_report/account_invoice_webkit_report.py (+1/-0) account_invoice_webkit_report/account_invoice_webkit_report.xml (+21/-0) account_invoice_webkit_report/ccorp_account_webkit_report.xml (+0/-34) account_invoice_webkit_report/data/account_invoice_webkit_report_header.xml (+239/-0) account_invoice_webkit_report/i18n/ccorp_account.pot (+0/-179) account_invoice_webkit_report/i18n/ccorp_account_webkit.pot (+0/-190) account_invoice_webkit_report/i18n/es.po (+0/-182) account_invoice_webkit_report/i18n/es_CR.po (+26/-46) account_invoice_webkit_report/report/__init__.py (+19/-31) account_invoice_webkit_report/report/account_invoice_report.mako (+137/-0) account_invoice_webkit_report/report/account_invoice_report.py (+41/-0) account_invoice_webkit_report/report/invoice.mako (+0/-123) account_invoice_webkit_report/report/invoice.py (+0/-54) account_invoice_webkit_report/report/report.xml (+14/-0) account_journal_extended_code/__init__.py (+20/-30) account_journal_extended_code/__openerp__.py (+34/-44) account_journal_extended_code/account_journal_extended_code.py (+29/-40) account_journal_period_report/__openerp__.py (+3/-2) account_journal_period_report/i18n/es_CR.po (+105/-0) account_journal_period_report/report/account_journal_period_report.mako (+3/-2) account_journal_period_report/report/report.xml (+1/-3) account_journal_period_report/wizard/__init__.py (+0/-1) account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml (+18/-0) account_journal_view_extended/__init__.py (+0/-34) account_journal_view_extended/__openerp__.py (+0/-51) account_journal_view_extended/account_journal_view_extended_view.xml (+0/-35) account_move_reverse/account_move_reverse.py (+29/-2) account_move_reverse/account_move_reverse_view.xml (+24/-0) account_move_reverse/i18n/account_move_reverse.pot (+0/-83) account_move_reverse/i18n/es_CR.po (+40/-25) account_name_extended/__init__.py (+23/-0) account_name_extended/__openerp__.py (+56/-0) account_name_extended/account_name_extended.py (+393/-0) account_name_extended/account_name_extended_view.xml (+37/-0) account_period_attachment_doc/__init__.py (+23/-0) account_period_attachment_doc/__openerp__.py (+41/-0) account_period_attachment_doc/account_period_attachment_doc.py (+40/-0) account_period_attachment_doc/account_period_attachment_doc.xml (+94/-0) account_period_attachment_doc/i18n/es_CR.po (+66/-0) account_report_lib/__init__.py (+26/-0) account_report_lib/__openerp__.py (+45/-0) account_report_lib/account_common_library.py (+383/-0) account_report_lib/account_financial_report_build.py (+123/-0) account_report_lib/account_report_base.py (+138/-0) account_report_lib/data/account_base_type.xml (+25/-0) account_report_lib/i18n/es_CR.po (+300/-0) account_report_lib/security/ir.model.access.csv (+2/-0) account_report_lib/tools/__init__.py (+25/-0) account_report_lib/tools/tools_amount_to_text.py (+129/-0) account_report_lib/tools/tools_modules_extended.py (+171/-0) account_report_lib/tools/tools_modules_extended.xml (+32/-0) account_report_lib/tools/tools_new_models.py (+37/-0) account_report_lib/wizard/__init__.py (+23/-0) account_report_lib/wizard/account_report_wizard.py (+105/-0) account_report_lib/wizard/account_report_wizard.xml (+60/-0) account_report_signatures/__init__.py (+23/-0) account_report_signatures/__openerp__.py (+40/-0) account_report_signatures/account_report_signature_menu.xml (+11/-0) account_report_signatures/account_report_signatures.py (+35/-0) account_report_signatures/account_report_signatures.xml (+73/-0) account_report_signatures/i18n/es_CR.po (+72/-0) account_report_signatures/security/account_report_signatures_security.xml (+25/-0) account_voucher_payment_method/__init__.py (+22/-0) account_voucher_payment_method/__openerp__.py (+22/-0) account_voucher_payment_method/account_voucher_payment_method.py (+17/-188) account_voucher_payment_method/account_voucher_payment_method.xml (+18/-21) account_voucher_reverse/account_voucher_reverse_view.xml (+7/-7) account_withholding_tax_comissions/__init__.py (+27/-0) account_withholding_tax_comissions/__openerp__.py (+48/-0) account_withholding_tax_comissions/account_journal_withholding_tax.py (+58/-0) account_withholding_tax_comissions/account_journal_withholding_tax.xml (+25/-0) account_withholding_tax_comissions/account_move_withholding_tax.py (+31/-0) account_withholding_tax_comissions/account_voucher_withholding_tax.py (+357/-0) account_withholding_tax_comissions/account_voucher_withholding_tax.xml (+88/-0) account_withholding_tax_comissions/account_withholding_tax.py (+72/-0) account_withholding_tax_comissions/account_withholding_tax.xml (+73/-0) account_withholding_tax_comissions/i18n/es_CR.po (+236/-0) base_company_prefix/base_company_prefix.py (+3/-6) base_company_prefix/base_company_prefix.xml (+1/-6) base_currency_symbol/__init__.py (+18/-30) base_currency_symbol/__openerp__.py (+43/-0) base_currency_symbol/__terp__.py (+0/-55) base_currency_symbol/base_currency_symbol.py (+18/-30) base_import_exchange_rates/__openerp__.py (+23/-10) base_import_exchange_rates/company.py (+1/-3) base_import_exchange_rates/company_view.xml (+15/-9) budget/__init__.py (+31/-0) budget/__openerp__.py (+64/-0) budget/account.py (+679/-0) budget/account_invoice.py (+166/-0) budget/account_invoice_view.xml (+66/-0) budget/account_move.py (+109/-0) budget/account_move_line.xml (+29/-0) budget/account_view.xml (+20/-0) budget/budget.py (+1370/-0) budget/budget_sequence.xml (+17/-0) budget/budget_view.xml (+759/-0) budget/budget_workflow.xml (+189/-0) budget/hr_expense.py (+245/-0) budget/hr_expense_view.xml (+46/-0) budget/hr_expense_workflow.xml (+13/-0) budget/i18n/es_CR.po (+1479/-0) budget/purchase.py (+240/-0) budget/purchase_view.xml (+100/-0) budget/purchase_workflow.xml (+185/-0) budget/res_partner.py (+29/-0) budget/res_partner_view.xml (+20/-0) budget/sale.py (+126/-0) budget/sale_view.xml (+26/-0) budget/security/ir.model.access.csv (+19/-0) budget/security/security.xml (+140/-0) budget/wizard/__init__.py (+24/-0) budget/wizard/budget_import_catalog.py (+107/-0) budget/wizard/budget_import_catalog_view.xml (+34/-0) budget/wizard/budget_program_populate.py (+77/-0) budget/wizard/budget_program_populate_view.xml (+34/-0) cash_flow_report/__init__.py (+26/-0) cash_flow_report/__openerp__.py (+48/-0) cash_flow_report/account_move_reconcile.py (+304/-0) cash_flow_report/cash_flow_type.py (+63/-0) cash_flow_report/cash_flow_type.xml (+80/-0) cash_flow_report/i18n/es_CR.po (+295/-0) cash_flow_report/report/__init__.py (+23/-0) cash_flow_report/report/cash_flow_report.mako (+143/-0) cash_flow_report/report/cash_flow_report.py (+219/-0) cash_flow_report/report/report.xml (+15/-0) cash_flow_report/report_menus.xml (+10/-0) cash_flow_report/wizard/__init__.py (+22/-0) cash_flow_report/wizard/cash_flow_report_wizard.py (+40/-0) cash_flow_report/wizard/cash_flow_report_wizard.xml (+70/-0) ccorp_payment_receipt/__terp__.py (+0/-59) ccorp_payment_receipt/data.xml (+0/-217) ccorp_payment_receipt/report/amount_to_text.py (+0/-127) ccorp_payment_receipt/report/header.html (+0/-88) ccorp_payment_receipt/report/payment_receipt.mako (+0/-66) ccorp_payment_receipt/report/payment_receipt.py (+0/-72) ccorp_payment_receipt/report/style.css (+0/-143) hr_contract_extended/__init__.py (+22/-0) hr_contract_extended/__openerp__.py (+45/-0) hr_contract_extended/hr_contract_extended.py (+117/-0) hr_contract_extended/hr_contract_extended_view.xml (+51/-0) hr_contract_extended/i18n/es_CR.po (+105/-0) hr_contract_extended/i18n/hr_salary_rule_by_contract.pot (+34/-0) hr_contract_extended/security/hr_contract_extended_security.xml (+20/-0) hr_contract_extended/security/ir.model.access.csv (+5/-0) hr_payroll_report/__openerp__.py (+1/-0) hr_payroll_report/hr_payroll_report_report.xml (+4/-2) hr_payroll_report/hr_payroll_report_view.xml (+10/-10) hr_payroll_report/i18n/es_CR.po (+58/-74) hr_payroll_report/report/hr_payroll_details_report.mako (+78/-107) hr_payroll_report/report/hr_payroll_report.mako (+88/-105) hr_personnel_actions/__init__.py (+24/-0) hr_personnel_actions/__openerp__.py (+55/-0) hr_personnel_actions/hr_personnel_actions.py (+123/-0) hr_personnel_actions/hr_personnel_actions_data.xml (+54/-0) hr_personnel_actions/hr_personnel_actions_menu.xml (+23/-0) hr_personnel_actions/hr_personnel_actions_view.xml (+152/-0) hr_personnel_actions/i18n/es_CR.po (+228/-0) hr_personnel_actions/report/__init__.py (+23/-0) hr_personnel_actions/report/parser.py (+28/-0) hr_personnel_actions/report/report_data.xml (+52/-0) payment_receipt_report/__init__.py (+22/-33) payment_receipt_report/__openerp__.py (+44/-0) payment_receipt_report/data/payment_receipt_report_webkit.xml (+223/-0) payment_receipt_report/i18n/es_CR.po (+41/-46) payment_receipt_report/payment_receipt_report.xml (+9/-2) payment_receipt_report/report/__init__.py (+19/-31) payment_receipt_report/report/payment_receipt_report.mako (+65/-0) payment_receipt_report/report/payment_receipt_report.py (+61/-0) project_extended/__init__.py (+0/-23) project_extended/__openerp__.py (+0/-47) project_extended/i18n/es_CR.po (+122/-0) project_extended/i18n/project_extended.pot (+42/-0) project_extended/project_extended.py (+0/-74) project_extended/project_extended_view.xml (+0/-34) project_reports/__openerp__.py (+4/-1) project_reports/i18n/es_CR.po (+115/-78) project_reports/report/project_report.mako (+88/-112) project_reports/report/project_report.py (+1/-0) project_reports/report/report.xml (+2/-4) project_reports/report_menus.xml (+1/-1) project_reports/wizard/project_report_wizard.xml (+11/-11) project_search/__init__.py (+23/-0) project_search/__openerp__.py (+47/-0) project_search/i18n/es_CR.po (+127/-0) project_search/project_search.py (+48/-0) project_search/project_search_view.xml (+20/-0) purchase_order_ccorp_report/purchase_order_ccorp_report.xml (+0/-23) purchase_order_discount/purchase_order_discount.py (+8/-8) purchase_order_discount/purchase_order_discount.xml (+21/-7) purchase_order_report/__init__.py (+2/-1) purchase_order_report/__openerp__.py (+5/-1) purchase_order_report/data/purchase_order_report_webkit.xml (+242/-0) purchase_order_report/i18n/es_CR.po (+53/-49) purchase_order_report/purchase_order_report.py (+43/-0) purchase_order_report/purchase_order_report.xml (+27/-0) purchase_order_report/report/__init__.py (+1/-0) purchase_order_report/report/purchase_order_report.mako (+43/-9) purchase_order_report/report/purchase_order_report.py (+1/-1) report_webkit_lib/__init__.py (+23/-0) report_webkit_lib/__openerp__.py (+44/-0) report_webkit_lib/data/data.xml (+11/-0) report_webkit_lib/data/webkit_headers.xml (+693/-0) report_webkit_lib/i18n/es_CR.po (+37/-0) report_webkit_lib/report_webkit_lib_extend.py (+38/-0) report_webkit_lib/report_webkit_lib_extended_view.xml (+19/-0) 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/__init__.py (+0/-23) sale_order_ccorp_report/__openerp__.py (+0/-51) sale_order_ccorp_report/ccorp_sale_webkit_report.xml (+0/-13) sale_order_ccorp_report/report/__init__.py (+0/-23) sale_order_ccorp_report/report/footer.html (+0/-34) sale_order_ccorp_report/report/header.html (+0/-59) sale_order_ccorp_report/report/sale_order.py (+0/-54) sale_order_ccorp_report/report/style.css (+0/-131) sale_order_extended/__init__.py (+0/-1) sale_order_extended/__openerp__.py (+2/-2) sale_order_extended/sale_order_extended.py (+0/-11) sale_order_extended/sale_order_extended_view.xml (+1/-16) sale_order_global_discount/__openerp__.py (+3/-5) sale_order_global_discount/sale_order_global_discount.py (+41/-0) sale_order_report/__init__.py (+24/-0) sale_order_report/__openerp__.py (+52/-0) sale_order_report/data/sale_order_report_webkit.xml (+242/-0) sale_order_report/i18n/es_CR.po (+182/-0) sale_order_report/report/__init__.py (+23/-0) sale_order_report/report/sale_order_report.mako (+135/-0) sale_order_report/report/sale_order_report.py (+54/-0) sale_order_report/sale_order_report.py (+41/-0) sale_order_report/sale_order_report.xml (+18/-0) winpdb_debugger/__openerp__.py (+13/-14) winpdb_debugger/winpdb_debugger.py (+5/-3) winpdb_debugger/winpdb_debugger_wizard.xml (+47/-69) 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: can't delete sale_order_ccorp_report because it is not empty. Not deleting. Conflict because sale_order_ccorp_report is not versioned, but has versioned children. Versioned directory. Conflict: can't delete sale_order_ccorp_report/i18n because it is not empty. Not deleting. 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: can't delete sale_order_ccorp_report/report because it is not empty. Not deleting. 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/7.0-base_import_exchange_rates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ClearCorp drivers | Pending | ||
Review via email:
|
Description of the change
[ADD] Add dependence res_currency_
Unmerged revisions
- 782. By Ronald Rubi
-
[ADD] Add dependence res_currency_
sequence in base_import_ exchange_ rates - 781. By Ronald Rubi
-
[MRG] Add module res_currency_
sequence - 780. By Ronald Rubi
-
[MRG] Fix account_
move_reverse, bad matching lines - 779. By Ronald Rubi
-
[MRG] Remove description_pad in project_report
- 778. By Ronald Rubi
-
[MRG] Fix duplicate in account_moves
- 777. By Ronald Rubi
-
[MRG] Added autogenerated sequence for Personel Actions
- 776. By Ronald Rubi
-
[MRG] Fixed unreconcile issue in budget_move that implied miscalculation of amounts. Also fixed state change for budget_move in case that payments are unreconciled
- 775. By Ronald Rubi
-
[MRG] New Module Personnel Actions Created
- 774. By Ronald Rubi
-
[MRG]Added expenses features
- 773. By Ronald Rubi
-
[MRG] Module project_search, Colors by Remmaing time in project_extended