Merge lp://qastaging/~ss-dtic/openerp-costa-rica/6.1-bom-price-update into lp://qastaging/openerp-costa-rica/6.1
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~ss-dtic/openerp-costa-rica/6.1-bom-price-update |
Merge into: | lp://qastaging/openerp-costa-rica/6.1 |
Diff against target: |
31209 lines (+29167/-0) (has conflicts) 365 files modified
.bzrignore (+1/-0) LICENSE (+47/-0) TODO-6.1/account_analytic_plans_fix/__init__.py (+35/-0) TODO-6.1/account_analytic_plans_fix/__openerp__.py (+50/-0) TODO-6.1/account_analytic_plans_fix/account_analytic_plans_fix.py (+49/-0) TODO-6.1/account_analytic_rename/__init__.py (+1/-0) TODO-6.1/account_analytic_rename/__openerp__.py (+44/-0) TODO-6.1/account_analytic_rename/account_analytic_rename.py (+60/-0) TODO-6.1/account_analytic_rename/account_analytic_rename_view.xml (+41/-0) TODO-6.1/account_asset_product/__init__.py (+1/-0) TODO-6.1/account_asset_product/__openerp__.py (+11/-0) TODO-6.1/account_asset_product/account_asset_produt.py (+104/-0) TODO-6.1/account_asset_product/account_asset_produt_sequence.xml (+68/-0) TODO-6.1/account_company_shortcut/__init__.py (+1/-0) TODO-6.1/account_company_shortcut/__openerp__.py (+48/-0) TODO-6.1/account_company_shortcut/account_company_shortcut_rename.py (+80/-0) TODO-6.1/account_company_shortcut/account_company_shortcut_rename_view.xml (+25/-0) TODO-6.1/account_journal_template/__init__.py (+1/-0) TODO-6.1/account_journal_template/__openerp__.py (+11/-0) TODO-6.1/account_journal_template/account_journal_template.py (+98/-0) TODO-6.1/account_journal_template/account_journal_template_data.xml (+171/-0) TODO-6.1/account_period_extended_code/__init__.py (+35/-0) TODO-6.1/account_period_extended_code/__openerp__.py (+50/-0) TODO-6.1/account_period_extended_code/account_period_extended_code.py (+60/-0) TODO-6.1/address_name_inc/__init__.py (+1/-0) TODO-6.1/address_name_inc/__openerp__.py (+44/-0) TODO-6.1/address_name_inc/address_name_inc.py (+56/-0) TODO-6.1/address_name_inc/address_name_inc_view.xml (+23/-0) TODO-6.1/ccorp_account/__init__.py (+35/-0) TODO-6.1/ccorp_account/__terp__.py (+61/-0) TODO-6.1/ccorp_account/ccorp_account.py (+53/-0) TODO-6.1/ccorp_account/ccorp_account_demo.xml (+12/-0) TODO-6.1/ccorp_account/ccorp_account_report.xml (+20/-0) TODO-6.1/ccorp_account/ccorp_account_view.xml (+18/-0) TODO-6.1/ccorp_account/ccorp_account_webkit_report.xml (+12/-0) TODO-6.1/ccorp_account/i18n/ccorp_account.pot (+179/-0) TODO-6.1/ccorp_account/i18n/ccorp_account_webkit.pot (+190/-0) TODO-6.1/ccorp_account/i18n/es.po (+182/-0) TODO-6.1/ccorp_account/i18n/es_CR.po (+190/-0) TODO-6.1/ccorp_account/report/__init__.py (+35/-0) TODO-6.1/ccorp_account/report/invoice.mako (+117/-0) TODO-6.1/ccorp_account/report/invoice.py (+54/-0) TODO-6.1/ccorp_account/report/invoice.rml (+319/-0) TODO-6.1/ccorp_account_payment_term/__init__.py (+1/-0) TODO-6.1/ccorp_account_payment_term/__openerp__.py (+44/-0) TODO-6.1/ccorp_account_payment_term/ccorp_account_payment_term.py (+49/-0) TODO-6.1/ccorp_main_company/__init__.py (+34/-0) TODO-6.1/ccorp_main_company/__openerp__.py (+51/-0) TODO-6.1/ccorp_main_company/ccorp_main_company_data.xml (+33/-0) TODO-6.1/ccorp_partner_payment_term/__init__.py (+1/-0) TODO-6.1/ccorp_partner_payment_term/__openerp__.py (+44/-0) TODO-6.1/ccorp_partner_payment_term/ccorp_partner_payment_term.py (+54/-0) TODO-6.1/ccorp_purchase/__init__.py (+35/-0) TODO-6.1/ccorp_purchase/__terp__.py (+59/-0) TODO-6.1/ccorp_purchase/ccorp_purchase.py (+53/-0) TODO-6.1/ccorp_purchase/ccorp_purchase_quotation_webkit_report.xml (+13/-0) TODO-6.1/ccorp_purchase/ccorp_purchase_webkit_report.xml (+13/-0) TODO-6.1/ccorp_purchase/i18n/ccorp_purchase_webkit.pot (+143/-0) TODO-6.1/ccorp_purchase/i18n/es_CR.po (+143/-0) TODO-6.1/ccorp_purchase/report/__init__.py (+36/-0) TODO-6.1/ccorp_purchase/report/purchase_order.mako (+103/-0) TODO-6.1/ccorp_purchase/report/purchase_order.py (+104/-0) TODO-6.1/ccorp_purchase/report/purchase_quotation.mako (+103/-0) TODO-6.1/ccorp_purchase/report/purchase_quotation.py (+104/-0) TODO-6.1/ccorp_report_fonts/__init__.py (+35/-0) TODO-6.1/ccorp_report_fonts/__terp__.py (+51/-0) TODO-6.1/ccorp_report_fonts/ccorp_report_fonts.py (+124/-0) TODO-6.1/ccorp_sale_payment_term/__init__.py (+1/-0) TODO-6.1/ccorp_sale_payment_term/__openerp__.py (+44/-0) TODO-6.1/ccorp_sale_payment_term/ccorp_sale_payment_term.py (+46/-0) TODO-6.1/company_webkit/__init__.py (+1/-0) TODO-6.1/company_webkit/__openerp__.py (+44/-0) TODO-6.1/company_webkit/company_webkit.py (+282/-0) TODO-6.1/company_webkit/company_webkit_view.xml (+28/-0) TODO-6.1/purchase_change_pricelist/__init__.py (+1/-0) TODO-6.1/purchase_change_pricelist/__openerp__.py (+44/-0) TODO-6.1/purchase_change_pricelist/purchase_pricelist_view.xml (+27/-0) TODO-6.1/purchase_change_pricelist/wizard/__init__.py (+25/-0) TODO-6.1/purchase_change_pricelist/wizard/purchase_change_pricelist.py (+90/-0) TODO-6.1/purchase_change_pricelist/wizard/purchase_change_pricelist_view.xml (+31/-0) TODO-6.1/report_webkit_format/__init__.py (+1/-0) TODO-6.1/report_webkit_format/__openerp__.py (+12/-0) TODO-6.1/report_webkit_format/report_webkit_format.py (+65/-0) TODO-6.1/sale_change_pricelist/__init__.py (+1/-0) TODO-6.1/sale_change_pricelist/__openerp__.py (+44/-0) TODO-6.1/sale_change_pricelist/sale_pricelist_view.xml (+27/-0) TODO-6.1/sale_change_pricelist/wizard/__init__.py (+25/-0) TODO-6.1/sale_change_pricelist/wizard/sale_change_pricelist.py (+92/-0) TODO-6.1/sale_change_pricelist/wizard/sale_change_pricelist_view.xml (+31/-0) TODO-6.1/stock_location_rename/__init__.py (+1/-0) TODO-6.1/stock_location_rename/__openerp__.py (+11/-0) TODO-6.1/stock_location_rename/stock_location_rename.py (+70/-0) TODO-6.1/stock_location_rename/stock_location_rename_view.xml (+39/-0) account_account_rename/__init__.py (+23/-0) account_account_rename/__openerp__.py (+53/-0) account_account_rename/account_rename.py (+101/-0) account_account_rename/account_rename_view.xml (+43/-0) account_invoice_global_discount/__init__.py (+24/-0) account_invoice_global_discount/__openerp__.py (+52/-0) account_invoice_global_discount/account_invoice_global_discount.py (+105/-0) account_invoice_global_discount/account_invoice_global_discount_view.xml (+115/-0) account_invoice_global_discount/account_invoice_global_discount_wizard.xml (+9/-0) account_invoice_global_discount/i18n/account_invoice_global_discount.pot (+83/-0) account_invoice_global_discount/i18n/ar.po (+86/-0) account_invoice_global_discount/i18n/es.po (+91/-0) account_invoice_global_discount/i18n/es_ES.po (+86/-0) account_invoice_global_discount/wizard/__init__.py (+35/-0) account_invoice_global_discount/wizard/discount_wizard.py (+87/-0) account_invoice_journal_defaults/__init__.py (+25/-0) account_invoice_journal_defaults/__openerp__.py (+48/-0) account_invoice_journal_defaults/account_invoice_journal_defaults.py (+128/-0) account_invoice_journal_defaults/account_invoice_journal_defaults_view.xml (+69/-0) account_invoice_journal_defaults/i18n/es_CR.po (+77/-0) account_invoice_webkit_report/__init__.py (+24/-0) account_invoice_webkit_report/__openerp__.py (+50/-0) account_invoice_webkit_report/account_invoice_webkit_report.py (+32/-0) account_invoice_webkit_report/ccorp_account_webkit_report.xml (+31/-0) account_invoice_webkit_report/i18n/ccorp_account.pot (+179/-0) account_invoice_webkit_report/i18n/ccorp_account_webkit.pot (+190/-0) account_invoice_webkit_report/i18n/es.po (+182/-0) account_invoice_webkit_report/i18n/es_CR.po (+209/-0) account_invoice_webkit_report/report/__init__.py (+35/-0) account_invoice_webkit_report/report/invoice.mako (+123/-0) account_invoice_webkit_report/report/invoice.py (+54/-0) account_journal_extended_code/__init__.py (+35/-0) account_journal_extended_code/__openerp__.py (+50/-0) account_journal_extended_code/account_journal_extended_code.py (+47/-0) account_journal_view_extended/__init__.py (+34/-0) account_journal_view_extended/__openerp__.py (+51/-0) account_journal_view_extended/account_journal_view_extended_view.xml (+35/-0) account_move_reverse/__init__.py (+23/-0) account_move_reverse/__openerp__.py (+45/-0) account_move_reverse/account_move_reverse.py (+142/-0) account_move_reverse/account_move_reverse_view.xml (+16/-0) account_move_reverse/i18n/account_move_reverse.pot (+83/-0) account_move_reverse/i18n/es_CR.po (+85/-0) account_multicompany_relation/__init__.py (+1/-0) account_multicompany_relation/__openerp__.py (+34/-0) account_multicompany_relation/account_multicompany_relation.py (+279/-0) account_multicompany_relation/account_multicompany_relation.xml (+62/-0) account_multicompany_relation/i18n/account_multicompany_relation.pot (+233/-0) account_multicompany_relation/i18n/es_CR.po (+237/-0) account_template_chart_name/__init__.py (+1/-0) account_template_chart_name/__openerp__.py (+44/-0) account_template_chart_name/account_template_chart_name.py (+45/-0) account_template_chart_name/account_template_chart_name.xml (+43/-0) account_voucher_payment_method/__init__.py (+1/-0) account_voucher_payment_method/__openerp__.py (+13/-0) account_voucher_payment_method/account_voucher_payment_method.py (+203/-0) account_voucher_payment_method/account_voucher_payment_method.xml (+169/-0) account_voucher_reverse/__init__.py (+23/-0) account_voucher_reverse/__openerp__.py (+48/-0) account_voucher_reverse/account_voucher_reverse.py (+64/-0) account_voucher_reverse/account_voucher_reverse_view.xml (+76/-0) account_voucher_reverse/i18n/account_voucher_reverse.pot (+37/-0) account_voucher_reverse/i18n/es_CR.po (+43/-0) account_voucher_reverse/workflow/account_voucher_reverse_workflow.xml (+21/-0) account_webkit_report_library/__init__.py (+24/-0) account_webkit_report_library/__openerp__.py (+46/-0) account_webkit_report_library/common_library.py (+306/-0) account_webkit_report_library/res_company.py (+39/-0) account_webkit_report_library/res_company_view.xml (+23/-0) account_webkit_report_library/webkit_headers/main.css (+237/-0) account_webkit_report_library/webkit_headers/main.js (+15/-0) account_webkit_report_library/webkit_headers/webkit_headers.xml (+109/-0) base_company_prefix/__init__.py (+1/-0) base_company_prefix/__openerp__.py (+13/-0) base_company_prefix/base_company_prefix.py (+47/-0) base_company_prefix/base_company_prefix.xml (+42/-0) base_currency_symbol/__init__.py (+35/-0) base_currency_symbol/__terp__.py (+55/-0) base_currency_symbol/base_currency_symbol.py (+48/-0) base_currency_symbol/base_currency_symbol_data.xml (+14/-0) base_currency_symbol/base_currency_symbol_view.xml (+21/-0) base_import_exchange_rates/__init__.py (+33/-0) base_import_exchange_rates/__terp__.py (+67/-0) base_import_exchange_rates/company.py (+174/-0) base_import_exchange_rates/company_view.xml (+23/-0) base_import_exchange_rates/currency_rate_update.py (+560/-0) base_import_exchange_rates/currency_rate_update.xml (+67/-0) base_import_exchange_rates/i18n/fr_FR.po (+191/-0) base_import_exchange_rates/i18n/pl_PL.po (+192/-0) base_import_exchange_rates/security/security.xml (+67/-0) base_import_exchange_rates/wizard/__init__.py (+30/-0) base_partner_code/__init__.py (+35/-0) base_partner_code/__openerp__.py (+50/-0) base_partner_code/base_partner_code.py (+17/-0) base_partner_code/base_partner_code_view.xml (+46/-0) base_partner_search_extended/__init__.py (+23/-0) base_partner_search_extended/__openerp__.py (+49/-0) base_partner_search_extended/base_partner_rename.py (+71/-0) base_toolbar_custom_actions/__init__.py (+23/-0) base_toolbar_custom_actions/__openerp__.py (+50/-0) base_toolbar_custom_actions/base_toolbar_custom_actions.py (+62/-0) ccorp_payment_receipt/__init__.py (+34/-0) ccorp_payment_receipt/__terp__.py (+59/-0) ccorp_payment_receipt/data.xml (+217/-0) ccorp_payment_receipt/i18n/es_CR.po (+72/-0) ccorp_payment_receipt/payment_receipt_report.xml (+7/-0) ccorp_payment_receipt/report/__init__.py (+35/-0) ccorp_payment_receipt/report/amount_to_text.py (+127/-0) ccorp_payment_receipt/report/header.html (+88/-0) ccorp_payment_receipt/report/payment_receipt.mako (+66/-0) ccorp_payment_receipt/report/payment_receipt.py (+72/-0) ccorp_payment_receipt/report/style.css (+143/-0) hr_contract_name/__init__.py (+22/-0) hr_contract_name/__openerp__.py (+41/-0) hr_contract_name/hr_contract_name.py (+36/-0) hr_payroll_report/__init__.py (+24/-0) hr_payroll_report/__openerp__.py (+41/-0) hr_payroll_report/hr_payroll_report.py (+35/-0) hr_payroll_report/hr_payroll_report_report.xml (+39/-0) hr_payroll_report/i18n/es_CR.po (+179/-0) hr_payroll_report/report/__init__.py (+26/-0) hr_payroll_report/report/hr_payroll_details_report.mako (+178/-0) hr_payroll_report/report/hr_payroll_details_report.py (+92/-0) hr_payroll_report/report/hr_payroll_report.mako (+178/-0) hr_payroll_report/report/hr_payroll_report.py (+92/-0) hr_payroll_sort_employees/__init__.py (+22/-0) hr_payroll_sort_employees/__openerp__.py (+41/-0) hr_payroll_sort_employees/hr_payroll_sort_employees.py (+41/-0) magento_stadistic/__init__.py (+23/-0) magento_stadistic/__openerp__.py (+47/-0) magento_stadistic/magento_stadistic.py (+101/-0) magento_stadistic/magento_stadistic_menu.xml (+15/-0) magento_stadistic/magento_stadistic_view.xml (+104/-0) modules_magento_7/CheckCustomer/CheckCustomerOpenerp/controllers/AccountController.php (+261/-0) modules_magento_7/CheckCustomer/CheckCustomerOpenerp/etc/config.xml (+27/-0) modules_magento_7/ImportOrderToOpenerp/ImportOrder/Model/Observer.php (+149/-0) modules_magento_7/ImportOrderToOpenerp/ImportOrder/controllers/IndexController.php (+10/-0) modules_magento_7/ImportOrderToOpenerp/ImportOrder/etc/config.xml (+41/-0) modules_magento_7/ReviewProductOrder/CheckoutProduct/Model/Observer.php (+184/-0) modules_magento_7/ReviewProductOrder/CheckoutProduct/etc/config.xml (+40/-0) mrp_production_sequence/__init__.py (+22/-0) mrp_production_sequence/__openerp__.py (+41/-0) mrp_production_sequence/mrp_production_sequence.py (+40/-0) mrp_production_sequence/mrp_production_sequence.xml (+18/-0) product_cost_group/__init__.py (+22/-0) product_cost_group/__openerp__.py (+51/-0) product_cost_group/i18n/es_CR.po (+32/-0) product_cost_group/i18n/product_cost_group.pot (+32/-0) product_cost_group/product_cost_group_view.xml (+43/-0) product_cost_group/security/product_cost_group_security.xml (+10/-0) project_project_name_shortcut/__init__.py (+23/-0) project_project_name_shortcut/__openerp__.py (+46/-0) project_project_name_shortcut/project_name_shortcut.py (+66/-0) project_project_name_shortcut/project_name_view.xml (+18/-0) purchase_import/__init__.py (+27/-0) purchase_import/__openerp__.py (+46/-0) purchase_import/import_sequence.xml (+20/-0) purchase_import/import_view.xml (+138/-0) purchase_import/imports.py (+290/-0) purchase_import/product.py (+46/-0) purchase_import/product_view.xml (+20/-0) purchase_import/purchase.py (+41/-0) purchase_import/purchase_import_workflow.xml (+64/-0) purchase_import/tariff.py (+72/-0) purchase_import/tariff_view.xml (+66/-0) purchase_import/voucher_view.xml (+68/-0) purchase_order_ccorp_report/__init__.py (+23/-0) purchase_order_ccorp_report/__openerp__.py (+40/-0) purchase_order_ccorp_report/i18n/es_CR.po (+134/-0) purchase_order_ccorp_report/purchase_order_ccorp_report.xml (+23/-0) purchase_order_ccorp_report/report/__init__.py (+25/-0) purchase_order_ccorp_report/report/purchase_order_report.mako (+115/-0) purchase_order_ccorp_report/report/purchase_order_report.py (+41/-0) purchase_order_discount/__init__.py (+23/-0) purchase_order_discount/__openerp__.py (+40/-0) purchase_order_discount/i18n/es_CR.po (+63/-0) purchase_order_discount/purchase_order_discount.py (+151/-0) purchase_order_discount/purchase_order_discount.xml (+43/-0) purchase_order_sequence/__init__.py (+22/-0) purchase_order_sequence/__openerp__.py (+41/-0) purchase_order_sequence/purchase_order_sequence.py (+41/-0) purchase_order_sequence/purchase_order_sequence.xml (+18/-0) purchase_order_supplier_domain/__init__.py (+22/-0) purchase_order_supplier_domain/__openerp__.py (+41/-0) purchase_order_supplier_domain/purchase_order_supplier_domain.xml (+19/-0) rent/__init__.py (+24/-0) rent/__openerp__.py (+51/-0) rent/i18n/es_CR.po (+1750/-0) rent/rent.py (+1836/-0) rent/rent_contract_report.xml (+6/-0) rent/rent_data.xml (+6/-0) rent/rent_sequence.xml (+18/-0) rent/rent_view.xml (+1457/-0) rent/rent_workflow.xml (+51/-0) rent/report/__init__.py (+23/-0) rent/report/contracts.rml (+77/-0) rent/report/contracts2.rml (+74/-0) rent/report/contracts_report.py (+31/-0) rent/security/ir.model.access.csv (+36/-0) rent/security/rent_security.xml (+50/-0) rent/wizard/__init__.py (+26/-0) rent/wizard/rent_check_invoicing.py (+73/-0) rent/wizard/rent_check_invoicing.xml (+25/-0) rent/wizard/rent_make_group.py (+80/-0) rent/wizard/rent_make_group.xml (+30/-0) sale_order_ccorp_report/__init__.py (+23/-0) sale_order_ccorp_report/__openerp__.py (+51/-0) sale_order_ccorp_report/ccorp_sale_webkit_report.xml (+13/-0) sale_order_ccorp_report/i18n/es.po (+118/-0) sale_order_ccorp_report/i18n/es_CR.po (+177/-0) sale_order_ccorp_report/report/__init__.py (+23/-0) sale_order_ccorp_report/report/footer.html (+34/-0) sale_order_ccorp_report/report/header.html (+59/-0) sale_order_ccorp_report/report/sale_order.mako (+157/-0) sale_order_ccorp_report/report/sale_order.py (+54/-0) sale_order_ccorp_report/report/style.css (+131/-0) sale_order_extended/__init__.py (+24/-0) sale_order_extended/__openerp__.py (+48/-0) sale_order_extended/i18n/es_CR.po (+67/-0) sale_order_extended/sale_order_extended.py (+46/-0) sale_order_extended/sale_order_extended_view.xml (+31/-0) sale_order_global_discount/__init__.py (+24/-0) sale_order_global_discount/__openerp__.py (+48/-0) sale_order_global_discount/i18n/es_CR.po (+53/-0) sale_order_global_discount/sale_order_global_discount.py (+106/-0) sale_order_global_discount/sale_order_global_discount_view.xml (+25/-0) sale_order_line_ccorp/__init__.py (+25/-0) sale_order_line_ccorp/__openerp__.py (+40/-0) sale_order_line_ccorp/i18n/es_CR.po (+27/-0) sale_order_line_ccorp/sale_order_line_ccorp.py (+36/-0) sale_order_line_ccorp/sale_order_line_ccorp.xml (+34/-0) sale_order_sequence/__init__.py (+22/-0) sale_order_sequence/__openerp__.py (+41/-0) sale_order_sequence/sale_order_sequence.py (+41/-0) sale_order_sequence/sale_order_sequence.xml (+18/-0) sneldev_magento/__init__.py (+31/-0) sneldev_magento/__openerp__.py (+56/-0) sneldev_magento/common_tools.py (+116/-0) sneldev_magento/i18n/es_CR.po (+439/-0) sneldev_magento/security/ir.model.access.csv (+3/-0) sneldev_magento/security/security.xml (+24/-0) sneldev_magento/sneldev_magento.py (+1578/-0) sneldev_magento/sneldev_magento_data.xml (+6/-0) sneldev_magento/sneldev_magento_menu.xml (+27/-0) sneldev_magento/sneldev_magento_view.xml (+175/-0) sneldev_magento/sneldev_magento_wizard.xml (+114/-0) sneldev_magento/wizard/__init__.py (+11/-0) sneldev_magento/wizard/export_tools.py (+54/-0) sneldev_magento/wizard/sneldev_magento_categories_export.py (+50/-0) sneldev_magento/wizard/sneldev_magento_categories_export.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_categories_import.py (+49/-0) sneldev_magento/wizard/sneldev_magento_categories_import.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_customers_import.py (+52/-0) sneldev_magento/wizard/sneldev_magento_customers_import.xml (+27/-0) sneldev_magento/wizard/sneldev_magento_orders_import.py (+57/-0) sneldev_magento/wizard/sneldev_magento_orders_import.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_products_export.py (+71/-0) sneldev_magento/wizard/sneldev_magento_products_export.xml (+38/-0) sneldev_magento/wizard/sneldev_magento_products_import.py (+52/-0) sneldev_magento/wizard/sneldev_magento_products_import.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_stock_export.py (+50/-0) sneldev_magento/wizard/sneldev_magento_stock_export.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_stock_init.py (+49/-0) sneldev_magento/wizard/sneldev_magento_stock_init.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_sync_start.py (+47/-0) sneldev_magento/wizard/sneldev_magento_sync_start.xml (+30/-0) sneldev_magento/wizard/sneldev_magento_sync_stop.py (+47/-0) sneldev_magento/wizard/sneldev_magento_sync_stop.xml (+30/-0) winpdb_debugger/__init__.py (+23/-0) winpdb_debugger/__terp__.py (+38/-0) winpdb_debugger/winpdb_debugger.py (+68/-0) winpdb_debugger/winpdb_debugger_wizard.xml (+76/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file TODO-6.1. Moved existing file to TODO-6.1.moved. |
To merge this branch: | bzr merge lp://qastaging/~ss-dtic/openerp-costa-rica/6.1-bom-price-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ClearCorp drivers | Pending | ||
Review via email:
|
Unmerged revisions
- 668. By Miguel Gutierrez
-
[IMP] Add license to all pys
- 667. By Miguel Gutierrez
-
[ADD] Adding purchase import
- 666. By Miguel Gutierrez
-
[ADD] Adding product search improve module
- 665. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 664. By Ronald Rubi
-
[MRG] Fix translations for hr_payroll_report module
- 663. By Ronald Rubi
-
[MRG] Add new module purchase_
order_discount that add discount for purchase order and purchase order line. - 662. By Ronald Rubi
-
[MRG] added sale_order_sequence to fix sequenciation in case that the order is not created. Added to improve sequentiation in case that the order is not created. Added mrp_production_
sequence to fix sequentiation issues, modified sale_order_sequence to remove innecesary prints and remove comments - 661. By Launchpad Translations on behalf of clearcorp-drivers
-
Launchpad automatic translations update.
- 660. By Ronald Rubi
-
[MRG] Fix translations ccorp_payment_
receipt/ i18n/es_ CR.po - 659. By Ronald Rubi
-
[MRG] Fix create account.invoice where vals don't have journal_id