Merge lp://staging/~mikel-martin/c2c-rd-addons/6.1 into lp://staging/c2c-rd-addons
Proposed by
Ferdinand
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~mikel-martin/c2c-rd-addons/6.1 |
Merge into: | lp://staging/c2c-rd-addons |
Diff against target: |
19816 lines (+12288/-2613) (has conflicts) 299 files modified
account_asset_austria/__init__.py (+25/-0) account_asset_austria/__openerp__.py (+38/-0) account_asset_austria/account_asset.py (+141/-0) account_asset_austria/account_asset_view.xml (+31/-0) account_cash_discount_61/account.py (+20/-9) account_cash_register_webkit/report/account_cash_register_webkit.mako (+1/-0) account_financial_report_chricar/report/account_balance.py (+1/-1) account_financial_report_chricar/report/account_chart.py (+1/-1) account_financial_report_chricar/report/account_move_line_record.py (+2/-2) account_financial_report_chricar/report/general_ledger.py (+1/-1) account_financial_report_chricar/report/general_ledger_landscape.py (+1/-1) account_financial_report_chricar/report/invoice_list.py (+1/-1) account_invoice_change_date/__init__.py (+25/-0) account_invoice_change_date/__openerp__.py (+41/-0) account_invoice_change_date/account_invoice.py (+104/-0) account_invoice_change_date/account_invoice_view.xml (+108/-0) account_invoice_change_date/i18n/account_invoice_change_date.pot (+84/-0) account_invoice_change_date/i18n/de.po (+87/-0) account_invoice_ebInterface/__init__.py (+35/-0) account_invoice_ebInterface/__openerp__.py (+55/-0) account_invoice_ebInterface/account_invoice.py (+71/-0) account_invoice_ebInterface/ebInterfaceV4.0.xml (+77/-0) account_invoice_ebInterface/installer.py (+51/-0) account_invoice_ebInterface/installer_view.xml (+34/-0) account_invoice_iban_qr_at/__init__.py (+33/-0) account_invoice_iban_qr_at/__openerp__.py (+46/-0) account_invoice_iban_qr_at/account_invoice.py (+107/-0) account_invoice_iban_qr_at/account_qrcode_view.xml (+6/-0) account_invoice_iban_qr_at/i18n/account_invoice_iban_qr_at.pot (+75/-0) account_invoice_iban_qr_at/i18n/de.po (+77/-0) account_invoice_reopen/account_invoice.py (+1/-1) account_invoice_reopen/account_invoice_workflow.xml (+2/-0) account_invoice_webkit/__openerp__.py (+3/-0) account_invoice_webkit/account_invoice.py (+5/-2) account_invoice_webkit/account_invoice_webkit_view.xml (+12/-0) account_invoice_webkit/i18n/de.po (+24/-10) account_invoice_webkit/report/account_invoice_webkit.mako (+87/-37) account_payment_edifact/__init__.py (+0/-1) account_payment_edifact/__openerp__.py (+1/-2) account_payment_edifact/payment_mode.py (+0/-83) account_payment_edifact/payment_mode_view.xml (+0/-16) account_payment_edifact/payment_order.py (+9/-4) account_payment_extension_chricar/__openerp__.py (+1/-1) account_payment_extension_chricar/account_move_line.py (+3/-3) account_payment_sepa/__openerp__.py (+5/-2) account_payment_sepa/pain_001_001_02_austrian_002.xml (+18/-6) account_payment_sepa/pain_001_001_03_austrian_001.xml (+16/-4) account_payment_sepa/payment_order.py (+9/-5) account_payment_sepa/wizard/generate_sepa_view.xml (+1/-11) account_period_U30_at/U30.xml (+92/-0) account_period_U30_at/__init__.py (+35/-0) account_period_U30_at/__openerp__.py (+56/-0) account_period_U30_at/account_period.py (+92/-0) account_period_U30_at/installer.py (+51/-0) account_period_U30_at/installer_view.xml (+34/-0) account_reconcile_constraint/__init__.py (+24/-0) account_reconcile_constraint/__openerp__.py (+41/-0) account_reconcile_constraint/account_move_line.py (+61/-0) analytic_user_function_project/hr_timesheet.py (+2/-2) base_ordered/ordered.py (+6/-0) base_partner_contact/partner.py (+21/-5) base_vat_check/__init__.py (+25/-0) base_vat_check/__openerp__.py (+40/-0) base_vat_check/base_vat.py (+107/-0) base_vat_check/base_vat_view.xml (+21/-0) base_vat_check/i18n/base_vat_check.pot (+48/-0) base_vat_check/i18n/de.po (+47/-0) base_vat_check/installer.py (+50/-0) base_vat_check/installer_view.xml (+34/-0) c2c_account_payment_extension/__init__.py (+2/-0) c2c_account_payment_extension/__openerp__.py (+8/-3) c2c_account_payment_extension/payment_mode.py (+2/-2) c2c_account_payment_extension/payment_order.py (+317/-0) c2c_account_payment_extension/payment_order_view.xml (+20/-0) c2c_account_payment_extension/payment_type.py (+56/-0) c2c_account_payment_extension/payment_type_view.xml (+92/-0) c2c_account_payment_extension/payment_view.xml (+391/-0) c2c_account_payment_extension/security/ir.model.access.csv (+4/-0) c2c_account_payment_extension/wizard/.directory (+5/-0) c2c_account_payment_extension/wizard/account_payment_order.py (+50/-23) c2c_account_tax_rounding/account.py (+1/-1) c2c_austria_extension/__openerp__.py (+4/-4) c2c_budget_chricar/__openerp__.py (+2/-2) c2c_budget_chricar/__terp__.py (+1/-1) c2c_budget_chricar/c2c_budget_item.py (+1/-1) c2c_budget_chricar/c2c_budget_line.py (+1/-1) c2c_budget_chricar/c2c_budget_view.xml (+5/-5) c2c_budget_chricar/c2c_budget_wizard.xml (+5/-5) c2c_budget_chricar/report/budget_by_period.py (+4/-4) c2c_budget_chricar/report/budget_consolidation.py (+4/-4) c2c_budget_chricar/report/budget_vs_reality.py (+4/-4) c2c_budget_chricar/report/compare_versions.py (+4/-4) c2c_budget_chricar/report/helper.py (+1/-1) c2c_budget_chricar/report/report_c2c_budget_item.mako (+1/-0) c2c_budget_report/__openerp__.py (+2/-2) c2c_budget_report/c2c_budget_item.py (+1/-1) c2c_budget_report/c2c_budget_sequence.py (+1/-0) c2c_budget_report/report/report_c2c_budget_item.mako (+5/-1) c2c_partner_address_label/partner.py (+9/-0) c2c_partner_address_label/partner_view.xml (+8/-4) c2c_partner_address_label/report/report_label_test.mako (+1/-0) c2c_product_price_unit/account_invoice.py (+6/-0) c2c_product_price_unit_anglosaxon/__init__.py (+26/-0) c2c_product_price_unit_anglosaxon/__openerp__.py (+40/-0) c2c_product_price_unit_anglosaxon/invoice.py (+187/-0) c2c_project_timesheet/__openerp__.py (+3/-2) c2c_project_timesheet/timesheet_task.py (+103/-7) c2c_project_timesheet/timesheet_task_view.xml (+8/-4) c2c_sequence_fy/__openerp__.py (+1/-0) c2c_sequence_fy/account_move.py (+58/-0) c2c_sequence_fy/ir_sequence.py (+4/-2) c2c_sequence_fy/security/ir.model.access.csv (+3/-0) c2c_stock_accounting/report/print_computed_product.mako (+210/-0) c2c_stock_accounting/report/print_computed_product_col.mako (+1/-0) c2c_stock_accounting/stock.py (+71/-8) c2c_stock_accounting/stock_view.xml (+13/-0) c2c_stock_negative/stock.py (+10/-3) chricar_account_analytic/__openerp__.py (+1/-1) chricar_account_analytic/account_analytic.py (+136/-102) chricar_account_analytic/account_analytic_view.xml (+12/-3) chricar_account_move_line_deloitte/account_move_line_deloitte.py (+24/-10) chricar_account_move_line_deloitte/check_script.sql (+45/-0) chricar_account_move_line_igel/account_move_line_igel.py (+15/-2) chricar_account_move_line_igel/account_move_line_igel_view.xml (+1/-0) chricar_account_period_sum/__openerp__.py (+17/-13) chricar_account_period_sum/chricar_account.py (+31/-19) chricar_account_period_sum/chricar_account_period_sum.py (+228/-137) chricar_account_period_sum/chricar_account_period_sum_trg.py (+271/-480) chricar_account_period_sum/report/report_account_account_tree_sum.mako (+1/-0) chricar_account_period_sum/security/ir.model.access.csv (+1/-1) chricar_bank_vat/bank_account_vat.py (+6/-5) chricar_bank_vat/bank_account_vat_view.xml (+3/-3) chricar_budget/__openerp__.py (+2/-1) chricar_budget/budget.py (+95/-18) chricar_budget/budget_view.xml (+6/-2) chricar_budget/i18n/chricar_budget.pot (+326/-285) chricar_budget/i18n/de.po (+344/-292) chricar_budget_compare/__openerp__.py (+1/-1) chricar_budget_compare/budget_update.xml (+2/-2) chricar_budget_create/budget_view.xml (+1/-1) chricar_budget_create/wizard/budget_create.py (+9/-1) chricar_budget_create/wizard/budget_create_view.xml (+1/-0) chricar_budget_lines/budget_lines_view.xml (+10/-10) chricar_crm_helpdesk/crm_helpdesk_view.xml (+20/-6) chricar_equipment/equipment.py (+1/-1) chricar_equipment/equipment_view.xml (+1/-1) chricar_inventory/__openerp__.py (+2/-1) chricar_inventory/inventory.py (+4/-2) chricar_inventory/inventory_view.xml (+11/-5) chricar_inventory/inventory_webkit_view.xml (+13/-0) chricar_inventory/report/__init__.py (+32/-0) chricar_inventory/report/inventory_webkit.mako (+127/-0) chricar_inventory/report/report_webkit_html.py (+39/-0) chricar_invoice/invoice_view.xml (+1/-1) chricar_liquidity_plan/__openerp__.py (+1/-1) chricar_liquidity_plan/liquidity_plan_view.xml (+1/-1) chricar_modules_blau61/__openerp__.py (+11/-6) chricar_partner_parent_companies/partner_parent_companies.py (+15/-0) chricar_partner_parent_companies/partner_parent_companies_view.xml (+1/-0) chricar_partner_parent_companies/report/report_partner_participations.mako (+1/-0) chricar_room/room_view.xml (+1/-1) chricar_stock_dispo_production_V1/stock_dispo_production.py (+4/-1) chricar_stock_dispo_production_V1/stock_dispo_production_view.xml (+31/-15) chricar_stocklocation_moves/i18n/de.po (+1/-1) chricar_stocklocation_moves/report/print_product_col.mako (+1/-0) chricar_stocklocation_moves/security/ir.model.access.csv (+2/-1) chricar_stocklocation_moves/stocklocation_move.py (+11/-3) chricar_tenant/tenant.py (+96/-2) chricar_tenant/tenant_view.xml (+48/-3) chricar_top/location_income_tax.py (+60/-1) chricar_top/location_income_tax_view.xml (+16/-7) chricar_top/report/__init__.py (+1/-0) chricar_top/report/report_real_estate_location.mako (+215/-0) chricar_top/report/report_real_estate_location.py (+20/-0) chricar_top/report/report_top_sales_folder.mako (+1/-0) chricar_top/report_webkit.xml (+9/-0) chricar_top/top.py (+54/-20) chricar_top/top_view.xml (+99/-66) hr_attendance_sheet_check/__init__.py (+24/-0) hr_attendance_sheet_check/__openerp__.py (+37/-0) hr_attendance_sheet_check/hr_attendance_check.py (+81/-0) hr_attendance_sheet_check/hr_attendance_checkbox.xml (+18/-0) hr_attendance_sheet_check/i18n/de.po (+55/-0) hr_timesheet_invoice_create_ext/__init__.py (+1/-0) hr_timesheet_invoice_create_ext/__openerp__.py (+3/-1) hr_timesheet_invoice_create_ext/hr_timesheet_invoice.py (+32/-0) hr_timesheet_invoice_create_ext/hr_timesheet_invoice_view.xml (+47/-0) hr_timesheet_invoice_create_ext/i18n/de.po (+122/-5) hr_timesheet_invoice_create_ext/i18n/hr_timesheet_invoice_create_ext.pot (+116/-6) hr_timesheet_invoice_create_ext/wizard/hr_timesheet_invoice_create.py (+76/-8) hr_timesheet_invoice_create_ext/wizard/hr_timesheet_invoice_create_view.xml (+1/-0) hr_timesheet_product/__init__.py (+23/-0) hr_timesheet_product/__openerp__.py (+36/-0) hr_timesheet_product/hr_timesheet_product.xml (+19/-0) mail_partner/.directory (+3/-1) mail_partner/mail.py (+5/-4) one2many_sorted/__openerp__.py (+2/-0) partner_erp/.directory (+4/-0) partner_erp/__init__.py (+26/-0) partner_erp/__openerp__.py (+40/-0) partner_erp/partner_erp.py (+77/-0) partner_erp/partner_view.xml (+56/-0) partner_erp/security/group.xml (+17/-0) partner_erp/security/ir.model.access.csv (+3/-0) partner_erp/security/partner_erp_security.xml (+14/-0) product_price_property/.directory (+3/-0) product_price_property/__init__.py (+27/-0) product_price_property/__openerp__.py (+50/-0) product_price_property/product.py (+107/-0) project_date/.directory (+3/-0) project_date/__init__.py (+24/-0) project_date/__openerp__.py (+40/-0) project_date/project_view.xml (+30/-0) project_gantt_webkit/__init__.py (+26/-0) project_gantt_webkit/__openerp__.py (+44/-0) project_gantt_webkit/project.py (+34/-0) project_gantt_webkit/project_view.xml (+13/-0) project_gantt_webkit/report/__init__.py (+32/-0) project_gantt_webkit/report/project_gantt_svg_webkit.mako (+215/-0) project_gantt_webkit/report/report_webkit_html.py (+40/-0) project_notes/.directory (+4/-0) project_notes/__init__.py (+26/-0) project_notes/__openerp__.py (+40/-0) project_notes/project.py (+47/-0) project_notes/project_view.xml (+46/-0) project_real_estate/__init__.py (+25/-0) project_real_estate/__openerp__.py (+55/-0) project_real_estate/i18n/c2c_real_estate.pot (+16/-0) project_real_estate/i18n/de.po (+18/-0) project_real_estate/project.py (+100/-0) project_real_estate/project_real_estate_view.xml (+28/-0) project_real_estate/project_view.xml (+61/-0) project_real_estate/report/__init__.py (+32/-0) project_real_estate/report/project_real_estate.mako (+196/-0) project_real_estate/report/project_real_estate.mako.ok (+154/-0) project_real_estate/report/report_webkit_html.py (+39/-0) project_timesheet_analytic/.directory (+5/-0) project_timesheet_analytic/__init__.py (+24/-0) project_timesheet_analytic/__openerp__.py (+36/-0) project_timesheet_analytic/report/__init__.py (+22/-0) project_timesheet_analytic/report/task_report.py (+50/-0) project_timesheet_analytic/report/task_report.py.20130302.patch (+45/-0) project_timesheet_analytic/report/task_report_view.xml (+19/-0) purchase_landed_costs/purchase.py (+22/-19) purchase_landed_costs/stock.py (+14/-16) purchase_order_webkit/i18n/purchase_order_webkit.pot (+0/-234) purchase_order_webkit/partner_view.xml (+0/-19) purchase_order_webkit/purchase_order_webkit_view.xml (+0/-13) purchase_order_webkit/purchase_view.xml (+0/-36) purchase_order_webkit/report/.directory (+0/-6) purchase_order_webkit/report/purchase_order.mako (+0/-222) purchase_order_webkit_chricar/__init__.py (+32/-0) purchase_order_webkit_chricar/__openerp__.py (+53/-0) purchase_order_webkit_chricar/i18n/de.po (+238/-0) purchase_order_webkit_chricar/i18n/purchase_order_webkit.pot (+234/-0) purchase_order_webkit_chricar/partner_view.xml (+19/-0) purchase_order_webkit_chricar/purchase.py (+127/-0) purchase_order_webkit_chricar/purchase_order_webkit_view.xml (+13/-0) purchase_order_webkit_chricar/purchase_view.xml (+36/-0) purchase_order_webkit_chricar/report/.directory (+6/-0) purchase_order_webkit_chricar/report/__init__.py (+32/-0) purchase_order_webkit_chricar/report/purchase_order.mako (+232/-0) purchase_order_webkit_chricar/report/report_webkit_html.py (+39/-0) report_crm_helpdesk/report/report_crm_helpdesk.mako (+1/-0) report_production_order_badges/report/report_production_order_badges.mako (+1/-0) sale_internal_order/sale.py (+1/-1) sale_order_2_purchase/.directory (+5/-0) sale_order_2_purchase/__init__.py (+28/-0) sale_order_2_purchase/__openerp__.py (+42/-0) sale_order_2_purchase/invoice.py (+47/-0) sale_order_2_purchase/picking.py (+122/-0) sale_order_2_purchase/picking_view.xml (+24/-0) sale_order_2_purchase/sale.py (+284/-0) sale_order_2_purchase/sale_view.xml (+24/-0) sale_order_webkit_chricar/__openerp__.py (+2/-0) sale_order_webkit_chricar/report/report_webkit_html.py (+1/-1) sale_order_webkit_chricar/report/sale_order.mako (+24/-9) sale_order_webkit_chricar/sale.py (+1/-1) sale_order_webkit_chricar/sale_order_webkit_view.xml (+1/-1) scripts/account_level.sql (+1/-0) stock_packing_webkit/i18n/de.po (+94/-125) stock_packing_webkit/report/stock_packing_webkit.mako (+24/-5) stock_packing_webkit/stock_packing.py (+1/-1) stock_picking_production/__openerp__.py (+1/-1) stock_picking_production/stock_view.xml (+1/-1) stock_picking_reopen/stock.py (+37/-18) stock_product_by_location/stock_product_by_location_view.xml (+29/-0) stock_product_zero/report/stock_inventory.mako (+1/-0) table_generate_xml/wizard/wizard_generate_xml.py (+15/-0) timed_job/__init__.py (+32/-0) timed_job/__openerp__.py (+94/-0) timed_job/email_template_data.xml (+17/-0) timed_job/security/ir.model.access.csv (+3/-0) timed_job/timed_job.py (+565/-0) timed_job/timed_job_demo.xml (+70/-0) timed_job/timed_job_view.xml (+107/-0) xml_template/XML_Generator.py (+6/-6) xml_template/ir_attachment.py (+1/-1) xml_template/xml_template.py (+11/-7) Text conflict in account_invoice_webkit/i18n/de.po Text conflict in chricar_account_period_sum/__openerp__.py Text conflict in chricar_budget/i18n/de.po Text conflict in hr_timesheet_invoice_create_ext/i18n/de.po Conflict: can't delete no_gap_SO_PO_PICK because it is not empty. Not deleting. Conflict because no_gap_SO_PO_PICK is not versioned, but has versioned children. Versioned directory. Conflict: can't delete no_gap_SO_PO_PICK/i18n because it is not empty. Not deleting. Conflict because no_gap_SO_PO_PICK/i18n is not versioned, but has versioned children. Versioned directory. Contents conflict in no_gap_SO_PO_PICK/i18n/de.po Conflict: can't delete purchase_order_webkit because it is not empty. Not deleting. Conflict because purchase_order_webkit is not versioned, but has versioned children. Versioned directory. Contents conflict in purchase_order_webkit/__init__.py Contents conflict in purchase_order_webkit/__openerp__.py Conflict: can't delete purchase_order_webkit/i18n because it is not empty. Not deleting. Conflict because purchase_order_webkit/i18n is not versioned, but has versioned children. Versioned directory. Contents conflict in purchase_order_webkit/i18n/de.po Contents conflict in purchase_order_webkit/purchase.py Conflict: can't delete purchase_order_webkit/report because it is not empty. Not deleting. Conflict because purchase_order_webkit/report is not versioned, but has versioned children. Versioned directory. Contents conflict in purchase_order_webkit/report/__init__.py Contents conflict in purchase_order_webkit/report/report_webkit_html.py Text conflict in stock_packing_webkit/i18n/de.po |
To merge this branch: | bzr merge lp://staging/~mikel-martin/c2c-rd-addons/6.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Camptocamp | Pending | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 1316. By mikel <mikel@hide>
-
[FIX] Landed cost calculation error in stock picking whe more tha one line is present
- 1315. By Ferdinand
-
[REF] missing ref
- 1314. By Ferdinand
-
[REF] meaningfull error message
- 1313. By Ferdinand
-
[REF] typo
- 1312. By Ferdinand
-
[REF] missing group by typo
- 1311. By Ferdinand
-
[REF] missing group by
- 1310. By Ferdinand
-
[REF] add "utf-8 -*-" to mako
- 1309. By Ferdinand
-
[REF] add notes to erp access
- 1308. By ferdinand <email address hidden>
-
merge
- 1307. By ferdinand <email address hidden>
-
[REF] make fields longer