Merge lp:~openerp-community/openobject-addons/pniederlag into lp:openobject-addons

Proposed by jugglefish
Status: Rejected
Rejected by: Olivier Dony (Odoo)
Proposed branch: lp:~openerp-community/openobject-addons/pniederlag
Merge into: lp:openobject-addons
Diff against target: 626869 lines (+612720/-1) (has conflicts)
2569 files modified
__init__.py (+1/-0)
__terp__.py (+33/-0)
account_analytic_package/__terp__.py.OTHER (+43/-0)
account_analytic_package/account_analytic_package.py.OTHER (+161/-0)
account_analytic_progress/__terp__.py.OTHER (+43/-0)
account_anglo_saxon/__init__.py (+26/-0)
account_anglo_saxon/__terp__.py (+44/-0)
account_anglo_saxon/invoice.py (+179/-0)
account_anglo_saxon/product.py (+57/-0)
account_anglo_saxon/product_view.xml (+53/-0)
account_anglo_saxon/purchase.py (+42/-0)
account_anglo_saxon/sale.py (+44/-0)
account_anglo_saxon/stock.py (+64/-0)
account_asset/__terp__.py.OTHER (+173/-0)
account_asset/account_asset.py.OTHER (+803/-0)
account_asset/account_asset_invoice.py.OTHER (+111/-0)
account_asset/account_asset_invoice_view.xml.OTHER (+43/-0)
account_asset/account_asset_view.xml.OTHER (+535/-0)
account_asset/account_asset_wizard.xml.OTHER (+70/-0)
account_asset/i18n/account_asset.pot (+1381/-0)
account_asset/i18n/ca_ES.po (+537/-0)
account_asset/i18n/de.po (+1460/-0)
account_asset/i18n/es.po (+1474/-0)
account_asset/i18n/es_ES.po (+1457/-0)
account_asset/i18n/pl.po (+1468/-0)
account_asset/security/ir.model.access.csv.OTHER (+11/-0)
account_asset/wizard/__init__.py.OTHER (+33/-0)
account_asset/wizard/wizard_asset_abandon.py (+96/-0)
account_asset/wizard/wizard_asset_close.py.OTHER (+79/-0)
account_asset/wizard/wizard_asset_compute.py.OTHER (+122/-0)
account_asset/wizard/wizard_asset_initial.py (+101/-0)
account_asset/wizard/wizard_asset_localisation.py (+71/-0)
account_asset/wizard/wizard_asset_modify.py.OTHER (+89/-0)
account_asset/wizard/wizard_asset_resume.py (+79/-0)
account_asset/wizard/wizard_asset_reval.py (+98/-0)
account_asset/wizard/wizard_asset_usage_createlines.py (+103/-0)
account_balance_reporting/__init__.py (+32/-0)
account_balance_reporting/__terp__.py (+68/-0)
account_balance_reporting/account_balance_report.py (+550/-0)
account_balance_reporting/account_balance_report_reports.xml (+52/-0)
account_balance_reporting/account_balance_report_template.py (+259/-0)
account_balance_reporting/account_balance_report_template_view.xml (+170/-0)
account_balance_reporting/account_balance_report_view.xml (+198/-0)
account_balance_reporting/account_balance_report_wizard.xml (+43/-0)
account_balance_reporting/account_balance_report_workflow.xml (+94/-0)
account_balance_reporting/i18n/account_balance_reporting.pot (+538/-0)
account_balance_reporting/i18n/ca.po (+598/-0)
account_balance_reporting/i18n/ca_ES.po (+577/-0)
account_balance_reporting/i18n/es.po (+598/-0)
account_balance_reporting/i18n/es_ES.po (+573/-0)
account_balance_reporting/i18n/gl.po (+593/-0)
account_balance_reporting/report/__init__.py (+30/-0)
account_balance_reporting/report/generic_non_zero_report.rml (+173/-0)
account_balance_reporting/report/generic_report.rml (+172/-0)
account_balance_reporting/security/ir.model.access.csv (+5/-0)
account_balance_reporting/wizard/__init__.py (+31/-0)
account_balance_reporting/wizard/wizard_calculate.py (+70/-0)
account_balance_reporting/wizard/wizard_print.py (+102/-0)
account_base/__init__.py (+24/-0)
account_base/__terp__.py (+46/-0)
account_base/partner.py (+36/-0)
account_base/partner_view.xml (+24/-0)
account_base/wizard/__init__.py (+23/-0)
account_base/wizard/account_setup.py (+83/-0)
account_base/wizard/account_setup_view.xml (+46/-0)
account_bob_import/bob_import_step_1.py.OTHER (+230/-0)
account_budget_project/__init__.py (+24/-0)
account_budget_project/__terp__.py (+42/-0)
account_budget_project/account_budget_project.py (+49/-0)
account_budget_project/account_budget_project_view.xml (+53/-0)
account_chart_update/__init__.py (+24/-0)
account_chart_update/__terp__.py (+60/-0)
account_chart_update/account.py (+583/-0)
account_chart_update/account_view.xml (+89/-0)
account_chart_update/i18n/account_chart_update.pot (+302/-0)
account_chart_update/i18n/ca.po (+388/-0)
account_chart_update/i18n/ca_ES.po (+323/-0)
account_chart_update/i18n/es.po (+389/-0)
account_chart_update/i18n/es_ES.po (+323/-0)
account_chart_update/security/ir.model.access.csv (+3/-0)
account_coda/__terp__.py.OTHER (+41/-0)
account_coda_2_1_d/__terp__.py.OTHER (+39/-0)
account_financial_report/__init__.py (+25/-0)
account_financial_report/__terp__.py (+52/-0)
account_financial_report/account_report_report.xml (+106/-0)
account_financial_report/account_report_wizard.xml (+96/-0)
account_financial_report/i18n/account_financial_report.pot (+1120/-0)
account_financial_report/i18n/ca.po (+1154/-0)
account_financial_report/i18n/ca_ES.po (+1139/-0)
account_financial_report/i18n/es.po (+1154/-0)
account_financial_report/i18n/es_ES.po (+1132/-0)
account_financial_report/i18n/pl.po (+1149/-0)
account_financial_report/report/__init__.py (+30/-0)
account_financial_report/report/account_balance.py (+281/-0)
account_financial_report/report/account_balance_full.rml (+267/-0)
account_financial_report/report/account_chart.py (+150/-0)
account_financial_report/report/account_chart.rml (+137/-0)
account_financial_report/report/account_move_line.rml (+194/-0)
account_financial_report/report/account_move_line_record.py (+63/-0)
account_financial_report/report/account_move_line_record.rml (+174/-0)
account_financial_report/report/account_move_line_record_h.rml (+186/-0)
account_financial_report/report/general_ledger.py (+412/-0)
account_financial_report/report/general_ledger.rml (+240/-0)
account_financial_report/report/general_ledger_landscape.py (+413/-0)
account_financial_report/report/general_ledger_landscape.rml (+267/-0)
account_financial_report/report/invoice_list.py (+174/-0)
account_financial_report/report/invoice_list.rml (+767/-0)
account_financial_report/report/rml_parse.py (+180/-0)
account_financial_report/wizard/__init__.py (+29/-0)
account_financial_report/wizard/wizard_account_balance_report.py (+131/-0)
account_financial_report/wizard/wizard_account_chart.py (+56/-0)
account_financial_report/wizard/wizard_general_ledger_report.py (+177/-0)
account_financial_report/wizard/wizard_invoice_list_report.py (+121/-0)
account_financial_report/wizard/wizard_print_journal_entries.py (+108/-0)
account_fiscal_position_name/.license (+21/-0)
account_fiscal_position_name/__init__.py (+28/-0)
account_fiscal_position_name/__terp__.py (+48/-0)
account_fiscal_position_name/object/__init__.py (+26/-0)
account_fiscal_position_name/object/account.py (+60/-0)
account_fiscal_position_rule/__init__.py (+28/-0)
account_fiscal_position_rule/__terp__.py (+37/-0)
account_fiscal_position_rule/account_fiscal_position.py (+55/-0)
account_fiscal_position_rule/account_fiscal_position.xml (+6/-0)
account_fiscal_position_rule/account_fiscal_position_view.xml (+117/-0)
account_fiscal_position_rule/account_invoice.xml (+30/-0)
account_fiscal_position_rule/i18n/en_US.po (+139/-0)
account_fiscal_position_rule/i18n/pt_BR.po (+139/-0)
account_fiscal_position_rule/invoice.py (+91/-0)
account_fiscal_position_rule/sale.py (+128/-0)
account_fiscal_position_rule/sale_view.xml (+32/-0)
account_invoice_analytic_required/__terp__.py.OTHER (+39/-0)
account_invoice_currency/__init__.py (+24/-0)
account_invoice_currency/__terp__.py (+41/-0)
account_invoice_currency/account_invoice_view.xml (+34/-0)
account_invoice_currency/i18n/account_invoice_currency.pot (+64/-0)
account_invoice_currency/i18n/ca.po (+83/-0)
account_invoice_currency/i18n/ca_ES.po (+66/-0)
account_invoice_currency/i18n/es.po (+83/-0)
account_invoice_currency/i18n/es_ES.po (+66/-0)
account_invoice_currency/invoice.py (+111/-0)
account_invoice_india/__init__.py (+25/-0)
account_invoice_india/__terp__.py (+50/-0)
account_invoice_india/account_invoice.py (+255/-0)
account_invoice_india/account_invoice_view.xml (+83/-0)
account_invoice_india/account_report.xml (+89/-0)
account_invoice_india/account_sequence.xml (+45/-0)
account_invoice_india/account_wizard.xml (+41/-0)
account_invoice_india/report/__init__.py (+28/-0)
account_invoice_india/report/account_journal.py (+57/-0)
account_invoice_india/report/account_journal.rml (+265/-0)
account_invoice_india/report/aged_trial_balance.py (+204/-0)
account_invoice_india/report/aged_trial_balance.rml (+280/-0)
account_invoice_india/report/general_ledger.py (+132/-0)
account_invoice_india/report/general_ledger.rml (+240/-0)
account_invoice_india/report/invoice.py (+93/-0)
account_invoice_india/report/invoice.rml (+617/-0)
account_invoice_india/report/partner_balance.py (+254/-0)
account_invoice_india/report/partner_balance.rml (+274/-0)
account_invoice_india/report/report_third_party_ledger.py (+229/-0)
account_invoice_india/report/third_party_ledger.rml (+269/-0)
account_invoice_india/wizard/__init__.py (+28/-0)
account_invoice_india/wizard/account_chart_wizard.py (+80/-0)
account_invoice_india/wizard/account_create.py (+141/-0)
account_invoice_india/wizard/wizard_aged_trial_balance.py (+111/-0)
account_invoice_india/wizard/wizard_journal_ledger.py (+67/-0)
account_invoice_india/wizard/wizard_partner_balance_report.py (+77/-0)
account_invoice_india/wizard/wizard_third_party_ledger.py (+75/-0)
account_invoice_number/__terp__.py.OTHER (+43/-0)
account_invoice_number/account_invoice_number.py.OTHER (+32/-0)
account_invoice_payment_term/report/invoice.rml.OTHER (+605/-0)
account_invoice_salesman/i18n/account_invoice_salesman.pot (+37/-0)
account_invoice_salesman/i18n/fr.po (+37/-0)
account_invoice_salesman/i18n/fr_FR.po (+37/-0)
account_payment_epassporte/__init__.py (+28/-0)
account_payment_epassporte/__terp__.py (+61/-0)
account_payment_epassporte/epassporte.py (+321/-0)
account_payment_epassporte/epassporte_view.xml (+50/-0)
account_payment_epassporte/epassporte_wizard.xml (+11/-0)
account_payment_epassporte/security/ir.model.access.csv (+5/-0)
account_payment_epassporte/wizard/__init__.py (+26/-0)
account_payment_epassporte/wizard/epassporte.py (+103/-0)
account_payment_extension/__init__.py.OTHER (+27/-0)
account_payment_extension/__terp__.py.OTHER (+61/-0)
account_payment_extension/account_invoice.py.OTHER (+77/-0)
account_payment_extension/account_move_line.py.OTHER (+173/-0)
account_payment_extension/i18n/account_payment_extension.pot.OTHER (+454/-0)
account_payment_extension/i18n/ca.po (+537/-0)
account_payment_extension/i18n/ca_ES.po.OTHER (+533/-0)
account_payment_extension/i18n/es.po (+533/-0)
account_payment_extension/i18n/es_ES.po.OTHER (+529/-0)
account_payment_extension/payment.py.OTHER (+321/-0)
account_payment_extension/payment_view.xml.OTHER (+502/-0)
account_payment_extension/wizard/__init__.py.OTHER (+28/-0)
account_payment_extension/wizard/wizard_payment_order.py.OTHER (+179/-0)
account_payment_extension/wizard/wizard_populate_statement.py.OTHER (+120/-0)
account_payment_paypal/__init__.py (+28/-0)
account_payment_paypal/__terp__.py (+68/-0)
account_payment_paypal/i18n/account_payment_paypal.pot (+276/-0)
account_payment_paypal/i18n/ca.po (+359/-0)
account_payment_paypal/i18n/es.po (+443/-0)
account_payment_paypal/i18n/es_ES.po (+337/-0)
account_payment_paypal/paypal.py (+344/-0)
account_payment_paypal/paypal_view.xml (+52/-0)
account_payment_paypal/paypal_wizard.xml (+11/-0)
account_payment_paypal/security/ir.model.access.csv (+5/-0)
account_payment_paypal/wizard/__init__.py (+26/-0)
account_payment_paypal/wizard/paypal.py (+103/-0)
account_product_fiscal_classification.py (+65/-0)
account_product_fiscal_classification/__init__.py (+2/-0)
account_product_fiscal_classification/__terp__.py (+33/-0)
account_product_fiscal_classification/account_product_fiscal_classification.py (+151/-0)
account_product_fiscal_classification/account_product_fiscal_classification_data.xml (+16/-0)
account_product_fiscal_classification/account_product_fiscal_classification_view.xml (+117/-0)
account_product_fiscal_classification/i18n/pt_BR.po (+155/-0)
account_product_fiscal_classification/product.py (+51/-0)
account_product_fiscal_classification/product_view.xml (+18/-0)
account_regularization/__init__.py.OTHER (+26/-0)
account_regularization/__terp__.py.OTHER (+47/-0)
account_regularization/account.py.OTHER (+147/-0)
account_regularization/i18n/account_regularization.pot (+196/-0)
account_regularization/i18n/es_ES.po (+201/-0)
account_regularization/wizard/__init__.py.OTHER (+25/-0)
account_regularization/wizard/account_regularization.py.OTHER (+136/-0)
account_renumber/__init__.py (+29/-0)
account_renumber/__terp__.py (+53/-0)
account_renumber/account_renumber_wizard.xml (+44/-0)
account_renumber/i18n/account_renumber.pot (+148/-0)
account_renumber/i18n/ca.po (+175/-0)
account_renumber/i18n/ca_ES.po (+161/-0)
account_renumber/i18n/es.po (+171/-0)
account_renumber/i18n/es_ES.po (+159/-0)
account_renumber/i18n/gl.po (+170/-0)
account_renumber/test/create_moves.py (+114/-0)
account_renumber/wizard/__init__.py (+30/-0)
account_renumber/wizard/wizard_renumber.py (+262/-0)
account_reports_india/__init__.py (+3/-0)
account_reports_india/__terp__.py (+55/-0)
account_reports_india/account.py (+86/-0)
account_reports_india/account_report.xml (+101/-0)
account_reports_india/report/__init__.py (+6/-0)
account_reports_india/report/report_balance_sheet.py (+232/-0)
account_reports_india/report/report_balance_sheet.rml (+269/-0)
account_reports_india/report/report_balance_sheet_horizontal.py (+273/-0)
account_reports_india/report/report_balance_sheet_horizontal.rml (+258/-0)
account_reports_india/report/report_pl_account.py (+200/-0)
account_reports_india/report/report_pl_account.rml (+297/-0)
account_reports_india/report/report_pl_account_horizontal.rml (+295/-0)
account_reports_india/report/report_pl_horizontal.py (+242/-0)
account_reports_india/report/report_trial_balance.py (+233/-0)
account_reports_india/report/report_trial_balance.rml (+300/-0)
account_reports_india/report/rml_parse.py (+166/-0)
account_reports_india/wizard/__init__.py (+3/-0)
account_reports_india/wizard/wizard_balance_sheet.py (+111/-0)
account_reports_india/wizard/wizard_pl_report.py (+110/-0)
account_reports_india/wizard/wizard_trial_balance_sheet.py (+84/-0)
account_reverse/__init__.py.OTHER (+26/-0)
account_reverse/__terp__.py.OTHER (+40/-0)
account_reverse/account.py.OTHER (+60/-0)
account_reverse/i18n/account_reverse.pot (+97/-0)
account_reverse/i18n/es_ES.po (+97/-0)
account_reverse/wizard/__init__.py.OTHER (+25/-0)
account_reverse/wizard/account_move_reverse.py.OTHER (+91/-0)
account_simulation/i18n/account_simulation.pot (+90/-0)
account_simulation/i18n/ca_ES.po (+90/-0)
account_simulation/i18n/es_ES.po (+90/-0)
account_simulation/wizard/wizard_account_chart.py.OTHER (+80/-0)
account_voucher_payment/__init__.py (+26/-0)
account_voucher_payment/__terp__.py (+51/-0)
account_voucher_payment/account_voucher_payment.py (+310/-0)
account_voucher_payment/account_voucher_payment_view.xml (+81/-0)
account_voucher_payment/account_voucher_unreconcile.py (+55/-0)
account_voucher_payment/i18n/es_ES.po (+87/-0)
account_voucher_workflow/__terp__.py.OTHER (+45/-0)
account_voucher_workflow/account_voucher_view.xml.OTHER (+34/-0)
account_voucher_workflow/account_voucher_workflow.xml.OTHER (+94/-0)
account_voucher_workflow/voucher.py.OTHER (+46/-0)
airport/__terp__.py.OTHER (+36/-0)
airport/ticket.rml.OTHER (+286/-0)
analytic_partners/report/analytic_account_partners.rml.OTHER (+140/-0)
asterisk/__terp__.py.OTHER (+40/-0)
asterisk/script/rpc.py (+56/-0)
asterisk/script/simple_write.py.OTHER (+53/-0)
asterisk/script/tiny_socket.py (+96/-0)
auto_email_account/__terp__.py.OTHER (+43/-0)
auto_email_account/invoice.py.OTHER (+117/-0)
auto_email_account/wizard/wizard_send_email.py.OTHER (+135/-0)
auto_email_sale/__terp__.py.OTHER (+40/-0)
auto_email_sale/sale.py.OTHER (+66/-0)
auto_email_sale/wizard/wizard_send_email.py.OTHER (+139/-0)
auto_email_stock/__terp__.py.OTHER (+47/-0)
auto_email_stock/wizard/wizard_partial_picking.py.OTHER (+251/-0)
auto_email_stock/wizard/wizard_send_email.py.OTHER (+139/-0)
base_contact_city/__init__.py.OTHER (+23/-0)
base_contact_city/__terp__.py.OTHER (+40/-0)
base_contact_team/__terp__.py.OTHER (+14/-0)
base_crypt/__openerp__.py (+17/-0)
base_crypt/base_update.xml.OTHER (+29/-0)
base_crypt/crypt.py (+13/-1)
base_external_referentials/__init__.py (+2/-0)
base_external_referentials/__terp__.py (+55/-0)
base_external_referentials/base_external_referentials.py (+251/-0)
base_external_referentials/base_external_referentials_view.xml (+92/-0)
base_external_referentials/external_osv.py (+346/-0)
base_external_referentials/i18n/base_external_referentials.pot (+337/-0)
base_external_referentials/i18n/ca.po (+379/-0)
base_external_referentials/i18n/ca_ES.po (+350/-0)
base_external_referentials/i18n/es.po (+378/-0)
base_external_referentials/i18n/es_ES.po (+350/-0)
base_language/__terp__.py.OTHER (+46/-0)
base_language/base_language_data.xml.OTHER (+710/-0)
base_module_doc_rst/wizard/wizard_tech_guide_rst.py.OTHER (+488/-0)
base_partner_gender/__init__.py (+24/-0)
base_partner_gender/__terp__.py (+44/-0)
base_partner_gender/base_partner_gender.py (+39/-0)
base_partner_gender/base_partner_gender_data.xml (+20/-0)
base_partner_gender/base_partner_gender_view.xml (+51/-0)
base_partner_relation/partner_relation.py.OTHER (+96/-0)
base_partner_sequence/__terp__.py.OTHER (+41/-0)
base_partner_surname/i18n/base_partner_surname.pot (+61/-0)
base_partner_surname/i18n/fr.po (+64/-0)
base_partner_surname/i18n/fr_FR.po (+61/-0)
base_partner_surname/partner.py.OTHER (+68/-0)
base_partner_surname/partner_view.xml.OTHER (+101/-0)
base_report_unicode/__init__.py (+85/-0)
base_report_unicode/__terp__.py (+46/-0)
base_sale_multichannels/__init__.py (+1/-0)
base_sale_multichannels/__terp__.py (+62/-0)
base_sale_multichannels/i18n/base_sale_multichannels.pot (+306/-0)
base_sale_multichannels/i18n/ca.po (+380/-0)
base_sale_multichannels/i18n/ca_ES.po (+334/-0)
base_sale_multichannels/i18n/es.po (+379/-0)
base_sale_multichannels/i18n/es_ES.po (+334/-0)
base_sale_multichannels/sale.py (+321/-0)
base_sale_multichannels/sale_view.xml (+81/-0)
base_sale_multichannels/security/ir.model.access.csv (+11/-0)
base_vat_unique/__init__.py (+25/-0)
base_vat_unique/__terp__.py (+33/-0)
base_vat_unique/base_vat_unique.py (+37/-0)
base_vat_unique/i18n/base_vat_unique.pot (+33/-0)
base_vat_unique/i18n/ca_ES.po (+33/-0)
base_vat_unique/i18n/es_ES.po (+33/-0)
board_frontdesk/__init__.py (+27/-0)
board_frontdesk/__terp__.py (+22/-0)
board_frontdesk/board_frontdesk_view.xml (+52/-0)
board_reservation/__init__.py (+28/-0)
board_reservation/__terp__.py (+21/-0)
board_reservation/board_reservation_view.xml (+80/-0)
board_restaurant/__init__.py (+28/-0)
board_restaurant/__terp__.py (+22/-0)
board_restaurant/board_restaurant_view.xml (+121/-0)
board_service/board_service_view.xml.OTHER (+277/-0)
bookstore/invoice.py.OTHER (+58/-0)
bookstore/report/invoice.rml.OTHER (+290/-0)
bookstore/report/quotation.rml.OTHER (+241/-0)
bookstore/report/sales_order.rml.OTHER (+280/-0)
bookstore/sale.py.OTHER (+50/-0)
c2c_analytic_wizard/__init__.py (+29/-0)
c2c_analytic_wizard/__terp__.py (+71/-0)
c2c_analytic_wizard/c2c_analytic_report.xml (+13/-0)
c2c_analytic_wizard/c2c_analytic_wizard.xml (+54/-0)
c2c_analytic_wizard/i18n/fr_FR.po (+447/-0)
c2c_analytic_wizard/indicator_account_detail.py (+43/-0)
c2c_analytic_wizard/indicator_account_view.xml (+16/-0)
c2c_analytic_wizard/report/__init__.py (+29/-0)
c2c_analytic_wizard/report/c2c_helper.py (+66/-0)
c2c_analytic_wizard/report/indicator_account_detail.py (+727/-0)
c2c_analytic_wizard/security/wizard_security.xml (+6/-0)
c2c_analytic_wizard/wizard/__init__.py (+33/-0)
c2c_analytic_wizard/wizard/associate_analytic_line_from.py (+110/-0)
c2c_analytic_wizard/wizard/associate_analytic_line_toinvoice.py (+108/-0)
c2c_analytic_wizard/wizard/blank_invoice.py (+171/-0)
c2c_analytic_wizard/wizard/dissociate_aal_from_invoice.py (+102/-0)
c2c_analytic_wizard/wizard/indicator_account_detail.py (+138/-0)
c2c_analytic_wizard/wizard/invoice_create.py (+450/-0)
c2c_analytic_wizard/wizard/open_specified_analytic_line.py (+209/-0)
c2c_analytic_wizard/wizard/open_specified_invoices.py (+170/-0)
c2c_analytic_wizard/wizard/wizard_view.xml (+5/-0)
c2c_bank_statement_cancelation/__init__.py (+25/-0)
c2c_bank_statement_cancelation/__terp__.py (+40/-0)
c2c_bank_statement_cancelation/wizard.xml (+6/-0)
c2c_bank_statement_cancelation/wizard/__init__.py (+25/-0)
c2c_bank_statement_cancelation/wizard/wizard_cancel_bank_statement.py (+117/-0)
c2c_budget/__init__.py.OTHER (+41/-0)
c2c_budget/__terp__.py.OTHER (+58/-0)
c2c_budget/account.py.OTHER (+173/-0)
c2c_budget/analytic_account.py.OTHER (+84/-0)
c2c_budget/c2c_budget.py.OTHER (+210/-0)
c2c_budget/c2c_budget_item.py.OTHER (+560/-0)
c2c_budget/c2c_budget_line.py.OTHER (+369/-0)
c2c_budget/c2c_budget_report_abstraction.py.OTHER (+57/-0)
c2c_budget/c2c_budget_version.py.OTHER (+363/-0)
c2c_budget/c2c_budget_view.xml.OTHER (+438/-0)
c2c_budget/c2c_budget_wizard_abstraction.py.OTHER (+140/-0)
c2c_budget/report/budget_by_period.py.OTHER (+242/-0)
c2c_budget/report/budget_vs_reality.py.OTHER (+159/-0)
c2c_budget/wizard/budget_by_period.py.OTHER (+229/-0)
c2c_budget/wizard/validate_budget_structure.py.OTHER (+312/-0)
c2c_contact_to_ldap/__init__.py (+26/-0)
c2c_contact_to_ldap/__terp__.py (+73/-0)
c2c_contact_to_ldap/company.py (+40/-0)
c2c_contact_to_ldap/company_view.xml (+25/-0)
c2c_contact_to_ldap/i18n/fr_FR.po (+82/-0)
c2c_contact_to_ldap/partner.py (+465/-0)
c2c_contact_to_ldap/security/security.xml (+4/-0)
c2c_contact_to_ldap/wizard.xml (+11/-0)
c2c_contact_to_ldap/wizard/__init__.py (+9/-0)
c2c_contact_to_ldap/wizard/wiz_import_adresses.py (+135/-0)
c2c_cumulated_finance_report/__init__.py (+25/-0)
c2c_cumulated_finance_report/__terp__.py (+39/-0)
c2c_cumulated_finance_report/report.xml (+26/-0)
c2c_cumulated_finance_report/report/__init__.py (+26/-0)
c2c_cumulated_finance_report/report/general_ledger.py (+398/-0)
c2c_cumulated_finance_report/report/general_ledger.rml (+200/-0)
c2c_cumulated_finance_report/report/general_ledger_landscape.rml (+212/-0)
c2c_cumulated_finance_report/report/reportHelper.py (+89/-0)
c2c_cumulated_finance_report/report/third_party_ledger.py (+413/-0)
c2c_cumulated_finance_report/report/third_party_ledger.rml (+204/-0)
c2c_cumulated_finance_report/report/third_party_ledger_other.rml (+212/-0)
c2c_cumulated_finance_report/wizard/__init__.py (+24/-0)
c2c_cumulated_finance_report/wizard/wizzards_overriding.py (+32/-0)
c2c_currency_rate_update/__init__.py (+33/-0)
c2c_currency_rate_update/__terp__.py (+60/-0)
c2c_currency_rate_update/company.py (+169/-0)
c2c_currency_rate_update/company_view.xml (+23/-0)
c2c_currency_rate_update/currency_rate_update.py (+481/-0)
c2c_currency_rate_update/currency_rate_update.xml (+49/-0)
c2c_currency_rate_update/i18n/fr_FR.po (+191/-0)
c2c_currency_rate_update/i18n/pl_PL.po (+192/-0)
c2c_currency_rate_update/security/security.xml (+67/-0)
c2c_currency_rate_update/wizard/__init__.py (+30/-0)
c2c_date_in_so_line/__init__.py (+23/-0)
c2c_date_in_so_line/__terp__.py (+40/-0)
c2c_date_in_so_line/sale.py (+119/-0)
c2c_date_in_so_line/sale_order_line_view.xml (+51/-0)
c2c_invoice_report/__init__.py (+34/-0)
c2c_invoice_report/__terp__.py (+48/-0)
c2c_invoice_report/i18n/fr_FR.po (+148/-0)
c2c_invoice_report/report.xml (+14/-0)
c2c_invoice_report/report/__init__.py (+21/-0)
c2c_invoice_report/report/invoice.py (+80/-0)
c2c_invoice_report/report/invoice.rml (+571/-0)
c2c_invoice_report/security/ir.model.access.csv (+7/-0)
c2c_invoice_report/view/__init__.py (+32/-0)
c2c_invoice_report/view/invoice.py (+144/-0)
c2c_invoice_report/view/invoice_view.xml (+88/-0)
c2c_multi_currency_consolidated_chart/__init__.py (+25/-0)
c2c_multi_currency_consolidated_chart/__terp__.py (+40/-0)
c2c_multi_currency_consolidated_chart/account.py (+134/-0)
c2c_multi_currency_consolidated_chart/wizard.xml (+11/-0)
c2c_multi_currency_consolidated_chart/wizard/__init__.py (+24/-0)
c2c_multi_currency_consolidated_chart/wizard/wizard_account_chart.py (+89/-0)
c2c_multi_header/__init__.py (+25/-0)
c2c_multi_header/__terp__.py (+37/-0)
c2c_multi_header/company.py (+74/-0)
c2c_multi_header/company_view.xml (+20/-0)
c2c_multi_header/header.py (+54/-0)
c2c_multi_header/header_view.xml (+46/-0)
c2c_multicost_base/__init__.py (+34/-0)
c2c_multicost_base/__terp__.py (+108/-0)
c2c_multicost_base/account_analytic_line.py (+129/-0)
c2c_multicost_base/analytic.py (+141/-0)
c2c_multicost_base/analytic_analysis.py (+82/-0)
c2c_multicost_base/analytic_view.xml (+110/-0)
c2c_multicost_base/company.py (+52/-0)
c2c_multicost_base/company_view.xml (+20/-0)
c2c_multicost_base/product.py (+60/-0)
c2c_multicost_base/product_data.xml (+13/-0)
c2c_multicost_expense/__init__.py (+30/-0)
c2c_multicost_expense/__terp__.py (+53/-0)
c2c_multicost_expense/hr_expense.py (+60/-0)
c2c_multicost_expense/hr_expense_view.xml (+33/-0)
c2c_multicost_project_timesheet/__init__.py (+30/-0)
c2c_multicost_project_timesheet/__terp__.py (+53/-0)
c2c_multicost_project_timesheet/project_timesheet.py (+106/-0)
c2c_multicost_stock/__init__.py (+31/-0)
c2c_multicost_stock/__terp__.py (+62/-0)
c2c_multicost_stock/multicost_stock_wizard.xml (+13/-0)
c2c_multicost_stock/stock.py (+290/-0)
c2c_multicost_stock/wizard/__init__.py (+30/-0)
c2c_multicost_stock/wizard/wizard_partial_picking.py (+271/-0)
c2c_multicost_timesheet/__init__.py (+30/-0)
c2c_multicost_timesheet/__terp__.py (+52/-0)
c2c_multicost_timesheet/hr_timesheet.py (+54/-0)
c2c_multicost_timesheet_invoice/__init__.py (+29/-0)
c2c_multicost_timesheet_invoice/__terp__.py (+53/-0)
c2c_multicost_timesheet_invoice/timesheet_invoice_view.xml (+16/-0)
c2c_multicost_user_function/__init__.py (+30/-0)
c2c_multicost_user_function/__terp__.py (+54/-0)
c2c_multicost_user_function/analytic_user_function.py (+118/-0)
c2c_one_time_password_login/__init__.py (+14/-0)
c2c_one_time_password_login/__terp__.py (+37/-0)
c2c_one_time_password_login/company.py (+15/-0)
c2c_one_time_password_login/company_view.xml (+18/-0)
c2c_one_time_password_login/login.py (+144/-0)
c2c_one_time_password_login/user.py (+24/-0)
c2c_one_time_password_login/user_view.xml (+16/-0)
c2c_one_time_password_login_yubikey_provider/__init__.py (+13/-0)
c2c_one_time_password_login_yubikey_provider/__terp__.py (+30/-0)
c2c_one_time_password_login_yubikey_provider/company.py (+18/-0)
c2c_one_time_password_login_yubikey_provider/company_view.xml (+19/-0)
c2c_one_time_password_login_yubikey_provider/login.py (+47/-0)
c2c_partner_address/__init__.py (+27/-0)
c2c_partner_address/__terp__.py (+49/-0)
c2c_partner_address/partner.py (+537/-0)
c2c_partner_address/partner_view.xml (+284/-0)
c2c_partner_address/security/security.xml (+4/-0)
c2c_project_activities/__init__.py (+30/-0)
c2c_project_activities/__terp__.py (+60/-0)
c2c_project_activities/c2c_activities_demo.xml (+105/-0)
c2c_project_activities/c2c_project_activities.py (+211/-0)
c2c_project_activities/c2c_project_activities_view.xml (+166/-0)
c2c_project_activities/i18n/fr_FR.po (+214/-0)
c2c_project_activities/security/c2c_project_activites_security.xml (+23/-0)
c2c_refresh_so_lines/__init__.py (+23/-0)
c2c_refresh_so_lines/__terp__.py (+38/-0)
c2c_refresh_so_lines/i18n/fr_FR.po (+32/-0)
c2c_refresh_so_lines/sale.py (+56/-0)
c2c_refresh_so_lines/sale_view.xml (+19/-0)
c2c_reporting_tools/flowables/simple_row_table.py.OTHER (+597/-0)
c2c_reporting_tools/flowables/timebox_chart.py.OTHER (+1105/-0)
c2c_reporting_tools/reports/standard_report.py.OTHER (+190/-0)
c2c_reporting_tools/translation.py.OTHER (+68/-0)
c2c_sale_sequence/__init__.py (+28/-0)
c2c_sale_sequence/__terp__.py (+41/-0)
c2c_sale_sequence/c2c_sale_sequence_view.xml (+29/-0)
c2c_scan_bvr/__init__.py.OTHER (+31/-0)
c2c_scan_bvr/__terp__.py.OTHER (+50/-0)
c2c_scan_bvr/wizard/__init__.py.OTHER (+31/-0)
c2c_scan_bvr/wizard/scan_bvr.py.OTHER (+298/-0)
c2c_timesheet_fullfill/__init__.py (+31/-0)
c2c_timesheet_fullfill/__terp__.py (+53/-0)
c2c_timesheet_fullfill/c2c_timesheet_fullfill_wizard.xml (+7/-0)
c2c_timesheet_fullfill/i18n/fr_FR.po (+67/-0)
c2c_timesheet_fullfill/wizard/__init__.py (+31/-0)
c2c_timesheet_fullfill/wizard/c2c_timesheet_fullfill_wizard.py (+199/-0)
c2c_timesheet_reports/__init__.py (+38/-0)
c2c_timesheet_reports/__terp__.py (+51/-0)
c2c_timesheet_reports/c2c_timesheet_report.xml (+14/-0)
c2c_timesheet_reports/c2c_timesheet_view.xml (+22/-0)
c2c_timesheet_reports/c2c_timesheet_wizard.xml (+32/-0)
c2c_timesheet_reports/hr_employee.py (+49/-0)
c2c_timesheet_reports/i18n/fr_FR.po (+264/-0)
c2c_timesheet_reports/reminder.py (+347/-0)
c2c_timesheet_reports/report/__init__.py (+34/-0)
c2c_timesheet_reports/report/timesheet_status.py (+186/-0)
c2c_timesheet_reports/report/timesheet_status.rml (+175/-0)
c2c_timesheet_reports/wizard/__init__.py (+35/-0)
c2c_timesheet_reports/wizard/reminder_config.py (+180/-0)
c2c_timesheet_reports/wizard/timesheet_status.py (+97/-0)
carrier_picking/__init__.py (+25/-0)
carrier_picking/__terp__.py (+43/-0)
carrier_picking/i18n/carrier_picking.pot (+58/-0)
carrier_picking/i18n/es_ES.po (+62/-0)
carrier_picking/partner.py (+36/-0)
carrier_picking/partner_view.xml (+28/-0)
carrier_picking/stock.py (+45/-0)
carrier_picking/stock_view.xml (+101/-0)
cci_account/report/aged_trial_balance.py.OTHER (+199/-0)
cci_account/report/aged_trial_balance.rml.OTHER (+231/-0)
cci_account/report/cci_draft_invoice_info.py.OTHER (+134/-0)
cci_account/report/cci_draft_invoice_info.rml.OTHER (+293/-0)
cci_account/report/cci_vcs_report.rml.OTHER (+115/-0)
cci_account/report/partner_balance.py.OTHER (+248/-0)
cci_account/report/partner_balance.rml.OTHER (+266/-0)
cci_account/report/report_account_invoice_layout.py.OTHER (+172/-0)
cci_account/report/report_account_invoice_layout.rml.OTHER (+264/-0)
cci_account/report/special_message_invoice.py.OTHER (+182/-0)
cci_account/report/special_message_invoice.rml.OTHER (+273/-0)
cci_account/report/third_party_ledger.py.OTHER (+194/-0)
cci_account/report/third_party_ledger.rml.OTHER (+264/-0)
cci_membership/cci_membership_view.xml.OTHER (+19/-0)
cci_membership/report/report_members_total_sold.rml.OTHER (+168/-0)
cci_mission/report/report_print_carnet.rml.OTHER (+152/-0)
cci_mission/report/report_print_carnet1.rml.OTHER (+152/-0)
cci_mission/wizard/cci_encode_cash.py.OTHER (+132/-0)
cci_mission/wizard/wizard_federation_sending.py.OTHER (+194/-0)
cci_partner/__terp__.py.OTHER (+46/-0)
cci_partner/cci_data.xml.OTHER (+300/-0)
cci_partner/cci_partner.py.OTHER (+576/-0)
cci_partner/cci_partner_view.xml.OTHER (+1049/-0)
cci_partner/report/report_count_invoices.py.OTHER (+74/-0)
cci_partner/report/report_count_invoices.rml.OTHER (+190/-0)
cci_purchase/cci_purchase.py.OTHER (+68/-0)
cci_purchase/cci_purchase_workflow.xml.OTHER (+70/-0)
cci_translation/cci_translation_view.xml.OTHER (+143/-0)
chricar_account_analytic/Revision.txt (+1/-0)
chricar_account_analytic/__init__.py (+8/-0)
chricar_account_analytic/__terp__.py (+43/-0)
chricar_account_analytic/account_analytic.py (+197/-0)
chricar_account_analytic/account_analytic.py.orig (+217/-0)
chricar_account_analytic/account_analytic_view.xml (+36/-0)
chricar_account_analytic/i18n/de_DE.po (+58/-0)
chricar_account_period_sum/__init__.py (+26/-0)
chricar_account_period_sum/__terp__.py (+59/-0)
chricar_account_period_sum/chricar_account_period_sum.py (+179/-0)
chricar_account_period_sum/chricar_account_period_sum_period_name.py (+51/-0)
chricar_account_period_sum/chricar_account_period_sum_trg.py (+465/-0)
chricar_account_period_sum/chricar_account_period_sum_view.xml (+166/-0)
chricar_account_period_sum/i18n/de_DE.po (+241/-0)
chricar_account_period_sum/security/ir.model.access.csv (+5/-0)
chricar_partner_parent_companies/__terp__.py.OTHER (+20/-0)
chricar_partner_parent_companies/partner_parent_companies.py.OTHER (+54/-0)
chricar_partner_parent_companies/partner_parent_companies_view.xml.OTHER (+183/-0)
chricar_product_image/chricar_product_image_view.xml.OTHER (+17/-0)
chricar_product_image/i18n/fr_FR.po (+42/-0)
chricar_view_id/__init__.py (+29/-0)
chricar_view_id/__terp__.py (+72/-0)
chricar_view_id/chricar_view_id.py (+82/-0)
city/__terp__.py.OTHER (+39/-0)
city/city.py.OTHER (+181/-0)
city/i18n/ca_ES.po.OTHER (+56/-0)
city/i18n/es_ES.po.OTHER (+56/-0)
civil_engineering/__init__.py (+28/-0)
civil_engineering/__terp__.py (+57/-0)
civil_engineering/civil_engineering.py (+434/-0)
civil_engineering/civil_engineering_view.xml (+662/-0)
civil_engineering/i18n/ca.po (+695/-0)
civil_engineering/i18n/ca_ES.po (+660/-0)
civil_engineering/i18n/civil_engineering.pot (+628/-0)
civil_engineering/i18n/es.po (+693/-0)
civil_engineering/i18n/es_ES.po (+660/-0)
civil_engineering/project.py (+32/-0)
civil_engineering/project_view.xml (+35/-0)
civil_engineering/purchase.py (+32/-0)
civil_engineering/purchase_view.xml (+24/-0)
civil_engineering/sale.py (+32/-0)
civil_engineering/sale_view.xml (+24/-0)
civil_engineering/security/civil_engineering_security.xml (+14/-0)
civil_engineering/security/ir.model.access.csv (+19/-0)
commission_pricelist/__terp__.py.OTHER (+35/-0)
commission_pricelist/commission.py.OTHER (+93/-0)
commission_pricelist/report/saleagent_info.py.OTHER (+90/-0)
commission_pricelist/saleagent_report.xml.OTHER (+48/-0)
commission_rate/commission.py.OTHER (+120/-0)
comparison/comparison.py.OTHER (+499/-0)
comparison/website/erpComparator/erpcomparator/common.py.OTHER (+44/-0)
comparison/website/erpComparator/erpcomparator/controllers.py.OTHER (+39/-0)
comparison/website/erpComparator/erpcomparator/rpc.py.OTHER (+468/-0)
comparison/website/erpComparator/erpcomparator/static/css/new_style.css.OTHER (+462/-0)
comparison/website/erpComparator/erpcomparator/static/javascript/comparison.js.OTHER (+362/-0)
comparison/website/erpComparator/erpcomparator/static/javascript/treegrid.js.OTHER (+993/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/comparison.py.OTHER (+539/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/graph.py.OTHER (+201/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/login.py.OTHER (+78/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/softwares.py.OTHER (+30/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/templates/about.kid.OTHER (+158/-0)
comparison/website/erpComparator/erpcomparator/subcontrollers/templates/comparison.kid.OTHER (+88/-0)
comparison/website/erpComparator/erpcomparator/templates/master.kid.OTHER (+135/-0)
comparison/website/erpComparator/erpcomparator/tinyres.py.OTHER (+165/-0)
crm_configuration_timesheet/__init__.py (+23/-0)
crm_configuration_timesheet/__terp__.py (+53/-0)
crm_configuration_timesheet/crm_bugs_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_claims_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_fund_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_jobs_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_lead_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_meetings_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_opportunity_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/crm_phonecall_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_bugs_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_claims_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_fund_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_jobs_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_lead_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_meetings_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_opportunity_timesheet_view.xml (+34/-0)
crm_configuration_timesheet/view/crm_phonecall_timesheet_view.xml (+34/-0)
crm_livechat/crm-lc/livechat/common.py.OTHER (+61/-0)
crm_livechat/crm-lc/livechat/rpc.py.OTHER (+463/-0)
crm_livechat/crm-lc/livechat/subcontrollers/livechat/chatfunc.py.OTHER (+432/-0)
crm_lp/Readme.txt (+18/-0)
crm_lp/__init__.py (+26/-0)
crm_lp/__terp__.py (+44/-0)
crm_lp/crm_lp.py (+465/-0)
crm_lp/crm_lp.xml (+135/-0)
crm_lp/crm_lp_data.xml (+16/-0)
crm_lp/crm_lp_wizard.xml (+10/-0)
crm_lp/wizard/__init__.py (+23/-0)
crm_lp/wizard/wizard_crm_lp_sync.py (+57/-0)
crm_telemarketing/wizard/direct_poll.py.OTHER (+195/-0)
crm_timesheet/LICENSE.txt (+674/-0)
crm_timesheet/__init__.py (+26/-0)
crm_timesheet/__terp__.py (+53/-0)
crm_timesheet/i18n/crm_timesheet.pot (+144/-0)
crm_timesheet/i18n/fr.po (+155/-0)
crm_timesheet/i18n/fr_FR.po (+150/-0)
crm_timesheet/object/__init__.py (+26/-0)
crm_timesheet/object/crm_section.py (+39/-0)
crm_timesheet/object/crm_timesheet.py (+207/-0)
crm_timesheet/object/partner.py (+55/-0)
crm_timesheet/report/__init__.py (+22/-0)
crm_timesheet/security/ir.model.access.csv (+13/-0)
crm_timesheet/view/crm_section.xml (+21/-0)
crm_timesheet/view/crm_timesheet.xml (+38/-0)
crm_timesheet/view/partner.xml (+29/-0)
currency_rate/res_currency.py.OTHER (+64/-0)
currency_rate/wizard/currency_rate.py.OTHER (+94/-0)
document_extension/document.py.OTHER (+98/-0)
document_lock/__init__.py (+24/-0)
document_lock/__terp__.py (+42/-0)
document_lock/document_lock.py (+60/-0)
document_lock/document_lock_view.xml (+20/-0)
document_rule/document_data.xml.OTHER (+132/-0)
document_sftp/README.txt (+11/-0)
document_sftp/__init__.py (+24/-0)
document_sftp/__terp__.py (+41/-0)
document_sftp/document.py (+30/-0)
document_sftp/document_view.xml (+17/-0)
document_sftp/sftp_server/SFTPServer.py (+224/-0)
document_sftp/sftp_server/SFTPServerInterface.py (+566/-0)
document_sftp/sftp_server/Server.py (+93/-0)
document_sftp/sftp_server/__init__.py (+93/-0)
document_webdav_old/document.py.OTHER (+507/-0)
ecommerce/catalog/catalog.py.OTHER (+93/-0)
ecommerce/catalog/catalog_view.xml.OTHER (+105/-0)
ecommerce/ecommerce.py.OTHER (+158/-0)
ecommerce/ecommerce_demo.xml.OTHER (+847/-0)
ecommerce/ecommerce_view.xml.OTHER (+310/-0)
ecommerce/partner/partner.py.OTHER (+293/-0)
ecommerce/partner/partner_view.xml.OTHER (+127/-0)
ecommerce/report/invoice.rml.OTHER (+388/-0)
ecommerce/sale_order/sale_order.py.OTHER (+272/-0)
ecommerce/wizard/wizard_mailsend.py.OTHER (+122/-0)
edi/wizard/wizard_edi_import.py.OTHER (+490/-0)
electronic_report_intrastat/__init__.py (+24/-0)
electronic_report_intrastat/__terp__.py (+35/-0)
electronic_report_intrastat/report_instrastat.xml (+46/-0)
electronic_report_intrastat/report_intrastat.py (+36/-0)
electronic_report_intrastat/wizard/__init__.py (+23/-0)
electronic_report_intrastat/wizard/wizard_intrastat_export.py (+222/-0)
email_account/__init__.py.OTHER (+24/-0)
email_account/__terp__.py.OTHER (+47/-0)
email_account/i18n/ca_ES.po.OTHER (+179/-0)
email_account/i18n/email_account.pot.OTHER (+140/-0)
email_account/i18n/es_ES.po.OTHER (+179/-0)
email_account/i18n/nl_BE.po (+91/-0)
email_account/wizard/__init__.py.OTHER (+24/-0)
email_account/wizard/wizard_send_email.py.OTHER (+160/-0)
email_purchase/__init__.py (+24/-0)
email_purchase/__terp__.py (+49/-0)
email_purchase/email_purchase_wizard.xml (+6/-0)
email_purchase/i18n/ca.po (+176/-0)
email_purchase/i18n/ca_ES.po (+176/-0)
email_purchase/i18n/email_purchase.pot (+160/-0)
email_purchase/i18n/es.po (+177/-0)
email_purchase/i18n/es_ES.po (+177/-0)
email_purchase/wizard/__init__.py (+24/-0)
email_purchase/wizard/wizard_send_email.py (+169/-0)
email_sale/__init__.py.OTHER (+24/-0)
email_sale/__terp__.py.OTHER (+47/-0)
email_sale/i18n/ca.po (+174/-0)
email_sale/i18n/ca_ES.po.OTHER (+172/-0)
email_sale/i18n/email_sale.pot.OTHER (+159/-0)
email_sale/i18n/es.po (+174/-0)
email_sale/i18n/es_ES.po.OTHER (+172/-0)
email_sale/wizard/__init__.py.OTHER (+24/-0)
email_sale/wizard/wizard_send_email.py.OTHER (+174/-0)
esale_joomla/__terp__.py.OTHER (+47/-0)
esale_joomla/connector/plugins/xmlrpc/blogger.php (+568/-0)
esale_joomla/connector/plugins/xmlrpc/blogger.xml (+23/-0)
esale_joomla/connector/plugins/xmlrpc/index.html (+1/-0)
esale_joomla/connector/plugins/xmlrpc/joomla.php (+111/-0)
esale_joomla/connector/plugins/xmlrpc/joomla.xml (+19/-0)
esale_joomla/connector/plugins/xmlrpc/openerp2vm.php (+534/-0)
esale_joomla/connector/plugins/xmlrpc/openerp2vm.xml (+20/-0)
esale_joomla/esale_joomla.py.OTHER (+1214/-0)
esale_joomla/esale_joomla_view.xml.OTHER (+483/-0)
esale_joomla/esale_joomla_wizard.xml.OTHER (+128/-0)
esale_joomla/i18n/esale_joomla.pot (+1118/-0)
esale_joomla/i18n/fr.po (+1126/-0)
esale_joomla/i18n/fr_FR.po (+1118/-0)
esale_joomla/wizard/__init__.py.OTHER (+33/-0)
esale_joomla/wizard/wizard_category.py (+332/-0)
esale_joomla/wizard/wizard_esale_import.py.OTHER (+139/-0)
esale_joomla/wizard/wizard_product.py (+172/-0)
esale_joomla/wizard/wizard_product_stock.py.OTHER (+182/-0)
esale_joomla/wizard/wizard_producttype.py (+125/-0)
esale_joomla/wizard/wizard_tax.py (+333/-0)
esale_joomla/wizard/wizard_taxes_export.py.OTHER (+116/-0)
esale_osc/__init__.py.OTHER (+26/-0)
esale_osc/__terp__.py.OTHER (+57/-0)
esale_osc/connector/openerp-synchro.php.OTHER (+1225/-0)
esale_osc/connector/xmlrpcutils/xmlrpc_wrappers.inc (+944/-0)
esale_osc/esale_oscom.py.OTHER (+1025/-0)
esale_osc/esale_oscom_product.py.OTHER (+436/-0)
esale_osc/esale_oscom_product_view.xml.OTHER (+67/-0)
esale_osc/esale_oscom_view.xml.OTHER (+385/-0)
esale_osc/esale_oscom_wizard.xml.OTHER (+29/-0)
esale_osc/i18n/es.po (+894/-0)
esale_osc/i18n/es_ES.po (+864/-0)
esale_osc/i18n/esale_osc.pot (+853/-0)
esale_osc/security/ir.model.access.csv.OTHER (+9/-0)
esale_osc/shipping_product_data.xml.OTHER (+39/-0)
esale_osc/wizard/__init__.py.OTHER (+28/-0)
esale_osc/wizard/wizard_esale_oscom_export_products.py.OTHER (+96/-0)
esale_osc/wizard/wizard_esale_oscom_export_select_products.py.OTHER (+83/-0)
esale_osc/wizard/wizard_esale_oscom_import_sos.py.OTHER (+66/-0)
esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py.OTHER (+52/-0)
esale_osc/wizard/wizard_esale_oscom_update_stocks.py.OTHER (+72/-0)
etl/doc/SimpleXMLRPCServer.SimpleXMLRPCRequestHandler-class.html (+363/-0)
etl/doc/SimpleXMLRPCServer.SimpleXMLRPCServer-class.html (+279/-0)
etl/doc/ZSI.schema.SchemaInstanceType-class.html (+544/-0)
etl/doc/api-objects.txt (+2128/-0)
etl/doc/class-tree.html (+790/-0)
etl/doc/datetime-module.html (+204/-0)
etl/doc/datetime.date-class.html (+950/-0)
etl/doc/datetime.datetime-class.html (+1373/-0)
etl/doc/datetime.time-class.html (+743/-0)
etl/doc/datetime.timedelta-class.html (+858/-0)
etl/doc/datetime.tzinfo-class.html (+384/-0)
etl/doc/epydoc.css (+312/-0)
etl/doc/epydoc.js (+280/-0)
etl/doc/etl-module.html (+326/-0)
etl/doc/etl-pysrc.html (+307/-0)
etl/doc/etl.component-module.html (+176/-0)
etl/doc/etl.component-pysrc.html (+147/-0)
etl/doc/etl.component.component'-module.html (+143/-0)
etl/doc/etl.component.component'-pysrc.html (+584/-0)
etl/doc/etl.component.component-module.html (+135/-0)
etl/doc/etl.component.component-pysrc.html (+607/-0)
etl/doc/etl.component.component.component-class.html (+420/-0)
etl/doc/etl.component.control-module.html (+134/-0)
etl/doc/etl.component.control-pysrc.html (+142/-0)
etl/doc/etl.component.control.data_count'-module.html (+144/-0)
etl/doc/etl.component.control.data_count'-pysrc.html (+326/-0)
etl/doc/etl.component.control.data_count'.data_count-class.html (+336/-0)
etl/doc/etl.component.control.data_count-module.html (+136/-0)
etl/doc/etl.component.control.data_count-pysrc.html (+330/-0)
etl/doc/etl.component.control.data_count.data_count-class.html (+184/-0)
etl/doc/etl.component.control.sleep'-module.html (+144/-0)
etl/doc/etl.component.control.sleep'-pysrc.html (+332/-0)
etl/doc/etl.component.control.sleep'.component-class.html (+566/-0)
etl/doc/etl.component.control.sleep'.sleep-class.html (+341/-0)
etl/doc/etl.component.control.sleep-module.html (+136/-0)
etl/doc/etl.component.control.sleep-pysrc.html (+335/-0)
etl/doc/etl.component.control.sleep.sleep-class.html (+187/-0)
etl/doc/etl.component.input-module.html (+141/-0)
etl/doc/etl.component.input-pysrc.html (+149/-0)
etl/doc/etl.component.input.csv_in'-module.html (+178/-0)
etl/doc/etl.component.input.csv_in'-pysrc.html (+506/-0)
etl/doc/etl.component.input.csv_in'.csv_in-class.html (+397/-0)
etl/doc/etl.component.input.csv_in-module.html (+170/-0)
etl/doc/etl.component.input.csv_in-pysrc.html (+420/-0)
etl/doc/etl.component.input.csv_in.csv_in-class.html (+264/-0)
etl/doc/etl.component.input.data'-module.html (+179/-0)
etl/doc/etl.component.input.data'-pysrc.html (+464/-0)
etl/doc/etl.component.input.data'.data-class.html (+346/-0)
etl/doc/etl.component.input.data-module.html (+171/-0)
etl/doc/etl.component.input.data-pysrc.html (+369/-0)
etl/doc/etl.component.input.data.data-class.html (+234/-0)
etl/doc/etl.component.input.facebook_in'-module.html (+184/-0)
etl/doc/etl.component.input.facebook_in'-pysrc.html (+376/-0)
etl/doc/etl.component.input.facebook_in'.facebook_in-class.html (+360/-0)
etl/doc/etl.component.input.facebook_in-module.html (+176/-0)
etl/doc/etl.component.input.facebook_in-pysrc.html (+391/-0)
etl/doc/etl.component.input.facebook_in.facebook_in-class.html (+248/-0)
etl/doc/etl.component.input.gmail_in'-module.html (+173/-0)
etl/doc/etl.component.input.gmail_in'-pysrc.html (+475/-0)
etl/doc/etl.component.input.gmail_in'.gmail_in-class.html (+347/-0)
etl/doc/etl.component.input.gmail_in-module.html (+165/-0)
etl/doc/etl.component.input.gmail_in-pysrc.html (+382/-0)
etl/doc/etl.component.input.gmail_in.gmail_in-class.html (+235/-0)
etl/doc/etl.component.input.openobject_in'-module.html (+179/-0)
etl/doc/etl.component.input.openobject_in'-pysrc.html (+511/-0)
etl/doc/etl.component.input.openobject_in'.openobject_in-class.html (+363/-0)
etl/doc/etl.component.input.openobject_in-module.html (+171/-0)
etl/doc/etl.component.input.openobject_in-pysrc.html (+427/-0)
etl/doc/etl.component.input.openobject_in.openobject_in-class.html (+251/-0)
etl/doc/etl.component.input.sql_in'-module.html (+186/-0)
etl/doc/etl.component.input.sql_in'-pysrc.html (+524/-0)
etl/doc/etl.component.input.sql_in'.sql_in-class.html (+392/-0)
etl/doc/etl.component.input.sql_in-module.html (+171/-0)
etl/doc/etl.component.input.sql_in-pysrc.html (+436/-0)
etl/doc/etl.component.input.sql_in.sql_in-class.html (+259/-0)
etl/doc/etl.component.input.sugarcrm_in'-module.html (+176/-0)
etl/doc/etl.component.input.sugarcrm_in'-pysrc.html (+445/-0)
etl/doc/etl.component.input.sugarcrm_in'.sugarcrm_in-class.html (+350/-0)
etl/doc/etl.component.input.sugarcrm_in-module.html (+168/-0)
etl/doc/etl.component.input.sugarcrm_in-pysrc.html (+387/-0)
etl/doc/etl.component.input.sugarcrm_in.sugarcrm_in-class.html (+238/-0)
etl/doc/etl.component.input.vcard_in'-module.html (+177/-0)
etl/doc/etl.component.input.vcard_in'-pysrc.html (+499/-0)
etl/doc/etl.component.input.vcard_in'.vcard_in-class.html (+381/-0)
etl/doc/etl.component.input.vcard_in-module.html (+169/-0)
etl/doc/etl.component.input.vcard_in-pysrc.html (+413/-0)
etl/doc/etl.component.input.vcard_in.vcard_in-class.html (+248/-0)
etl/doc/etl.component.input.xmlrpc_in'-module.html (+178/-0)
etl/doc/etl.component.input.xmlrpc_in'-pysrc.html (+405/-0)
etl/doc/etl.component.input.xmlrpc_in'.xmlrpc_in-class.html (+436/-0)
etl/doc/etl.component.input.xmlrpc_in-module.html (+170/-0)
etl/doc/etl.component.input.xmlrpc_in-pysrc.html (+395/-0)
etl/doc/etl.component.input.xmlrpc_in.xmlrpc_in-class.html (+281/-0)
etl/doc/etl.component.output-module.html (+137/-0)
etl/doc/etl.component.output-pysrc.html (+146/-0)
etl/doc/etl.component.output.csv_out'-module.html (+178/-0)
etl/doc/etl.component.output.csv_out'-pysrc.html (+546/-0)
etl/doc/etl.component.output.csv_out'.csv_out-class.html (+391/-0)
etl/doc/etl.component.output.csv_out-module.html (+170/-0)
etl/doc/etl.component.output.csv_out-pysrc.html (+431/-0)
etl/doc/etl.component.output.csv_out.csv_out-class.html (+258/-0)
etl/doc/etl.component.output.facebook_out'-module.html (+176/-0)
etl/doc/etl.component.output.facebook_out'-pysrc.html (+526/-0)
etl/doc/etl.component.output.facebook_out'.facebook_out-class.html (+385/-0)
etl/doc/etl.component.output.facebook_out-module.html (+168/-0)
etl/doc/etl.component.output.facebook_out-pysrc.html (+413/-0)
etl/doc/etl.component.output.facebook_out.facebook_out-class.html (+206/-0)
etl/doc/etl.component.output.openobject_out'-module.html (+179/-0)
etl/doc/etl.component.output.openobject_out'-pysrc.html (+618/-0)
etl/doc/etl.component.output.openobject_out'.openobject_out-class.html (+395/-0)
etl/doc/etl.component.output.openobject_out-module.html (+171/-0)
etl/doc/etl.component.output.openobject_out-pysrc.html (+505/-0)
etl/doc/etl.component.output.openobject_out.openobject_out-class.html (+262/-0)
etl/doc/etl.component.output.sql_out'-module.html (+178/-0)
etl/doc/etl.component.output.sql_out'-pysrc.html (+580/-0)
etl/doc/etl.component.output.sql_out'.sql_out-class.html (+391/-0)
etl/doc/etl.component.output.sql_out-module.html (+170/-0)
etl/doc/etl.component.output.sql_out-pysrc.html (+466/-0)
etl/doc/etl.component.output.sql_out.sql_out-class.html (+258/-0)
etl/doc/etl.component.output.xmlrpc_out'-module.html (+178/-0)
etl/doc/etl.component.output.xmlrpc_out'-pysrc.html (+408/-0)
etl/doc/etl.component.output.xmlrpc_out'.xmlrpc_out-class.html (+379/-0)
etl/doc/etl.component.output.xmlrpc_out-module.html (+170/-0)
etl/doc/etl.component.output.xmlrpc_out-pysrc.html (+398/-0)
etl/doc/etl.component.output.xmlrpc_out.xmlrpc_out-class.html (+203/-0)
etl/doc/etl.component.transform-module.html (+142/-0)
etl/doc/etl.component.transform-pysrc.html (+155/-0)
etl/doc/etl.component.transform.data_filter'-module.html (+176/-0)
etl/doc/etl.component.transform.data_filter'-pysrc.html (+410/-0)
etl/doc/etl.component.transform.data_filter'.data_filter-class.html (+347/-0)
etl/doc/etl.component.transform.data_filter-module.html (+168/-0)
etl/doc/etl.component.transform.data_filter-pysrc.html (+408/-0)
etl/doc/etl.component.transform.data_filter.data_filter-class.html (+235/-0)
etl/doc/etl.component.transform.data_map-module.html (+168/-0)
etl/doc/etl.component.transform.data_map-pysrc.html (+522/-0)
etl/doc/etl.component.transform.data_map.map-class.html (+353/-0)
etl/doc/etl.component.transform.diff'-module.html (+178/-0)
etl/doc/etl.component.transform.diff'-pysrc.html (+549/-0)
etl/doc/etl.component.transform.diff'.diff-class.html (+372/-0)
etl/doc/etl.component.transform.diff-module.html (+170/-0)
etl/doc/etl.component.transform.diff-pysrc.html (+431/-0)
etl/doc/etl.component.transform.diff.diff-class.html (+260/-0)
etl/doc/etl.component.transform.join'-module.html (+184/-0)
etl/doc/etl.component.transform.join'-pysrc.html (+486/-0)
etl/doc/etl.component.transform.join'.join-class.html (+349/-0)
etl/doc/etl.component.transform.join-module.html (+168/-0)
etl/doc/etl.component.transform.join-pysrc.html (+389/-0)
etl/doc/etl.component.transform.join.join-class.html (+236/-0)
etl/doc/etl.component.transform.logger'-module.html (+144/-0)
etl/doc/etl.component.transform.logger'-pysrc.html (+334/-0)
etl/doc/etl.component.transform.logger'.logger-class.html (+349/-0)
etl/doc/etl.component.transform.logger-module.html (+136/-0)
etl/doc/etl.component.transform.logger-pysrc.html (+338/-0)
etl/doc/etl.component.transform.logger.logger-class.html (+196/-0)
etl/doc/etl.component.transform.logger_bloc'-module.html (+144/-0)
etl/doc/etl.component.transform.logger_bloc'-pysrc.html (+333/-0)
etl/doc/etl.component.transform.logger_bloc'.logger_bloc-class.html (+349/-0)
etl/doc/etl.component.transform.logger_bloc-module.html (+136/-0)
etl/doc/etl.component.transform.logger_bloc-pysrc.html (+337/-0)
etl/doc/etl.component.transform.logger_bloc.logger_bloc-class.html (+196/-0)
etl/doc/etl.component.transform.merge'-module.html (+145/-0)
etl/doc/etl.component.transform.merge'-pysrc.html (+180/-0)
etl/doc/etl.component.transform.merge'.merge-class.html (+264/-0)
etl/doc/etl.component.transform.merge-module.html (+137/-0)
etl/doc/etl.component.transform.merge-pysrc.html (+184/-0)
etl/doc/etl.component.transform.merge.merge-class.html (+156/-0)
etl/doc/etl.component.transform.schema_validator'-module.html (+178/-0)
etl/doc/etl.component.transform.schema_validator'-pysrc.html (+1105/-0)
etl/doc/etl.component.transform.schema_validator'.schema_validator-class.html (+351/-0)
etl/doc/etl.component.transform.schema_validator-module.html (+170/-0)
etl/doc/etl.component.transform.schema_validator-pysrc.html (+1003/-0)
etl/doc/etl.component.transform.schema_validator.schema_validator-class.html (+239/-0)
etl/doc/etl.component.transform.sort'-module.html (+178/-0)
etl/doc/etl.component.transform.sort'-pysrc.html (+496/-0)
etl/doc/etl.component.transform.sort'.sort-class.html (+346/-0)
etl/doc/etl.component.transform.sort-module.html (+170/-0)
etl/doc/etl.component.transform.sort-pysrc.html (+372/-0)
etl/doc/etl.component.transform.sort.sort-class.html (+234/-0)
etl/doc/etl.component.transform.unique'-module.html (+178/-0)
etl/doc/etl.component.transform.unique'-pysrc.html (+501/-0)
etl/doc/etl.component.transform.unique'.unique-class.html (+341/-0)
etl/doc/etl.component.transform.unique-module.html (+170/-0)
etl/doc/etl.component.transform.unique-pysrc.html (+377/-0)
etl/doc/etl.component.transform.unique.unique-class.html (+189/-0)
etl/doc/etl.connector-module.html (+148/-0)
etl/doc/etl.connector-pysrc.html (+149/-0)
etl/doc/etl.connector.connector'-module.html (+143/-0)
etl/doc/etl.connector.connector'-pysrc.html (+346/-0)
etl/doc/etl.connector.connector-module.html (+135/-0)
etl/doc/etl.connector.connector-pysrc.html (+346/-0)
etl/doc/etl.connector.connector.connector-class.html (+234/-0)
etl/doc/etl.connector.facebook_connector'-module.html (+179/-0)
etl/doc/etl.connector.facebook_connector'-pysrc.html (+530/-0)
etl/doc/etl.connector.facebook_connector'.connector-class.html (+359/-0)
etl/doc/etl.connector.facebook_connector'.facebook_connector-class.html (+404/-0)
etl/doc/etl.connector.facebook_connector-module.html (+171/-0)
etl/doc/etl.connector.facebook_connector-pysrc.html (+459/-0)
etl/doc/etl.connector.facebook_connector.facebook_connector-class.html (+303/-0)
etl/doc/etl.connector.file_connector-module.html (+170/-0)
etl/doc/etl.connector.file_connector-pysrc.html (+429/-0)
etl/doc/etl.connector.file_connector.file_connector-class.html (+376/-0)
etl/doc/etl.connector.localfile'-module.html (+178/-0)
etl/doc/etl.connector.localfile'-pysrc.html (+500/-0)
etl/doc/etl.connector.localfile'.localfile-class.html (+376/-0)
etl/doc/etl.connector.localfile-module.html (+170/-0)
etl/doc/etl.connector.localfile-pysrc.html (+407/-0)
etl/doc/etl.connector.localfile.localfile-class.html (+254/-0)
etl/doc/etl.connector.openobject_connector'-module.html (+178/-0)
etl/doc/etl.connector.openobject_connector'-pysrc.html (+754/-0)
etl/doc/etl.connector.openobject_connector'.openobject_connector-class.html (+461/-0)
etl/doc/etl.connector.openobject_connector-module.html (+170/-0)
etl/doc/etl.connector.openobject_connector-pysrc.html (+696/-0)
etl/doc/etl.connector.openobject_connector.openobject_connector-class.html (+316/-0)
etl/doc/etl.connector.sql_connector'-module.html (+185/-0)
etl/doc/etl.connector.sql_connector'-pysrc.html (+501/-0)
etl/doc/etl.connector.sql_connector'.sql_connector-class.html (+382/-0)
etl/doc/etl.connector.sql_connector-module.html (+177/-0)
etl/doc/etl.connector.sql_connector-pysrc.html (+438/-0)
etl/doc/etl.connector.sql_connector.sql_connector-class.html (+261/-0)
etl/doc/etl.connector.sugarcrm-module.html (+134/-0)
etl/doc/etl.connector.sugarcrm-pysrc.html (+142/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services-module.html (+719/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services-pysrc.html (+18791/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.LoginError-class.html (+188/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.contact_by_emailRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.contact_by_emailResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_accountRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_accountResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_caseRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_caseResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_contactRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_contactResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_leadRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_leadResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_opportunityRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_opportunityResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_sessionRequest-class.html (+213/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.create_sessionResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.end_sessionRequest-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.end_sessionResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_attendee_listRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_attendee_listResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_available_modulesRequest-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_available_modulesResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_document_revisionRequest-class.html (+213/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_document_revisionResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entriesRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entriesResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entryRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entryResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entry_listRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_entry_listResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_gmt_timeRequest-class.html (+207/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_gmt_timeResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_mailmerge_documentRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_mailmerge_documentResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_modified_entriesRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_modified_entriesResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_module_fieldsRequest-class.html (+213/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_module_fieldsResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_relationshipsRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_relationshipsResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_server_timeRequest-class.html (+207/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_server_timeResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_server_versionRequest-class.html (+207/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_server_versionResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_sugar_flavorRequest-class.html (+207/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_sugar_flavorResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_user_idRequest-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_user_idResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_user_team_idRequest-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.get_user_team_idResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.is_loopbackRequest-class.html (+207/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.is_loopbackResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.loginRequest-class.html (+213/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.loginResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.logoutRequest-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.logoutResponse-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.seamless_loginRequest-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.seamless_loginResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.searchRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.searchResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.search_by_moduleRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.search_by_moduleResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_campaign_mergeRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_campaign_mergeResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_document_revisionRequest-class.html (+215/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_document_revisionResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_entriesRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_entriesResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_entryRequest-class.html (+217/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_entryResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_relationshipRequest-class.html (+215/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_relationshipResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_relationshipsRequest-class.html (+215/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.set_relationshipsResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.sugarsoapBindingSOAP-class.html (+721/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.sugarsoapLocator-class.html (+221/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.sync_get_modified_relationshipsRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.sync_get_modified_relationshipsResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.testRequest-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.testResponse-class.html (+209/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.track_emailRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.track_emailResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.update_portal_userRequest-class.html (+219/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.update_portal_userResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.user_listRequest-class.html (+213/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services.user_listResponse-class.html (+211/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types-module.html (+131/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types-pysrc.html (+12771/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.contact_detail_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.contact_detail_array_Def-class.html (+397/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.document_revision_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.entry_list_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.entry_value_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.error_value_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.field_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.field_list_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_entry_list_result_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_entry_list_result_encoded_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_entry_result_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_quick_sync_result_encoded_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_relationships_result_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.get_sync_result_encoded_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.id_mod_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.ids_mods_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.module_fields_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.module_list_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.name_value_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.name_value_list_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.name_value_lists_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.name_value_operator_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.name_value_operator_list_Def-class.html (+397/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.note_attachment_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.return_document_revision_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.return_note_attachment_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.select_fields_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.set_entries_result_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.set_entry_result_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.set_relationship_list_Def-class.html (+397/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.set_relationship_list_result_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.set_relationship_value_Def-class.html (+395/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.user_auth_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.user_detail_Def-class.html (+358/-0)
etl/doc/etl.connector.sugarcrm.sugarsoap_services_types.ns0.user_detail_array_Def-class.html (+360/-0)
etl/doc/etl.connector.sugarcrm_connector'-module.html (+174/-0)
etl/doc/etl.connector.sugarcrm_connector'-pysrc.html (+519/-0)
etl/doc/etl.connector.sugarcrm_connector'.sugarcrm_connector-class.html (+418/-0)
etl/doc/etl.connector.sugarcrm_connector-module.html (+166/-0)
etl/doc/etl.connector.sugarcrm_connector-pysrc.html (+451/-0)
etl/doc/etl.connector.sugarcrm_connector.sugarcrm_connector-class.html (+295/-0)
etl/doc/etl.connector.url_connector-module.html (+137/-0)
etl/doc/etl.connector.url_connector-pysrc.html (+382/-0)
etl/doc/etl.connector.url_connector.url_connector-class.html (+372/-0)
etl/doc/etl.connector.xmlrpc_connector'-module.html (+202/-0)
etl/doc/etl.connector.xmlrpc_connector'-pysrc.html (+489/-0)
etl/doc/etl.connector.xmlrpc_connector'.xmlrpc_connector-class.html (+326/-0)
etl/doc/etl.connector.xmlrpc_connector'.xmlrpc_server_thread-class.html (+323/-0)
etl/doc/etl.connector.xmlrpc_connector-module.html (+178/-0)
etl/doc/etl.connector.xmlrpc_connector-pysrc.html (+422/-0)
etl/doc/etl.connector.xmlrpc_connector.xmlrpc_connector-class.html (+206/-0)
etl/doc/etl.connector.xmlrpc_connector.xmlrpc_server_thread-class.html (+324/-0)
etl/doc/etl.etl-module.html (+142/-0)
etl/doc/etl.etl-pysrc.html (+183/-0)
etl/doc/etl.etl_socket-module.html (+163/-0)
etl/doc/etl.etl_socket-pysrc.html (+202/-0)
etl/doc/etl.etl_socket.etl_socket-class.html (+209/-0)
etl/doc/etl.etl_socket.etl_socket_exception-class.html (+251/-0)
etl/doc/etl.job'-module.html (+142/-0)
etl/doc/etl.job'-pysrc.html (+915/-0)
etl/doc/etl.job-class.html (+1099/-0)
etl/doc/etl.job-module.html (+134/-0)
etl/doc/etl.job-pysrc.html (+1042/-0)
etl/doc/etl.job.job-class.html (+1101/-0)
etl/doc/etl.logger-module.html (+206/-0)
etl/doc/etl.logger-pysrc.html (+188/-0)
etl/doc/etl.logger.logger-class.html (+206/-0)
etl/doc/etl.signal'-module.html (+134/-0)
etl/doc/etl.signal'-pysrc.html (+188/-0)
etl/doc/etl.signal-class.html (+329/-0)
etl/doc/etl.signal-module.html (+134/-0)
etl/doc/etl.signal-pysrc.html (+201/-0)
etl/doc/etl.signal.signal-class.html (+323/-0)
etl/doc/etl.tools-module.html (+140/-0)
etl/doc/etl.tools-pysrc.html (+118/-0)
etl/doc/etl.transformer'-module.html (+174/-0)
etl/doc/etl.transformer'-pysrc.html (+237/-0)
etl/doc/etl.transformer-class.html (+428/-0)
etl/doc/etl.transformer-module.html (+174/-0)
etl/doc/etl.transformer-pysrc.html (+238/-0)
etl/doc/etl.transformer.transformer-class.html (+422/-0)
etl/doc/etl.transition'-module.html (+142/-0)
etl/doc/etl.transition'-pysrc.html (+534/-0)
etl/doc/etl.transition-class.html (+435/-0)
etl/doc/etl.transition-module.html (+134/-0)
etl/doc/etl.transition-pysrc.html (+538/-0)
etl/doc/etl.transition.transition-class.html (+437/-0)
etl/doc/frames.html (+17/-0)
etl/doc/help.html (+268/-0)
etl/doc/identifier-index.html (+2966/-0)
etl/doc/index.html (+17/-0)
etl/doc/mimetools.Message-class.html (+375/-0)
etl/doc/module-tree.html (+197/-0)
etl/doc/pickle-module.html (+1044/-0)
etl/doc/pickle-pysrc.html (+1871/-0)
etl/doc/pickle.PickleError-class.html (+194/-0)
etl/doc/pickle.Pickler-class.html (+730/-0)
etl/doc/pickle.PicklingError-class.html (+191/-0)
etl/doc/pickle.Unpickler-class.html (+1238/-0)
etl/doc/pickle.UnpicklingError-class.html (+194/-0)
etl/doc/pickle._EmptyClass-class.html (+105/-0)
etl/doc/pickle._Stop-class.html (+249/-0)
etl/doc/redirect.html (+38/-0)
etl/doc/sys-module.html (+1561/-0)
etl/doc/thread._local-class.html (+354/-0)
etl/doc/threading-module.html (+655/-0)
etl/doc/threading-pysrc.html (+2872/-0)
etl/doc/threading.Thread-class.html (+575/-0)
etl/doc/threading._BoundedSemaphore-class.html (+284/-0)
etl/doc/threading._Condition-class.html (+409/-0)
etl/doc/threading._DummyThread-class.html (+322/-0)
etl/doc/threading._Event-class.html (+300/-0)
etl/doc/threading._MainThread-class.html (+299/-0)
etl/doc/threading._RLock-class.html (+393/-0)
etl/doc/threading._Semaphore-class.html (+311/-0)
etl/doc/threading._Timer-class.html (+314/-0)
etl/doc/threading._Verbose-class.html (+261/-0)
etl/doc/time-module.html (+746/-0)
etl/doc/time.struct_time-class.html (+714/-0)
etl/doc/toc-datetime-module.html (+40/-0)
etl/doc/toc-etl-module.html (+39/-0)
etl/doc/toc-etl.component-module.html (+30/-0)
etl/doc/toc-etl.component.component'-module.html (+33/-0)
etl/doc/toc-etl.component.component-module.html (+32/-0)
etl/doc/toc-etl.component.control-module.html (+30/-0)
etl/doc/toc-etl.component.control.data_count'-module.html (+33/-0)
etl/doc/toc-etl.component.control.data_count-module.html (+32/-0)
etl/doc/toc-etl.component.control.sleep'-module.html (+33/-0)
etl/doc/toc-etl.component.control.sleep-module.html (+32/-0)
etl/doc/toc-etl.component.input-module.html (+30/-0)
etl/doc/toc-etl.component.input.csv_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.csv_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.data'-module.html (+35/-0)
etl/doc/toc-etl.component.input.data-module.html (+34/-0)
etl/doc/toc-etl.component.input.facebook_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.facebook_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.gmail_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.gmail_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.openobject_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.openobject_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.sql_in'-module.html (+36/-0)
etl/doc/toc-etl.component.input.sql_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.sugarcrm_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.sugarcrm_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.vcard_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.vcard_in-module.html (+34/-0)
etl/doc/toc-etl.component.input.xmlrpc_in'-module.html (+35/-0)
etl/doc/toc-etl.component.input.xmlrpc_in-module.html (+34/-0)
etl/doc/toc-etl.component.output-module.html (+30/-0)
etl/doc/toc-etl.component.output.csv_out'-module.html (+35/-0)
etl/doc/toc-etl.component.output.csv_out-module.html (+34/-0)
etl/doc/toc-etl.component.output.facebook_out'-module.html (+35/-0)
etl/doc/toc-etl.component.output.facebook_out-module.html (+34/-0)
etl/doc/toc-etl.component.output.openobject_out'-module.html (+35/-0)
etl/doc/toc-etl.component.output.openobject_out-module.html (+34/-0)
etl/doc/toc-etl.component.output.sql_out'-module.html (+35/-0)
etl/doc/toc-etl.component.output.sql_out-module.html (+34/-0)
etl/doc/toc-etl.component.output.xmlrpc_out'-module.html (+35/-0)
etl/doc/toc-etl.component.output.xmlrpc_out-module.html (+34/-0)
etl/doc/toc-etl.component.transform-module.html (+30/-0)
etl/doc/toc-etl.component.transform.data_filter'-module.html (+35/-0)
etl/doc/toc-etl.component.transform.data_filter-module.html (+34/-0)
etl/doc/toc-etl.component.transform.data_map-module.html (+34/-0)
etl/doc/toc-etl.component.transform.diff'-module.html (+35/-0)
etl/doc/toc-etl.component.transform.diff-module.html (+34/-0)
etl/doc/toc-etl.component.transform.join'-module.html (+36/-0)
etl/doc/toc-etl.component.transform.join-module.html (+34/-0)
etl/doc/toc-etl.component.transform.logger'-module.html (+33/-0)
etl/doc/toc-etl.component.transform.logger-module.html (+32/-0)
etl/doc/toc-etl.component.transform.logger_bloc'-module.html (+33/-0)
etl/doc/toc-etl.component.transform.logger_bloc-module.html (+32/-0)
etl/doc/toc-etl.component.transform.merge'-module.html (+33/-0)
etl/doc/toc-etl.component.transform.merge-module.html (+32/-0)
etl/doc/toc-etl.component.transform.schema_validator'-module.html (+35/-0)
etl/doc/toc-etl.component.transform.schema_validator-module.html (+34/-0)
etl/doc/toc-etl.component.transform.sort'-module.html (+35/-0)
etl/doc/toc-etl.component.transform.sort-module.html (+34/-0)
etl/doc/toc-etl.component.transform.unique'-module.html (+35/-0)
etl/doc/toc-etl.component.transform.unique-module.html (+34/-0)
etl/doc/toc-etl.connector-module.html (+30/-0)
etl/doc/toc-etl.connector.connector'-module.html (+33/-0)
etl/doc/toc-etl.connector.connector-module.html (+32/-0)
etl/doc/toc-etl.connector.facebook_connector'-module.html (+35/-0)
etl/doc/toc-etl.connector.facebook_connector-module.html (+34/-0)
etl/doc/toc-etl.connector.file_connector-module.html (+34/-0)
etl/doc/toc-etl.connector.localfile'-module.html (+35/-0)
etl/doc/toc-etl.connector.localfile-module.html (+34/-0)
etl/doc/toc-etl.connector.openobject_connector'-module.html (+35/-0)
etl/doc/toc-etl.connector.openobject_connector-module.html (+34/-0)
etl/doc/toc-etl.connector.sql_connector'-module.html (+35/-0)
etl/doc/toc-etl.connector.sql_connector-module.html (+34/-0)
etl/doc/toc-etl.connector.sugarcrm-module.html (+30/-0)
etl/doc/toc-etl.connector.sugarcrm.sugarsoap_services-module.html (+116/-0)
etl/doc/toc-etl.connector.sugarcrm.sugarsoap_services_types-module.html (+32/-0)
etl/doc/toc-etl.connector.sugarcrm_connector'-module.html (+35/-0)
etl/doc/toc-etl.connector.sugarcrm_connector-module.html (+34/-0)
etl/doc/toc-etl.connector.url_connector-module.html (+32/-0)
etl/doc/toc-etl.connector.xmlrpc_connector'-module.html (+38/-0)
etl/doc/toc-etl.connector.xmlrpc_connector-module.html (+35/-0)
etl/doc/toc-etl.etl-module.html (+32/-0)
etl/doc/toc-etl.etl_socket-module.html (+35/-0)
etl/doc/toc-etl.job'-module.html (+33/-0)
etl/doc/toc-etl.job-module.html (+32/-0)
etl/doc/toc-etl.logger-module.html (+38/-0)
etl/doc/toc-etl.signal'-module.html (+32/-0)
etl/doc/toc-etl.signal-module.html (+32/-0)
etl/doc/toc-etl.tools-module.html (+32/-0)
etl/doc/toc-etl.transformer'-module.html (+36/-0)
etl/doc/toc-etl.transformer-module.html (+36/-0)
etl/doc/toc-etl.transition'-module.html (+33/-0)
etl/doc/toc-etl.transition-module.html (+32/-0)
etl/doc/toc-everything.html (+420/-0)
etl/doc/toc-pickle-module.html (+115/-0)
etl/doc/toc-sys-module.html (+84/-0)
etl/doc/toc-threading-module.html (+68/-0)
etl/doc/toc-time-module.html (+50/-0)
etl/doc/toc-types-module.html (+32/-0)
etl/doc/toc-xmlrpclib-module.html (+83/-0)
etl/doc/toc.html (+94/-0)
etl/doc/types-module.html (+133/-0)
etl/doc/types-pysrc.html (+895/-0)
etl/doc/xmlrpclib-module.html (+831/-0)
etl/doc/xmlrpclib-pysrc.html (+2833/-0)
etl/doc/xmlrpclib.Binary-class.html (+209/-0)
etl/doc/xmlrpclib.DateTime-class.html (+226/-0)
etl/doc/xmlrpclib.Error-class.html (+254/-0)
etl/doc/xmlrpclib.ExpatParser-class.html (+173/-0)
etl/doc/xmlrpclib.Fault-class.html (+299/-0)
etl/doc/xmlrpclib.Marshaller-class.html (+498/-0)
etl/doc/xmlrpclib.MultiCall-class.html (+214/-0)
etl/doc/xmlrpclib.MultiCallIterator-class.html (+160/-0)
etl/doc/xmlrpclib.ProtocolError-class.html (+301/-0)
etl/doc/xmlrpclib.ResponseError-class.html (+192/-0)
etl/doc/xmlrpclib.SafeTransport-class.html (+234/-0)
etl/doc/xmlrpclib.ServerProxy-class.html (+235/-0)
etl/doc/xmlrpclib.SlowParser-class.html (+142/-0)
etl/doc/xmlrpclib.Transport-class.html (+350/-0)
etl/doc/xmlrpclib.Unmarshaller-class.html (+566/-0)
etl/doc/xmlrpclib._Method-class.html (+175/-0)
etl/doc/xmlrpclib._MultiCallMethod-class.html (+175/-0)
etl/lib/TODO (+30/-0)
etl/lib/demo/facebook_openerp.py (+106/-0)
etl/lib/demo/input/input1.vcf (+11/-0)
etl/lib/demo/openerp_facebook.py (+31/-0)
etl/lib/demo/output/test1_partner.csv.OTHER (+14/-0)
etl/lib/demo/subjob.py (+27/-0)
etl/lib/demo/subjob2.py (+45/-0)
etl/lib/demo/sugercrm_openerp.py (+41/-0)
etl/lib/demo/test1.py.OTHER (+34/-0)
etl/lib/demo/test2.py.OTHER (+42/-0)
etl/lib/demo/test3.py.OTHER (+23/-0)
etl/lib/demo/test_server.py (+104/-0)
etl/lib/demo/vcard_openobject.py.OTHER (+48/-0)
etl/lib/demo/xmlrpc_in_example.py (+11/-0)
etl/lib/demo/xmlrpc_out_example.py (+16/-0)
etl/lib/demo/xmlrpcserver_openobject.py (+111/-0)
etl/lib/etl/__init__.py.OTHER (+91/-0)
etl/lib/etl/component/__init__.py.OTHER (+33/-0)
etl/lib/etl/component/component.py.OTHER (+198/-0)
etl/lib/etl/component/control/__init__.py.OTHER (+33/-0)
etl/lib/etl/component/control/data_count.py.OTHER (+53/-0)
etl/lib/etl/component/control/sleep.py.OTHER (+57/-0)
etl/lib/etl/component/input/__init__.py.OTHER (+37/-0)
etl/lib/etl/component/input/csv_in.py.OTHER (+86/-0)
etl/lib/etl/component/input/data.py.OTHER (+75/-0)
etl/lib/etl/component/input/facebook_in.py (+84/-0)
etl/lib/etl/component/input/gmail_in.py (+85/-0)
etl/lib/etl/component/input/openobject_in.py.OTHER (+91/-0)
etl/lib/etl/component/input/sql_in.py.OTHER (+99/-0)
etl/lib/etl/component/input/sugarcrm_in.py (+71/-0)
etl/lib/etl/component/input/vcard_in.py.OTHER (+79/-0)
etl/lib/etl/component/input/xmlrpc_in.py (+94/-0)
etl/lib/etl/component/output/__init__.py.OTHER (+35/-0)
etl/lib/etl/component/output/csv_out.py.OTHER (+99/-0)
etl/lib/etl/component/output/facebook_out.py (+76/-0)
etl/lib/etl/component/output/openobject_out.py.OTHER (+96/-0)
etl/lib/etl/component/output/sql_out.py.OTHER (+95/-0)
etl/lib/etl/component/output/xmlrpc_out.py (+76/-0)
etl/lib/etl/component/transform/__init__.py.OTHER (+40/-0)
etl/lib/etl/component/transform/data_filter.py.OTHER (+93/-0)
etl/lib/etl/component/transform/data_map.py.OTHER (+104/-0)
etl/lib/etl/component/transform/diff.py.OTHER (+134/-0)
etl/lib/etl/component/transform/join.py.OTHER (+95/-0)
etl/lib/etl/component/transform/logger.py.OTHER (+57/-0)
etl/lib/etl/component/transform/logger_bloc.py.OTHER (+60/-0)
etl/lib/etl/component/transform/merge.py.OTHER (+64/-0)
etl/lib/etl/component/transform/schema_validator.py.OTHER (+136/-0)
etl/lib/etl/component/transform/sort.py.OTHER (+82/-0)
etl/lib/etl/component/transform/subjob.py (+99/-0)
etl/lib/etl/component/transform/unique.py.OTHER (+86/-0)
etl/lib/etl/connector/__init__.py.OTHER (+36/-0)
etl/lib/etl/connector/connector.py.OTHER (+72/-0)
etl/lib/etl/connector/facebook_connector.py (+158/-0)
etl/lib/etl/connector/file_connector.py.OTHER (+79/-0)
etl/lib/etl/connector/localfile.py.OTHER (+91/-0)
etl/lib/etl/connector/openobject_connector.py.OTHER (+147/-0)
etl/lib/etl/connector/sql_connector.py.OTHER (+109/-0)
etl/lib/etl/connector/sugarcrm/__init__.py (+32/-0)
etl/lib/etl/connector/sugarcrm/sugarsoap_services.py (+1019/-0)
etl/lib/etl/connector/sugarcrm/sugarsoap_services_types.py (+649/-0)
etl/lib/etl/connector/sugarcrm_connector.py (+131/-0)
etl/lib/etl/connector/url_connector.py.OTHER (+69/-0)
etl/lib/etl/connector/xmlrpc_connector.py (+105/-0)
etl/lib/etl/etl.py.OTHER (+48/-0)
etl/lib/etl/etl_process.py (+524/-0)
etl/lib/etl/etl_server.py (+43/-0)
etl/lib/etl/etl_socket.py.OTHER (+83/-0)
etl/lib/etl/job.py.OTHER (+455/-0)
etl/lib/etl/logger.py.OTHER (+72/-0)
etl/lib/etl/signal.py.OTHER (+69/-0)
etl/lib/etl/tools.py.OTHER (+7/-0)
etl/lib/etl/transformer.py.OTHER (+104/-0)
etl/lib/etl/transition.py.OTHER (+94/-0)
etl/lib/etl_test/etl_test.py.OTHER (+116/-0)
etl_interface/__init__.py.OTHER (+26/-0)
etl_interface/__terp__.py.OTHER (+87/-0)
etl_interface/etl_component/control/control_data.xml (+15/-0)
etl_interface/etl_component/control/data_count.py.OTHER (+40/-0)
etl_interface/etl_component/control/data_count_view.xml.OTHER (+50/-0)
etl_interface/etl_component/control/sleep.py.OTHER (+44/-0)
etl_interface/etl_component/control/sleep_view.xml.OTHER (+62/-0)
etl_interface/etl_component/etl_component_view.xml (+186/-0)
etl_interface/etl_component/input/__init__.py.OTHER (+30/-0)
etl_interface/etl_component/input/csv_in.py.OTHER (+53/-0)
etl_interface/etl_component/input/csv_in_view.xml.OTHER (+57/-0)
etl_interface/etl_component/input/excel_in.py.OTHER (+37/-0)
etl_interface/etl_component/input/excel_in_view.xml.OTHER (+65/-0)
etl_interface/etl_component/input/facebook_in.py (+52/-0)
etl_interface/etl_component/input/facebook_in_view.xml (+77/-0)
etl_interface/etl_component/input/gmail_in.py (+39/-0)
etl_interface/etl_component/input/gmail_in_view.xml (+52/-0)
etl_interface/etl_component/input/input_data.xml (+56/-0)
etl_interface/etl_component/input/openobject_in.py.OTHER (+64/-0)
etl_interface/etl_component/input/openobject_in_view.xml.OTHER (+76/-0)
etl_interface/etl_component/input/sql_in_view.xml.OTHER (+43/-0)
etl_interface/etl_component/input/sugarcrm_in.py (+51/-0)
etl_interface/etl_component/input/sugarcrm_in_view.xml (+65/-0)
etl_interface/etl_component/input/vcard_in.py.OTHER (+48/-0)
etl_interface/etl_component/input/vcard_in_view.xml.OTHER (+42/-0)
etl_interface/etl_component/input/xml_in.py.OTHER (+50/-0)
etl_interface/etl_component/input/xml_in_view.xml.OTHER (+65/-0)
etl_interface/etl_component/input/xmlrpc_in.py (+53/-0)
etl_interface/etl_component/input/xmlrpc_in_view.xml (+63/-0)
etl_interface/etl_component/output/__init__.py.OTHER (+27/-0)
etl_interface/etl_component/output/csv_out.py.OTHER (+54/-0)
etl_interface/etl_component/output/csv_out_view.xml.OTHER (+64/-0)
etl_interface/etl_component/output/excel_out.py (+38/-0)
etl_interface/etl_component/output/excel_out_view.xml (+65/-0)
etl_interface/etl_component/output/openobject_out.py.OTHER (+67/-0)
etl_interface/etl_component/output/openobject_out_view.xml.OTHER (+78/-0)
etl_interface/etl_component/output/output_data.xml (+41/-0)
etl_interface/etl_component/output/sql_out_view.xml.OTHER (+49/-0)
etl_interface/etl_component/output/vcard_out.py (+34/-0)
etl_interface/etl_component/output/vcard_out_view.xml (+56/-0)
etl_interface/etl_component/output/xml_out.py (+36/-0)
etl_interface/etl_component/output/xml_out_view.xml (+64/-0)
etl_interface/etl_component/output/xmlrpc_out.py (+51/-0)
etl_interface/etl_component/output/xmlrpc_out_view.xml (+63/-0)
etl_interface/etl_component/transform/__init__.py.OTHER (+28/-0)
etl_interface/etl_component/transform/data_filter.py (+53/-0)
etl_interface/etl_component/transform/data_filter_view.xml (+68/-0)
etl_interface/etl_component/transform/data_map.py.OTHER (+86/-0)
etl_interface/etl_component/transform/logger.py.OTHER (+50/-0)
etl_interface/etl_component/transform/logger_bloc_view.xml (+57/-0)
etl_interface/etl_component/transform/logger_view.xml.OTHER (+63/-0)
etl_interface/etl_component/transform/map_view.xml.OTHER (+85/-0)
etl_interface/etl_component/transform/merge.py (+34/-0)
etl_interface/etl_component/transform/merge_view.xml (+46/-0)
etl_interface/etl_component/transform/schema_validator.py (+40/-0)
etl_interface/etl_component/transform/schema_validator_view.xml (+64/-0)
etl_interface/etl_component/transform/sort.py.OTHER (+43/-0)
etl_interface/etl_component/transform/sort_view.xml.OTHER (+63/-0)
etl_interface/etl_component/transform/transform_data.xml (+45/-0)
etl_interface/etl_component/transform/unique.py (+47/-0)
etl_interface/etl_component/transform/unique_view.xml (+60/-0)
etl_interface/etl_connector/__init__.py.OTHER (+25/-0)
etl_interface/etl_connector/etl_connector_data.xml (+26/-0)
etl_interface/etl_connector/etl_connector_view.xml (+115/-0)
etl_interface/etl_connector/facebook_connector.py (+44/-0)
etl_interface/etl_connector/facebook_connector_view.xml (+59/-0)
etl_interface/etl_connector/localfile.py.OTHER (+49/-0)
etl_interface/etl_connector/localfile_view.xml.OTHER (+59/-0)
etl_interface/etl_connector/openobject_connector.py.OTHER (+56/-0)
etl_interface/etl_connector/openobject_connector_view.xml.OTHER (+60/-0)
etl_interface/etl_connector/sql_connector.py.OTHER (+48/-0)
etl_interface/etl_connector/sql_connector_view.xml.OTHER (+57/-0)
etl_interface/etl_connector/sugarcrm_connector_view.xml (+41/-0)
etl_interface/etl_interface.py.OTHER (+677/-0)
etl_interface/etl_interface_demo.xml (+408/-0)
etl_interface/etl_interface_sequence.xml (+15/-0)
etl_interface/etl_interface_view.xml (+605/-0)
etl_interface/etl_interface_workflow.xml (+153/-0)
etl_interface/scheduler.py.OTHER (+53/-0)
etl_interface/wizard/__init__.py (+27/-0)
etl_interface/wizard/wizard_launch_process.py (+65/-0)
etl_interface/wizard/wizard_schedulers_run.py (+63/-0)
fashion/picture.py.OTHER (+101/-0)
fashion/wizard/fashion_help_wizard.py.OTHER (+122/-0)
fleet_maintenance/crm.py.OTHER (+69/-0)
fleet_maintenance/crm_view.xml.OTHER (+213/-0)
fleet_maintenance/invoice.py.OTHER (+138/-0)
fleet_maintenance/sale.py.OTHER (+260/-0)
fleet_maintenance/sale_view.xml.OTHER (+88/-0)
fleet_maintenance/stock.py.OTHER (+218/-0)
fleet_maintenance/stock_view.xml.OTHER (+442/-0)
generalize_account_report/__init__.py (+25/-0)
generalize_account_report/__terp__.py (+37/-0)
generalize_account_report/generalize_account_report.py (+97/-0)
generalize_account_report/generalize_account_report.xml (+21/-0)
generalize_account_report/generalize_account_report_view.xml (+88/-0)
generalize_account_report/report/__init__.py (+2/-0)
generalize_account_report/report/report_generalize_horizontal.py (+387/-0)
generalize_account_report/report/report_generalize_horizontal.rml (+296/-0)
generalize_account_report/report/report_generalize_vertical.py (+299/-0)
generalize_account_report/report/report_generalize_vertical.rml (+298/-0)
generalize_account_report/report/rml_parse.py (+166/-0)
gnucash/__terp__.py.OTHER (+36/-0)
gnucash/gnucash_wizard.py.OTHER (+353/-0)
google_blogger/__init__.py (+24/-0)
google_blogger/__terp__.py (+18/-0)
google_blogger/google_blogger.py (+34/-0)
google_blogger/google_blogger_view.xml (+19/-0)
google_blogger/google_blogger_wizard.xml (+10/-0)
google_blogger/wizard/__init__.py (+23/-0)
google_blogger/wizard/create_blog_tasks.py (+89/-0)
google_calendar/__init__.py (+24/-0)
google_calendar/__terp__.py (+16/-0)
google_calendar/google_calendar.py (+45/-0)
google_calendar/google_calendar_demo.xml (+14/-0)
google_calendar/google_calendar_view.xml (+39/-0)
google_calendar/google_calendar_wizard.xml (+11/-0)
google_calendar/wizard/__init__.py (+23/-0)
google_calendar/wizard/synchronize_events.py (+293/-0)
google_earth/__init__.py (+26/-0)
google_earth/__terp__.py (+23/-0)
google_earth/google_earth.py (+37/-0)
google_earth/google_earth_wizard.xml (+38/-0)
google_earth/kml/partner.kml (+2/-0)
google_earth/kml/partner_region.kml (+14/-0)
google_earth/kml/route.kml (+14/-0)
google_earth/wizard/__init__.py (+25/-0)
google_earth/wizard/google_map_layer.py (+269/-0)
google_earth/wizard/google_map_turnover.py (+186/-0)
google_earth/wizard/google_route.py (+167/-0)
google_earth/world_country.kml (+1953/-0)
google_translate/__init__.py (+26/-0)
google_translate/__terp__.py (+13/-0)
google_translate/google_translate.py (+32/-0)
google_translate/google_translate_view.xml (+27/-0)
google_translate/google_translate_wizard.xml (+13/-0)
google_translate/wizard/__init__.py (+25/-0)
google_translate/wizard/term_translate.py (+101/-0)
health/__init__.py.OTHER (+34/-0)
health/__terp__.py.OTHER (+10/-0)
health/categories.xml.OTHER (+162/-0)
health/data.xml.OTHER (+1713/-0)
health/famille-medicament.xml.OTHER (+149/-0)
health/forme-medicament.xml.OTHER (+1668/-0)
health/health.py.OTHER (+1120/-0)
health/health_view.xml.OTHER (+1318/-0)
health/medicaments-full.xml.OTHER (+29808/-0)
health/medicaments.xml.OTHER (+1854/-0)
health/pathos.xml.OTHER (+304/-0)
health/report.xml.OTHER (+83/-0)
health/report/anniversaire.py.OTHER (+74/-0)
health/report/anniversaire.rml.OTHER (+122/-0)
health/report/entreesortie.py.OTHER (+139/-0)
health/report/entreesortie.rml.OTHER (+340/-0)
health/report/mouvementsemestriel.py.OTHER (+133/-0)
health/report/mouvementsemestriel.rml.OTHER (+3/-0)
health/report/presence.py.OTHER (+118/-0)
health/report/presence.rml.OTHER (+165/-0)
health/report/regimecaisse.py.OTHER (+81/-0)
health/report/regimecaisse.rml.OTHER (+189/-0)
health/soins.xml.OTHER (+850/-0)
health/typechambre.xml.OTHER (+67/-0)
health/wizard.xml.OTHER (+16/-0)
health/wizard/anniversaire.py.OTHER (+65/-0)
health/wizard/entreesortie.py.OTHER (+65/-0)
health/wizard/facturation.py.OTHER (+181/-0)
health/wizard/facturer.py.OTHER (+70/-0)
health/wizard/mouvementsemestriel.py.OTHER (+60/-0)
health/wizard/presence.py.OTHER (+65/-0)
health/wizard/regimecaisse.py.OTHER (+61/-0)
hotel/__init__.py.OTHER (+26/-0)
hotel/__terp__.py.OTHER (+57/-0)
hotel/hotel.py.OTHER (+446/-0)
hotel/hotel_data.xml.OTHER (+155/-0)
hotel/hotel_folio_workflow.xml.OTHER (+242/-0)
hotel/hotel_report.xml.OTHER (+14/-0)
hotel/hotel_view.xml.OTHER (+675/-0)
hotel/hotel_wizard.xml.OTHER (+19/-0)
hotel/report/__init__.py.OTHER (+25/-0)
hotel/report/hotel_report.py.OTHER (+55/-0)
hotel/report/total_folio.rml.OTHER (+114/-0)
hotel/security/hotel_security.xml.OTHER (+11/-0)
hotel/security/ir.model.access.csv.OTHER (+13/-0)
hotel/wizard/__init__.py.OTHER (+25/-0)
hotel/wizard/hotel_wizard.py.OTHER (+76/-0)
hotel_housekeeping/__init__.py.OTHER (+27/-0)
hotel_housekeeping/__terp__.py.OTHER (+52/-0)
hotel_housekeeping/hotel_housekeeping.py.OTHER (+150/-0)
hotel_housekeeping/hotel_housekeeping_data.xml (+23/-0)
hotel_housekeeping/hotel_housekeeping_report.xml (+13/-0)
hotel_housekeeping/hotel_housekeeping_view.xml.OTHER (+181/-0)
hotel_housekeeping/hotel_housekeeping_wizard.xml (+20/-0)
hotel_housekeeping/hotel_housekeeping_workflow.xml.OTHER (+92/-0)
hotel_housekeeping/report/__init__.py (+25/-0)
hotel_housekeeping/report/activity_detail.rml (+110/-0)
hotel_housekeeping/report/housekeeping_report.py (+64/-0)
hotel_housekeeping/security/ir.model.access.csv.OTHER (+7/-0)
hotel_housekeeping/wizard/__init__.py (+24/-0)
hotel_housekeeping/wizard/housekeeping_wizard.py (+78/-0)
hotel_reservation/__init__.py (+26/-0)
hotel_reservation/__terp__.py (+50/-0)
hotel_reservation/hotel_reservation.py.OTHER (+153/-0)
hotel_reservation/hotel_reservation_data.xml (+116/-0)
hotel_reservation/hotel_reservation_report.xml (+37/-0)
hotel_reservation/hotel_reservation_sequence.xml.OTHER (+19/-0)
hotel_reservation/hotel_reservation_view.xml.OTHER (+160/-0)
hotel_reservation/hotel_reservation_wizard.xml.OTHER (+26/-0)
hotel_reservation/hotel_reservation_workflow.xml.OTHER (+48/-0)
hotel_reservation/report/__init__.py (+25/-0)
hotel_reservation/report/checkinlist.rml (+118/-0)
hotel_reservation/report/checkoutlist.rml (+114/-0)
hotel_reservation/report/hotel_reservation_report.py (+77/-0)
hotel_reservation/report/maxroom.rml (+59/-0)
hotel_reservation/report/room_res.rml (+122/-0)
hotel_reservation/security/ir.model.access.csv (+3/-0)
hotel_reservation/wizard/__init__.py (+25/-0)
hotel_reservation/wizard/hotel_reservation_wizard.py (+149/-0)
hotel_restaurant/__init__.py.OTHER (+27/-0)
hotel_restaurant/__terp__.py.OTHER (+55/-0)
hotel_restaurant/hotel_restaurant.py.OTHER (+344/-0)
hotel_restaurant/hotel_restaurant_data.xml.OTHER (+152/-0)
hotel_restaurant/hotel_restaurant_report.xml.OTHER (+26/-0)
hotel_restaurant/hotel_restaurant_sequence.xml.OTHER (+41/-0)
hotel_restaurant/hotel_restaurant_view.xml.OTHER (+430/-0)
hotel_restaurant/hotel_restaurant_wizard.xml.OTHER (+23/-0)
hotel_restaurant/hotel_restaurant_workflow.xml.OTHER (+70/-0)
hotel_restaurant/report/__init__.py.OTHER (+25/-0)
hotel_restaurant/report/bill.rml.OTHER (+249/-0)
hotel_restaurant/report/hotel_restaurant_report.py.OTHER (+50/-0)
hotel_restaurant/report/kot.rml.OTHER (+165/-0)
hotel_restaurant/report/res_table.rml.OTHER (+95/-0)
hotel_restaurant/security/ir.model.access.csv.OTHER (+11/-0)
hotel_restaurant/wizard/__init__.py.OTHER (+26/-0)
hotel_restaurant/wizard/hotel_restaurant_wizard.py.OTHER (+109/-0)
hr_attendance_project/__init__.py (+27/-0)
hr_attendance_project/__terp__.py (+42/-0)
hr_attendance_project/hr_attendance_project.py (+28/-0)
hr_attendance_project/hr_attendance_project_view.xml (+6/-0)
hr_attendance_project/hr_attendance_project_wizard.xml (+34/-0)
hr_attendance_project/i18n/ca_ES.po (+229/-0)
hr_attendance_project/i18n/es_ES.po (+229/-0)
hr_attendance_project/i18n/fr_FR.po (+220/-0)
hr_attendance_project/i18n/hr_attendance_project.pot (+219/-0)
hr_attendance_project/wizard/__init__.py (+26/-0)
hr_attendance_project/wizard/sign_in_out_task_project.py (+298/-0)
hr_contract_available/__terp__.py.OTHER (+44/-0)
hr_contract_available/hr_contract_available_view.xml.OTHER (+67/-0)
hr_expenses_supplier/__init__.py (+26/-0)
hr_expenses_supplier/__terp__.py (+48/-0)
hr_expenses_supplier/i18n/fr.po (+41/-0)
hr_expenses_supplier/i18n/fr_FR.po (+39/-0)
hr_expenses_supplier/i18n/hr_expenses_supplier.pot (+39/-0)
hr_expenses_supplier/object/__init__.py (+25/-0)
hr_expenses_supplier/object/hr_expenses.py (+134/-0)
hr_expenses_supplier/view/hr_expenses.xml (+37/-0)
hr_holidays_evaluation/__init__.py (+25/-0)
hr_holidays_evaluation/__terp__.py (+39/-0)
hr_holidays_evaluation/hr_holidays_evaluation.py (+167/-0)
hr_holidays_evaluation/hr_holidays_evaluation_view.xml (+83/-0)
hr_holidays_evaluation/security/ir.model.access.csv (+3/-0)
hr_holidays_request/hr_holiday_wizard.xml.OTHER (+33/-0)
hr_holidays_request/hr_holidays_request.py.OTHER (+454/-0)
hr_holidays_request/hr_holidays_request_view.xml.OTHER (+452/-0)
hr_holidays_request/report/hr_holiday_report.py.OTHER (+91/-0)
hr_holidays_request/report/hrreport_form.rml.OTHER (+268/-0)
hr_holidays_request/wizard/hr_holiday.py.OTHER (+122/-0)
hr_interview/__init__.py (+26/-0)
hr_interview/__terp__.py (+43/-0)
hr_interview/hr_interview.py (+219/-0)
hr_interview/hr_interview_report.xml (+6/-0)
hr_interview/hr_interview_view.xml (+305/-0)
hr_interview/hr_sequence.xml (+16/-0)
hr_interview/hr_wizard.xml (+13/-0)
hr_interview/hr_workflow.xml (+123/-0)
hr_interview/report/__init__.py (+1/-0)
hr_interview/report/candidate_summary.py (+55/-0)
hr_interview/report/candidate_summary.rml (+359/-0)
hr_interview/security/ir.model.access.csv (+6/-0)
hr_interview/wizard/__init__.py (+25/-0)
hr_interview/wizard/wiz_schedule.py (+108/-0)
hr_interview/wizard/wizard_send_interview_mail.py (+106/-0)
hr_performance/hr_performance.py.OTHER (+228/-0)
hr_performance/report/performance.rml.OTHER (+158/-0)
hr_skill/report/evaluation.rml.OTHER (+191/-0)
hr_skill/report/skillreport.rml.OTHER (+161/-0)
hr_timesheet_ical/wizard/__init__.py.OTHER (+27/-0)
hr_timesheet_ical/wizard/urllib2.py.OTHER (+1311/-0)
hr_timesheet_ical/wizard/wizard_ical.py.OTHER (+154/-0)
huissier/huissier_report.xml.OTHER (+147/-0)
huissier/huissier_wizard.xml.OTHER (+83/-0)
huissier/report/badge.rml.OTHER (+58/-0)
huissier/report/code_bar_lot.rml.OTHER (+51/-0)
huissier/report/pv.py.OTHER (+153/-0)
huissier/report/ticket.rml.OTHER (+94/-0)
huissier/wizard/wizard_invoice_labels.py.OTHER (+66/-0)
import_export/__terp__.py.OTHER (+43/-0)
internetdomain/__init__.py (+25/-0)
internetdomain/__terp__.py (+53/-0)
internetdomain/company.py (+41/-0)
internetdomain/company_view.xml (+21/-0)
internetdomain/i18n/ca.po (+274/-0)
internetdomain/i18n/ca_ES.po (+272/-0)
internetdomain/i18n/es.po (+273/-0)
internetdomain/i18n/es_ES.po (+272/-0)
internetdomain/i18n/internetdomain.pot (+264/-0)
internetdomain/internetdomain.py (+145/-0)
internetdomain/internetdomain_data.xml (+19/-0)
internetdomain/internetdomain_report.xml (+6/-0)
internetdomain/internetdomain_view.xml (+121/-0)
internetdomain/internetdomain_wizard.xml (+19/-0)
internetdomain/report/domain.jrxml (+89/-0)
internetdomain/security/internetdomain_security.xml (+9/-0)
internetdomain/security/ir.model.access.csv (+3/-0)
internetdomain/wizard/__init__.py (+1/-0)
internetdomain/wizard/make_invoice.py (+140/-0)
invoice_sequence/invoice.py.OTHER (+32/-0)
l10n_ch_zip_and_bank/__init__.py (+32/-0)
l10n_ch_zip_and_bank/__terp__.py (+58/-0)
l10n_ch_zip_and_bank/bank.xml (+42507/-0)
l10n_ch_zip_and_bank/zip.xml (+58513/-0)
l10n_chart_ch_german/account_tax_code.xml.OTHER (+45/-0)
l10n_chart_de_skr03/account_chart.xml.OTHER (+2093/-0)
l10n_chart_de_skr03/account_tax.xml.OTHER (+96/-0)
l10n_chart_ec/__init__.py (+24/-0)
l10n_chart_ec/__terp__.py (+37/-0)
l10n_chart_ec/account_chart.xml (+4192/-0)
l10n_chart_ec/account_tax.xml (+84/-0)
l10n_chart_ec/account_tax_code.xml (+45/-0)
l10n_chart_ec/l10n_chart_ec_wizard.xml (+14/-0)
l10n_chart_in/__terp__.py.OTHER (+44/-0)
l10n_chart_in/account_chart.xml.OTHER (+562/-0)
l10n_chart_pl/__terp__.py.OTHER (+43/-0)
l10n_chart_pl/account_chart.xml.OTHER (+3190/-0)
l10n_chart_pl/account_tax.xml.OTHER (+95/-0)
l10n_chart_pl/account_tax_code.xml.OTHER (+47/-0)
l10n_fr_account_generation/partner.py.OTHER (+93/-0)
l10n_simple/__init__.py.OTHER (+24/-0)
l10n_simple/__terp__.py.OTHER (+38/-0)
l10n_simple/account_pcmn_belgium.xml.OTHER (+625/-0)
l10n_simple/tax_configure_wiz.py (+70/-0)
l10n_simple/tax_configure_wiz.xml (+41/-0)
label/__init__.py.OTHER (+26/-0)
label/__terp__.py.OTHER (+48/-0)
label/i18n/ca_ES.po.OTHER (+298/-0)
label/i18n/es_ES.po.OTHER (+297/-0)
label/i18n/label.pot.OTHER (+398/-0)
label/report/__init__.py.OTHER (+25/-0)
label/report_label.py.OTHER (+115/-0)
label/wizard/__init__.py.OTHER (+25/-0)
label/wizard/wizard_partner_labels.py.OTHER (+158/-0)
library/__terp__.py.OTHER (+39/-0)
library/account.py.OTHER (+36/-0)
library/library_editor_supplier.py.OTHER (+106/-0)
library/library_view.xml.OTHER (+584/-0)
library/mrp.py.OTHER (+81/-0)
library/purchase.py.OTHER (+110/-0)
library/sale.py.OTHER (+198/-0)
lunch/lunch_view.xml.OTHER (+232/-0)
magento_openerp_synchro/magento.py.OTHER (+121/-0)
magento_openerp_synchro/magento_utils.py.OTHER (+186/-0)
magento_openerp_synchro/product.py.OTHER (+418/-0)
magento_openerp_synchro/wizard/magento_category_synchronize.py.OTHER (+86/-0)
magento_openerp_synchro/wizard/magento_product_synchronize.py.OTHER (+86/-0)
magento_openerp_synchro/wizard/magento_so_correct.py.OTHER (+135/-0)
magento_openerp_synchro/wizard/magento_so_import.py.OTHER (+269/-0)
magento_openerp_synchro/wizard/magento_so_update.py.OTHER (+100/-0)
maintenance_editor/__init__.py.OTHER (+35/-0)
maintenance_editor/__terp__.py.OTHER (+54/-0)
maintenance_editor/maintenance_editor.py.OTHER (+296/-0)
maintenance_editor/maintenance_editor_view.xml.OTHER (+132/-0)
maintenance_editor/maintenance_report.xml (+33/-0)
maintenance_editor/maintenance_wizard.xml (+8/-0)
maintenance_editor/report/__init__.py (+33/-0)
maintenance_editor/report/basic_contract.rml (+518/-0)
maintenance_editor/report/contract_report.py (+40/-0)
maintenance_editor/report/corporate_contract.rml (+520/-0)
maintenance_editor/report/smb_contract.rml (+518/-0)
maintenance_editor/security/ir.model.access.csv.OTHER (+9/-0)
maintenance_editor/security/maintenance_security.xml.OTHER (+12/-0)
maintenance_editor/wizard/__init__.py (+27/-0)
maintenance_editor/wizard/wizard_print_maintenance_contract.py (+69/-0)
maintenance_editor/wizard/wizard_refresh_module.py (+44/-0)
marketing/i18n/ca.po (+436/-0)
marketing/i18n/ca_ES.po (+432/-0)
marketing/i18n/es.po (+436/-0)
marketing/i18n/es_ES.po (+432/-0)
marketing/i18n/marketing.pot (+432/-0)
md_hr_contract/md_hr_contract.py.OTHER (+118/-0)
md_hr_contract/md_hr_contract_view.xml.OTHER (+188/-0)
md_hr_employee/md_hr_employee.py.OTHER (+191/-0)
md_hr_employee/md_hr_employee_data.xml.OTHER (+114/-0)
membership_card/__init__.py.OTHER (+28/-0)
membership_card/__terp__.py.OTHER (+41/-0)
membership_card/i18n/ca_ES.po.OTHER (+44/-0)
membership_card/i18n/es_ES.po.OTHER (+44/-0)
membership_card/i18n/membership_card.pot.OTHER (+43/-0)
membership_card/membership_card.py.OTHER (+34/-0)
membership_card/report/__init__.py.OTHER (+24/-0)
membership_card/report/membership_card.rml.OTHER (+84/-0)
membership_card/report/membership_card_address.rml.OTHER (+79/-0)
membership_card/report/membership_card_report.py.OTHER (+28/-0)
membership_card/wizard/__init__.py.OTHER (+25/-0)
mrp_bom_customization/__init__.py.OTHER (+30/-0)
mrp_bom_customization/__terp__.py.OTHER (+47/-0)
mrp_bom_customization/configurator_view.xml.OTHER (+51/-0)
mrp_bom_customization/configurator_wizard.py.OTHER (+252/-0)
mrp_bom_customization/demo_data.xml (+215/-0)
mrp_bom_customization/mrp.py.OTHER (+171/-0)
mrp_bom_customization/mrp_bom_customization.py.OTHER (+64/-0)
mrp_bom_customization/mrp_bom_customization_view.xml.OTHER (+83/-0)
mrp_bom_customization/mrp_view.xml (+38/-0)
mrp_bom_customization/sale.py (+33/-0)
mrp_bom_customization/sale_view.xml (+54/-0)
mrp_bom_customization/security/ir.model.access.csv (+7/-0)
mrp_bom_customization/stock.py (+90/-0)
mrp_bom_customization/stock_view.xml (+20/-0)
mrp_prodlot_autosplit/__init__.py.OTHER (+24/-0)
mrp_prodlot_autosplit/__terp__.py.OTHER (+58/-0)
mrp_prodlot_autosplit/product.py.OTHER (+35/-0)
mrp_prodlot_autosplit/stock.py.OTHER (+168/-0)
mrp_prodlot_autosplit/stock_view.xml.OTHER (+61/-0)
multi_company_account/__init__.py.OTHER (+26/-0)
multi_company_account/__terp__.py.OTHER (+40/-0)
multi_company_account/multi_company_account.py.OTHER (+379/-0)
multi_company_account/multi_company_account_data.xml.OTHER (+179/-0)
multi_company_account/multi_company_account_view.xml.OTHER (+229/-0)
multi_company_account/wizard/__init__.py (+1/-0)
multi_company_account/wizard/wizard_journal.py (+92/-0)
multi_company_currency/__terp__.py.OTHER (+43/-0)
multi_company_currency/multi_currency.py.OTHER (+53/-0)
multi_company_currency/multi_currency_view.xml.OTHER (+87/-0)
multi_company_product/__init__.py (+1/-0)
multi_company_product/__terp__.py (+26/-0)
multi_company_product/product.py (+147/-0)
multi_company_product/product_view.xml (+93/-0)
multi_company_product/security/ir.model.access.csv (+3/-0)
multi_company_purchase/__init__.py (+1/-0)
multi_company_purchase/__terp__.py (+24/-0)
multi_company_purchase/purchase.py (+9/-0)
multi_company_purchase/purchase_view.xml (+28/-0)
multi_company_sequence/__init__.py (+1/-0)
multi_company_sequence/__terp__.py (+23/-0)
multi_company_sequence/multi_company_sequence.py (+33/-0)
multi_company_sequence/multi_company_sequence_view.xml (+41/-0)
multilogin_portal/__init__.py (+29/-0)
multilogin_portal/__terp__.py (+27/-0)
multilogin_portal/portal.py (+136/-0)
multilogin_portal/res_view.xml (+40/-0)
nan_account_statement_of_accounts/__init__.py (+30/-0)
nan_account_statement_of_accounts/__terp__.py (+55/-0)
nan_account_statement_of_accounts/account_view.xml (+38/-0)
nan_account_statement_of_accounts/account_wizard.py (+194/-0)
nan_account_statement_of_accounts/account_wizard.xml (+33/-0)
nan_account_statement_of_accounts/i18n/account_statement_of_accounts.pot (+85/-0)
nan_account_statement_of_accounts/i18n/ca.po (+92/-0)
nan_account_statement_of_accounts/i18n/ca_ES.po (+91/-0)
nan_account_statement_of_accounts/i18n/es.po (+92/-0)
nan_account_statement_of_accounts/i18n/es_ES.po (+91/-0)
nan_account_statement_of_accounts/security/ir.model.access.csv (+2/-0)
nan_external_prices/__init__.py (+32/-0)
nan_external_prices/__terp__.py (+54/-0)
nan_external_prices/external_prices.py (+215/-0)
nan_external_prices/i18n/ca.po (+166/-0)
nan_external_prices/i18n/ca_ES.po (+139/-0)
nan_external_prices/i18n/es.po (+166/-0)
nan_external_prices/i18n/es_ES.po (+139/-0)
nan_external_prices/i18n/nan_external_prices.pot (+135/-0)
nan_external_prices/invoice_view.xml (+30/-0)
nan_external_prices/sale_view.xml (+29/-0)
nan_mrp_procurement_cheapest_supplier/__init__.py (+30/-0)
nan_mrp_procurement_cheapest_supplier/__terp__.py (+18/-0)
nan_mrp_procurement_cheapest_supplier/mrp.py (+111/-0)
nan_mrp_production_merge/__init__.py (+31/-0)
nan_mrp_production_merge/__terp__.py (+18/-0)
nan_mrp_production_merge/mrp.py (+129/-0)
nan_mrp_production_merge/mrp_view.xml (+12/-0)
nan_mrp_production_merge/wizard/__init__.py (+31/-0)
nan_mrp_production_merge/wizard/mrp_production_merge.py (+80/-0)
nan_mrp_production_split/__init__.py (+31/-0)
nan_mrp_production_split/__terp__.py (+18/-0)
nan_mrp_production_split/mrp.py (+77/-0)
nan_mrp_production_split/mrp_view.xml (+12/-0)
nan_mrp_production_split/wizard/__init__.py (+31/-0)
nan_mrp_production_split/wizard/mrp_production_split.py (+84/-0)
nan_partner_risk/__init__.py (+24/-0)
nan_partner_risk/__terp__.py (+27/-0)
nan_partner_risk/i18n/ca.po (+168/-0)
nan_partner_risk/i18n/ca_ES.po (+168/-0)
nan_partner_risk/i18n/es.po (+169/-0)
nan_partner_risk/i18n/es_ES.po (+169/-0)
nan_partner_risk/i18n/nan_partner_risk.pot (+148/-0)
nan_partner_risk/risk.py (+252/-0)
nan_partner_risk/risk_view.xml (+26/-0)
nan_partner_risk/sale_view.xml (+46/-0)
nan_partner_risk/sale_workflow.xml (+44/-0)
nan_partner_risk/wizard/__init__.py (+22/-0)
nan_partner_risk/wizard/open_risk_window.py (+78/-0)
nan_partner_risk_insurance/__init__.py (+23/-0)
nan_partner_risk_insurance/__terp__.py (+19/-0)
nan_partner_risk_insurance/i18n/ca_ES.po (+117/-0)
nan_partner_risk_insurance/i18n/es_ES.po (+116/-0)
nan_partner_risk_insurance/i18n/nan_partner_risk_insurance.pot (+112/-0)
nan_partner_risk_insurance/partner.py (+47/-0)
nan_partner_risk_insurance/partner_view.xml (+28/-0)
nan_pricelist_extended/__init__.py (+34/-0)
nan_pricelist_extended/__terp__.py (+63/-0)
nan_pricelist_extended/pricelist.py (+363/-0)
nan_pricelist_extended/pricelist_view.xml (+59/-0)
nan_product_pack/__init__.py (+30/-0)
nan_product_pack/__terp__.py (+16/-0)
nan_product_pack/i18n/ca_ES.po (+131/-0)
nan_product_pack/i18n/es_ES.po (+144/-0)
nan_product_pack/i18n/nan_product_pack.pot (+123/-0)
nan_product_pack/pack.py (+198/-0)
nan_product_pack/pack_view.xml (+50/-0)
nan_product_sequence/__init__.py (+24/-0)
nan_product_sequence/__terp__.py (+36/-0)
nan_product_sequence/product.py (+32/-0)
nan_product_sequence/product_sequence.xml (+14/-0)
nan_product_supplier_info_extended/__init__.py (+30/-0)
nan_product_supplier_info_extended/__terp__.py (+14/-0)
nan_product_supplier_info_extended/product.py (+58/-0)
nan_product_supplier_info_extended/product_view.xml (+33/-0)
nan_purchase_order_line/__init__.py (+20/-0)
nan_purchase_order_line/__terp__.py (+39/-0)
nan_purchase_order_line/purchase_view.xml (+19/-0)
nan_purchase_product_recent/__init__.py (+33/-0)
nan_purchase_product_recent/__terp__.py (+42/-0)
nan_purchase_product_recent/i18n/ca.po (+50/-0)
nan_purchase_product_recent/i18n/ca_ES.po (+53/-0)
nan_purchase_product_recent/i18n/es.po (+52/-0)
nan_purchase_product_recent/i18n/es_ES.po (+53/-0)
nan_purchase_product_recent/i18n/nan_purchase_product_recent.pot (+42/-0)
nan_purchase_product_recent/product.py (+57/-0)
nan_purchase_product_recent/purchase_order.py (+59/-0)
nan_purchase_product_recent/purchase_order_view.xml (+16/-0)
nan_quality_control/__init__.py (+32/-0)
nan_quality_control/__terp__.py (+49/-0)
nan_quality_control/quality_control.py (+473/-0)
nan_quality_control/quality_control_data.xml (+12/-0)
nan_quality_control/quality_control_view.xml (+445/-0)
nan_quality_control/test_workflow.xml (+77/-0)
nan_sale_product_recent/__init__.py (+33/-0)
nan_sale_product_recent/__terp__.py (+42/-0)
nan_sale_product_recent/i18n/ca.po (+57/-0)
nan_sale_product_recent/i18n/ca_ES.po (+56/-0)
nan_sale_product_recent/i18n/es.po (+56/-0)
nan_sale_product_recent/i18n/es_ES.po (+56/-0)
nan_sale_product_recent/i18n/nan_sale_product_recent.pot (+42/-0)
nan_sale_product_recent/product.py (+57/-0)
nan_sale_product_recent/sale_order.py (+62/-0)
nan_sale_product_recent/sale_order_view.xml (+18/-0)
nan_stock_move_filters/__init__.py (+31/-0)
nan_stock_move_filters/__terp__.py (+20/-0)
nan_stock_move_filters/product.py (+45/-0)
nan_stock_move_filters/stock.py (+101/-0)
nan_stock_move_filters/stock_view.xml (+135/-0)
nan_stock_production_lot_cost/__init__.py (+30/-0)
nan_stock_production_lot_cost/__terp__.py (+20/-0)
nan_stock_production_lot_cost/stock.py (+109/-0)
nan_stock_production_lot_cost/stock_view.xml (+19/-0)
nan_stock_production_lot_quality_control/__init__.py (+32/-0)
nan_stock_production_lot_quality_control/__terp__.py (+54/-0)
nan_stock_production_lot_quality_control/prodlot_sequence.xml (+15/-0)
nan_stock_production_lot_quality_control/prodlot_workflow.xml (+121/-0)
nan_stock_production_lot_quality_control/quality_control.py (+158/-0)
nan_stock_production_lot_quality_control/quality_control_view.xml (+103/-0)
network/__terp__.py.OTHER (+47/-0)
network/i18n/ca_ES.po (+452/-0)
network/i18n/es_ES.po (+454/-0)
network/i18n/fr_FR.po (+453/-0)
network/i18n/network.pot (+446/-0)
network/network.py.OTHER (+168/-0)
network/network_view.xml.OTHER (+326/-0)
network/security/ir.model.access.csv.OTHER (+15/-0)
network/security/network_security.xml (+14/-0)
network_extension/LICENSE.txt (+674/-0)
network_extension/__init__.py (+29/-0)
network_extension/__terp__.py (+55/-0)
network_extension/i18n/ca.po (+333/-0)
network_extension/i18n/ca_ES.po (+334/-0)
network_extension/i18n/es.po (+334/-0)
network_extension/i18n/es_ES.po (+334/-0)
network_extension/i18n/fr_FR.po (+303/-0)
network_extension/i18n/network_extension.pot (+319/-0)
network_extension/network.py (+270/-0)
network_extension/network_protocol_data.xml (+101/-0)
network_extension/network_view.xml (+444/-0)
network_extension/security/ir.model.access.csv (+7/-0)
ol_password_reset/__init__.py (+24/-0)
ol_password_reset/__terp__.py (+53/-0)
ol_password_reset/ol_wizard.xml (+12/-0)
ol_password_reset/res_users.py (+64/-0)
ol_password_reset/template_data.xml (+53/-0)
ol_password_reset/wizard/__init__.py (+24/-0)
ol_password_reset/wizard/password_reset.py (+96/-0)
olap/__terp__.py.OTHER (+23/-0)
olap/cli/Makefile.OTHER (+69/-0)
olap/cli/tinybi.py.OTHER (+86/-0)
olap/cube/cross.py.OTHER (+32/-0)
olap/cube/cube.py.OTHER (+24/-0)
olap/cube/datatype.py.OTHER (+8/-0)
olap/cube/formatstring.py.OTHER (+8/-0)
olap/cube/level.py.OTHER (+297/-0)
olap/cube/levels/level_interface.py.OTHER (+14/-0)
olap/cube/levels/level_normal.py.OTHER (+32/-0)
olap/cube/mdx_input/mdx_input.py.OTHER (+5/-0)
olap/cube/mdx_operator.py.OTHER (+35/-0)
olap/cube/mdx_output/mdx_output.py.OTHER (+56/-0)
olap/cube/mdx_parser.py.OTHER (+201/-0)
olap/cube/measure.py.OTHER (+84/-0)
olap/cube/query.py.OTHER (+230/-0)
olap/cube/slicer.py.OTHER (+42/-0)
olap/data/olap_cube_view.xml.OTHER (+661/-0)
olap/data/olap_cube_workflow.xml.OTHER (+87/-0)
olap/data/olap_demo.xml.OTHER (+171/-0)
olap/data/olap_fact_view.xml.OTHER (+345/-0)
olap/data/olap_view.xml.OTHER (+55/-0)
olap/data/olap_wizard.xml.OTHER (+73/-0)
olap/olap.py.OTHER (+1659/-0)
olap/wizard/wizard_application_configure.py.OTHER (+194/-0)
olap/wizard/wizard_clear_logs.py.OTHER (+83/-0)
olap/wizard/wizard_load_columns.py.OTHER (+55/-0)
olap/wizard/wizard_load_configured_table.py.OTHER (+67/-0)
olap/wizard/wizard_load_data.py.OTHER (+406/-0)
olap/wizard/wizard_query_builder.py.OTHER (+240/-0)
olap/wizard/wizard_test_connection.py.OTHER (+52/-0)
olap_crm/olap_crm.xml.OTHER (+462/-0)
olap_extract/__terp__.py.OTHER (+16/-0)
olap_extract/olap_extract_wizard.xml.OTHER (+12/-0)
olap_sale/__terp__.py.OTHER (+16/-0)
olap_sale/olap_sale.xml.OTHER (+753/-0)
partner_credit_limit/__init__.py (+25/-0)
partner_credit_limit/__terp__.py (+45/-0)
partner_credit_limit/partner.py (+37/-0)
partner_credit_limit/partner_view.xml (+16/-0)
partner_credit_limit/sale.py (+58/-0)
partner_credit_limit/sale_workflow.xml (+11/-0)
partner_spam/__init__.py.OTHER (+24/-0)
partner_spam/__terp__.py.OTHER (+63/-0)
partner_spam/i18n/ca_ES.po.OTHER (+367/-0)
partner_spam/i18n/es_ES.po.OTHER (+367/-0)
partner_spam/i18n/partner_spam.pot.OTHER (+367/-0)
partner_spam/wizard/__init__.py.OTHER (+26/-0)
partner_spam/wizard/wizard_sms.py.OTHER (+173/-0)
partner_spam/wizard/wizard_spam.py.OTHER (+243/-0)
point_of_sale_extension/LICENSE.txt (+674/-0)
point_of_sale_extension/__init__.py (+33/-0)
point_of_sale_extension/__terp__.py (+63/-0)
point_of_sale_extension/company.py (+51/-0)
point_of_sale_extension/company_view.xml (+23/-0)
point_of_sale_extension/i18n/ca_ES.po (+382/-0)
point_of_sale_extension/i18n/es_ES.po (+384/-0)
point_of_sale_extension/i18n/fr_FR.po (+338/-0)
point_of_sale_extension/i18n/nl_NL.po (+338/-0)
point_of_sale_extension/i18n/point_of_sale_extension.pot (+363/-0)
point_of_sale_extension/pos.py (+538/-0)
point_of_sale_extension/pos_view.xml (+186/-0)
point_of_sale_extension/pos_wizard.xml (+7/-0)
point_of_sale_extension/report/__init__.py (+30/-0)
point_of_sale_extension/report/custom_report.py (+43/-0)
point_of_sale_extension/report/pos_receipt.rml (+171/-0)
point_of_sale_extension/security/ir.model.access.csv (+2/-0)
point_of_sale_extension/wizard/__init__.py (+30/-0)
point_of_sale_extension/wizard/wizard_pos_payment.py (+325/-0)
portal/i18n/fr_FR.po (+364/-0)
portal/i18n/portal.pot (+364/-0)
portal/portal.py.OTHER (+270/-0)
portal/wizard/create_menu.py.OTHER (+121/-0)
portal_account/__terp__.py.OTHER (+42/-0)
portal_account/portal_account_data.xml.OTHER (+104/-0)
portal_account/portal_account_view.xml (+167/-0)
portal_account/portal_conf_data.xml.OTHER (+58/-0)
portal_account/security/ir.model.access.csv (+12/-0)
portal_analytic/__terp__.py.OTHER (+41/-0)
portal_analytic/portal_analytic_data.xml.OTHER (+50/-0)
portal_analytic/portal_analytic_view.xml (+121/-0)
portal_analytic/security/ir.model.access.csv (+8/-0)
portal_analytic_package/__terp__.py.OTHER (+38/-0)
portal_analytic_package/portal_analytic_package_data.xml (+49/-0)
portal_analytic_package/portal_analytic_package_view.xml (+23/-0)
portal_analytic_package/security/ir.model.access.csv (+3/-0)
portal_project/__init__.py (+24/-0)
portal_project/__terp__.py (+39/-0)
portal_project/portal_project.py (+132/-0)
portal_project/portal_project_view.xml (+80/-0)
portal_sale/__terp__.py.OTHER (+43/-0)
portal_sale/portal_conf_data.xml.OTHER (+25/-0)
portal_sale/portal_sale_data.xml.OTHER (+51/-0)
portal_sale/portal_sale_view.xml (+124/-0)
portal_sale/security/ir.model.access.csv (+15/-0)
portal_service/__terp__.py.OTHER (+45/-0)
portal_service/portal_crm_data.xml.OTHER (+93/-0)
portal_service/portal_crm_view.xml.OTHER (+372/-0)
portal_service/portal_project_data.xml.OTHER (+47/-0)
portal_service/portal_project_view.xml (+28/-0)
portal_service/portal_scrum_data.xml.OTHER (+53/-0)
portal_service/scrum.py.OTHER (+48/-0)
portal_service/security/ir.model.access.csv (+18/-0)
portal_training/__init__.py (+25/-0)
portal_training/__terp__.py (+47/-0)
portal_training/portal_training.py (+27/-0)
portal_training/portal_training_data.xml (+349/-0)
portal_training/portal_training_demo.xml (+33/-0)
portal_training/portal_training_view.xml (+52/-0)
product_catalog_report/__terp__.py.OTHER (+37/-0)
product_catalog_report/report/product_catalog.py.OTHER (+140/-0)
product_catalog_report/report/product_catalog.rml.OTHER (+287/-0)
product_category_extended/__init__.py (+28/-0)
product_category_extended/__terp__.py (+49/-0)
product_category_extended/i18n/fr.po (+124/-0)
product_category_extended/i18n/fr_FR.po (+123/-0)
product_category_extended/i18n/product_category_extended.pot (+117/-0)
product_category_extended/object/__init__.py (+26/-0)
product_category_extended/object/product.py (+90/-0)
product_category_extended/report/__init__.py (+25/-0)
product_category_extended/view/product.xml (+146/-0)
product_category_extended/wizard/__init__.py (+25/-0)
product_ean13/__init__.py (+25/-0)
product_ean13/__terp__.py (+54/-0)
product_ean13/i18n/es.po (+101/-0)
product_ean13/i18n/es_ES.po (+65/-0)
product_ean13/i18n/product_ean13.pot (+59/-0)
product_ean13/product_seq.py (+24/-0)
product_ean13/product_seq_sequence.xml (+22/-0)
product_ean13/product_seq_wizard.xml (+11/-0)
product_ean13/wizard/__init__.py (+23/-0)
product_ean13/wizard/create_ean13.py (+77/-0)
product_expiry/i18n/ca.po (+123/-0)
product_expiry/i18n/ca_ES.po (+115/-0)
product_expiry/i18n/es.po (+123/-0)
product_expiry/i18n/es_ES.po (+115/-0)
product_expiry/i18n/fr.po (+122/-0)
product_expiry/i18n/product_expiry.pot (+115/-0)
product_expiry/product_expiry.py.OTHER (+68/-0)
product_extended/__init__.py.OTHER (+25/-0)
product_extended/__terp__.py.OTHER (+47/-0)
product_extended/i18n/ca_ES.po (+81/-0)
product_extended/i18n/es_ES.po (+84/-0)
product_extended/i18n/product_extended.pot (+62/-0)
product_extended/mrp_view.xml (+29/-0)
product_extended/product_extended.py.OTHER (+154/-0)
product_extended/product_extended_view.xml.OTHER (+53/-0)
product_extended/product_extended_wizard.xml (+11/-0)
product_extended/security/ir.model.access.csv (+3/-0)
product_extended/wizard/__init__.py (+25/-0)
product_extended/wizard/wizard_price.py (+46/-0)
product_images_olbs/__init__.py (+19/-0)
product_images_olbs/__terp__.py (+41/-0)
product_images_olbs/product.py (+28/-0)
product_images_olbs/product_images.py (+56/-0)
product_images_olbs/security/ir.model.access.csv (+2/-0)
product_images_olbs/views/product_images_view.xml (+58/-0)
product_lot_foundry/product_lot_foundry_view.xml.OTHER (+152/-0)
product_lot_foundry/sale_order.py.OTHER (+92/-0)
product_lot_foundry/sale_order_view.xml.OTHER (+140/-0)
product_m2mcategories/__init__.py (+18/-0)
product_m2mcategories/__terp__.py (+39/-0)
product_m2mcategories/i18n/ca.po (+65/-0)
product_m2mcategories/i18n/ca_ES.po (+58/-0)
product_m2mcategories/i18n/es.po (+64/-0)
product_m2mcategories/i18n/es_ES.po (+58/-0)
product_m2mcategories/i18n/product_m2mcategories.pot (+52/-0)
product_m2mcategories/product.py (+25/-0)
product_m2mcategories/product_view.xml (+21/-0)
product_price_update/__init__.py (+4/-0)
product_price_update/__terp__.py (+48/-0)
product_price_update/i18n/hu_HU.po (+126/-0)
product_price_update/i18n/product_price_update.pot (+122/-0)
product_price_update/pricelist.py (+105/-0)
product_price_update/pricelist_data.xml (+10/-0)
product_price_update/pricelist_view.xml (+51/-0)
product_price_update/security/ir.model.access.csv (+3/-0)
product_pricelist_discount_and_tax/__init__.py (+5/-0)
product_pricelist_discount_and_tax/__terp__.py (+55/-0)
product_pricelist_discount_and_tax/_common.py (+30/-0)
product_pricelist_discount_and_tax/i18n/hu.po (+43/-0)
product_pricelist_discount_and_tax/i18n/hu_HU.po (+45/-0)
product_pricelist_discount_and_tax/i18n/product_pricelist_discount_and_tax.pot (+41/-0)
product_pricelist_discount_and_tax/mrp.py (+93/-0)
product_pricelist_discount_and_tax/pricelist.py (+220/-0)
product_pricelist_discount_and_tax/pricelist_view.xml (+49/-0)
product_pricelist_discount_and_tax/purchase.py (+95/-0)
product_pricelist_discount_and_tax/sale.py (+160/-0)
product_qt/__terp__.py.OTHER (+55/-0)
product_qt/i18n/ca.po (+275/-0)
product_qt/i18n/ca_ES.po (+257/-0)
product_qt/i18n/es.po (+284/-0)
product_qt/i18n/es_ES.po (+257/-0)
product_qt/i18n/product_qt.pot (+251/-0)
product_qt/product_qt_view.xml.OTHER (+227/-0)
product_search_reference/product.py.OTHER (+64/-0)
product_tax_include/.license (+21/-0)
product_tax_include/__init__.py (+28/-0)
product_tax_include/__terp__.py (+51/-0)
product_tax_include/i18n/ca.po (+78/-0)
product_tax_include/i18n/es.po (+79/-0)
product_tax_include/i18n/fr.po (+71/-0)
product_tax_include/i18n/fr_FR.po (+66/-0)
product_tax_include/i18n/product_tax_include.pot (+67/-0)
product_tax_include/i18n/pt.po (+77/-0)
product_tax_include/object/__init__.py (+27/-0)
product_tax_include/object/company.py (+40/-0)
product_tax_include/object/product.py (+74/-0)
product_tax_include/view/company.xml (+41/-0)
product_tax_include/view/product.xml (+38/-0)
product_variant_configurator/__terp__.py.OTHER (+50/-0)
product_variant_configurator/configurator_view.xml.OTHER (+58/-0)
product_variant_configurator/configurator_wizard.py.OTHER (+237/-0)
product_variant_configurator/product.py.OTHER (+53/-0)
product_variant_configurator/sale_view.xml (+54/-0)
product_variant_configurator/security/ir.model.access.csv (+4/-0)
product_variant_multi/__terp__.py.OTHER (+55/-0)
product_variant_multi/demo_data.xml.OTHER (+82/-0)
product_variant_multi/i18n/hu_HU.po (+195/-0)
product_variant_multi/i18n/product_variant_multi.pot (+191/-0)
product_variant_multi/product_variant.py.OTHER (+203/-0)
product_variant_multi/product_view.xml (+185/-0)
product_view.xml (+30/-0)
product_visible_discount/__terp__.py.OTHER (+42/-0)
product_visible_discount/i18n/ca.po (+83/-0)
product_visible_discount/i18n/ca_ES.po (+53/-0)
product_visible_discount/i18n/es.po (+83/-0)
product_visible_discount/i18n/es_ES.po (+53/-0)
product_visible_discount/i18n/fr.po (+53/-0)
product_visible_discount/i18n/fr_FR.po (+52/-0)
product_visible_discount/i18n/product_visible_discount.pot (+45/-0)
product_visible_discount/product.py.OTHER (+151/-0)
productivity_analysis/__terp__.py.OTHER (+42/-0)
profile_account_india/__init__.py (+24/-0)
profile_account_india/__terp__.py (+48/-0)
profile_business_game/profile_game_data.xml.OTHER (+89/-0)
profile_business_game/profile_game_phase1.py.OTHER (+337/-0)
profile_cci/__terp__.py.OTHER (+63/-0)
profile_dm/__terp__.py.OTHER (+35/-0)
profile_hotel/__init__.py (+25/-0)
profile_hotel/__terp__.py (+39/-0)
profile_training/__init__.py (+22/-0)
profile_training/__terp__.py (+49/-0)
profile_training/profile_training.py (+66/-0)
profile_training/profile_training.xml (+73/-0)
proforma_followup/__terp__.py.OTHER (+48/-0)
project_crm/__init__.py (+25/-0)
project_crm/__terp__.py (+34/-0)
project_crm/project_crm.py (+73/-0)
project_crm/project_crm_view.xml (+33/-0)
project_crm/project_wizard.xml (+10/-0)
project_crm/wizard/__init__.py (+24/-0)
project_crm/wizard/wizard_unsync.py (+69/-0)
project_idea/__init__.py (+25/-0)
project_idea/__terp__.py (+40/-0)
project_idea/project_idea.py (+30/-0)
project_idea/project_idea_view.xml (+17/-0)
project_task_members/.license (+21/-0)
project_task_members/__init__.py (+26/-0)
project_task_members/__terp__.py (+50/-0)
project_task_members/object/__init__.py (+26/-0)
project_task_members/object/project.py (+35/-0)
project_task_members/view/project_task.xml (+42/-0)
purchase_delivery/wizard/delivery_purchase_order.py.OTHER (+90/-0)
purchase_discount/i18n/purchase_discount.pot (+137/-0)
purchase_discount/purchase_discount.py.OTHER (+122/-0)
purchase_discount/purchase_discount_report.xml.OTHER (+11/-0)
purchase_discount/report/order.py.OTHER (+83/-0)
purchase_discount/report/order.rml.OTHER (+400/-0)
purchase_journal/purchase_journal_view.xml.OTHER (+232/-0)
purchase_number/__terp__.py.OTHER (+18/-0)
purchase_number/report/purchase_order.rml.OTHER (+907/-0)
purchase_tender/__terp__.py.OTHER (+39/-0)
pxgo_account_admin_tools/__init__.py (+36/-0)
pxgo_account_admin_tools/__terp__.py (+87/-0)
pxgo_account_admin_tools/account_chart_checker.py (+191/-0)
pxgo_account_admin_tools/account_chart_checker.xml (+54/-0)
pxgo_account_admin_tools/account_importer.py (+254/-0)
pxgo_account_admin_tools/account_importer.xml (+64/-0)
pxgo_account_admin_tools/account_move_importer.py (+288/-0)
pxgo_account_admin_tools/account_move_importer.xml (+76/-0)
pxgo_account_admin_tools/admin_tools_menu.xml (+20/-0)
pxgo_account_admin_tools/move_partner_account.py (+184/-0)
pxgo_account_admin_tools/move_partner_account.xml (+59/-0)
pxgo_account_admin_tools/revalidate_moves.py (+163/-0)
pxgo_account_admin_tools/revalidate_moves.xml (+82/-0)
pxgo_account_admin_tools/set_invoice_ref_in_moves.py (+202/-0)
pxgo_account_admin_tools/set_invoice_ref_in_moves.xml (+82/-0)
pxgo_account_admin_tools/set_partner_in_moves.py (+219/-0)
pxgo_account_admin_tools/set_partner_in_moves.xml (+82/-0)
pxgo_openoffice_reports/__init__.py (+30/-0)
pxgo_openoffice_reports/__terp__.py (+113/-0)
pxgo_openoffice_reports/demo/partner_demo_bar_chart.yaml (+32/-0)
pxgo_openoffice_reports/demo/partner_demo_pie_chart.yaml (+23/-0)
pxgo_openoffice_reports/demo/partner_demo_report.xml (+34/-0)
pxgo_openoffice_reports/i18n/es.po (+199/-0)
pxgo_openoffice_reports/i18n/es_ES.po (+163/-0)
pxgo_openoffice_reports/i18n/openoffice_reports.pot (+94/-0)
pxgo_openoffice_reports/oo_template.py (+593/-0)
pxgo_openoffice_reports/openoffice_report.py (+391/-0)
pxgo_openoffice_reports/report_xml.py (+168/-0)
pxgo_openoffice_reports/report_xml_view.xml (+104/-0)
radiotv/__init__.py.OTHER (+26/-0)
radiotv/__terp__.py.OTHER (+56/-0)
radiotv/i18n/ca_ES.po.OTHER (+798/-0)
radiotv/i18n/es_ES.po.OTHER (+798/-0)
radiotv/i18n/radiotv.pot.OTHER (+790/-0)
radiotv/radiotv.py.OTHER (+522/-0)
radiotv/report/__init__.py.OTHER (+26/-0)
radiotv/report/broadcast_compact_report.py.OTHER (+80/-0)
radiotv/report/broadcast_declaration_report.py.OTHER (+95/-0)
radiotv/report/broadcast_report.py.OTHER (+49/-0)
radiotv/report/common.py.OTHER (+43/-0)
radiotv/wizard/__init__.py.OTHER (+29/-0)
radiotv/wizard/export_table.py.OTHER (+139/-0)
radiotv/wizard/wizard_broadcast_compact_report.py.OTHER (+51/-0)
radiotv/wizard/wizard_broadcast_declaration_report.py.OTHER (+51/-0)
radiotv/wizard/wizard_copy_broadcasts.py.OTHER (+111/-0)
radiotv/wizard/wizard_export_broadcasts.py.OTHER (+107/-0)
radiotv/wizard/wizard_export_channels_programs.py.OTHER (+100/-0)
radiotv/wizard/wizard_export_podcasts.py.OTHER (+107/-0)
report_analisys_due/__init__.py (+31/-0)
report_analisys_due/__terp__.py (+47/-0)
report_analisys_due/l10n_ve_pagos_atrs_report.xml (+14/-0)
report_analisys_due/report/__init__.py (+32/-0)
report_analisys_due/report/pagos_atr.py (+95/-0)
report_analisys_due/report/pagos_atr.rml (+200/-0)
report_analisys_due/report/tiny_sxw2rml/__init__.py (+25/-0)
report_analisys_due/report/tiny_sxw2rml/normalized_odt2rml.xsl (+696/-0)
report_analisys_due/report/tiny_sxw2rml/normalized_oo2rml.xsl (+696/-0)
report_analisys_due/report/tiny_sxw2rml/tiny_sxw2rml.py (+372/-0)
report_analytic2/__init__.py (+29/-0)
report_analytic2/__terp__.py (+17/-0)
report_analytic2/account_analytic_analysis_view.xml (+111/-0)
report_analytic2/report_analytic2.py (+115/-0)
report_analytic_planning_delegate/__terp__.py.OTHER (+40/-0)
report_analytic_planning_delegate/report_analytic_planning_view.xml.OTHER (+38/-0)
report_analytic_planning_long_term/__terp__.py.OTHER (+41/-0)
report_hotel_reservation/__init__.py (+26/-0)
report_hotel_reservation/__terp__.py (+42/-0)
report_hotel_reservation/report_hotel_reservation.py (+59/-0)
report_hotel_reservation/report_hotel_reservation_view.xml (+82/-0)
report_hotel_reservation/security/ir.model.access.csv (+2/-0)
report_hotel_restaurant/__init__.py.OTHER (+26/-0)
report_hotel_restaurant/__terp__.py.OTHER (+43/-0)
report_hotel_restaurant/report_hotel_restaurant.py.OTHER (+58/-0)
report_hotel_restaurant/report_hotel_restaurant_view.xml.OTHER (+83/-0)
report_hotel_restaurant/security/ir.model.access.csv.OTHER (+2/-0)
sale_category/report/sale_category_report.rml.OTHER (+423/-0)
sale_delivery/sale_delivery.py.OTHER (+222/-0)
sale_forecast/report/sale_forecast_salesman.py.OTHER (+64/-0)
sale_forecast/sale_forecast.py.OTHER (+168/-0)
sale_layout/__terp__.py.OTHER (+49/-0)
sale_layout/i18n/fr_FR.po (+179/-0)
sale_layout/report/report_sale_layout.py.OTHER (+130/-0)
sale_layout/report/report_sale_layout.rml.OTHER (+424/-0)
sale_layout/sale_layout.py.OTHER (+149/-0)
sale_layout/sale_layout_view.xml.OTHER (+117/-0)
sale_margin/__init__.py (+28/-0)
sale_margin/__terp__.py (+48/-0)
sale_margin/i18n/ca.po (+372/-0)
sale_margin/i18n/es.po (+372/-0)
sale_margin/i18n/fr.po (+370/-0)
sale_margin/i18n/fr_FR.po (+371/-0)
sale_margin/i18n/sale_margin.pot (+371/-0)
sale_margin/object/__init__.py (+30/-0)
sale_margin/object/invoice_margin.py (+52/-0)
sale_margin/object/report_margin.py (+261/-0)
sale_margin/object/sale_margin.py (+189/-0)
sale_margin/security/ir.model.access.csv (+6/-0)
sale_margin/view/report_margin_view.xml (+194/-0)
sale_margin/view/sale_margin_view.xml (+125/-0)
sale_margin_old/sale_margin.py.OTHER (+83/-0)
sale_numbers/__terp__.py.OTHER (+18/-0)
sale_numbers/report/sale_order.rml.OTHER (+909/-0)
sale_payment/__init__.py.OTHER (+24/-0)
sale_payment/__terp__.py.OTHER (+52/-0)
sale_payment/sale_payment.py.OTHER (+92/-0)
sale_product_multistep_configurator/__init__.py.OTHER (+24/-0)
sale_product_multistep_configurator/__terp__.py.OTHER (+41/-0)
sale_product_multistep_configurator/sale.py (+35/-0)
sale_product_multistep_configurator/sale_product_multistep_configurator.py.OTHER (+134/-0)
sale_product_multistep_configurator/sale_product_multistep_configurator.xml.OTHER (+62/-0)
sale_product_multistep_configurator/sale_view.xml.OTHER (+71/-0)
sale_product_multistep_configurator/security/ir.model.access.csv (+2/-0)
sale_supplier_direct_delivery/mrp.py.OTHER (+23/-0)
sale_supplier_direct_delivery/product.py.OTHER (+39/-0)
sale_supplier_direct_delivery/purchase.py.OTHER (+58/-0)
sale_supplier_direct_delivery/sale.py.OTHER (+99/-0)
sale_tax_include/i18n/fr_FR.po (+60/-0)
sale_tax_include/sale_tax_incl.py.OTHER (+129/-0)
sale_wo_prices/__init__.py.OTHER (+22/-0)
sale_wo_prices/__terp__.py.OTHER (+41/-0)
sale_wo_prices/sale_view.xml.OTHER (+100/-0)
sales_purchase_seq/sales_purchase_seq.py.OTHER (+53/-0)
sandwich/report/sandwich_report.rml.OTHER (+142/-0)
segmentation/__terp__.py.OTHER (+45/-0)
smsclient/smsclient.py.OTHER (+176/-0)
smsclient/wizard/sendcode.py.OTHER (+73/-0)
smsclient/wizard/verifycode.py.OTHER (+65/-0)
smtpclient/__terp__.py.OTHER (+50/-0)
smtpclient/i18n/ca_ES.po.OTHER (+505/-0)
smtpclient/i18n/es_ES.po.OTHER (+505/-0)
smtpclient/i18n/nl_BE.po (+540/-0)
smtpclient/serveraction.py.OTHER (+88/-0)
smtpclient/serveraction_view.xml.OTHER (+17/-0)
smtpclient/smtpclient.py.OTHER (+456/-0)
smtpclient/smtpclient_view.xml.OTHER (+262/-0)
smtpclient/wizard/sendcode.py.OTHER (+62/-0)
smtpclient/wizard/testemail.py.OTHER (+59/-0)
smtpclient/wizard/verifycode.py.OTHER (+66/-0)
smtpclient/wizard/wizard_spam.py.OTHER (+93/-0)
stock_delivery_packages/__init__.py (+30/-0)
stock_delivery_packages/__terp__.py (+18/-0)
stock_delivery_packages/stock.py (+41/-0)
stock_delivery_packages/stock_view.xml (+16/-0)
stock_planning/stock_planning.py.OTHER (+335/-0)
stock_planning/stock_planning_view.xml.OTHER (+226/-0)
stock_rma/__init__.py (+2/-0)
stock_rma/__terp__.py (+36/-0)
stock_rma/crm.py (+224/-0)
stock_rma/crm_sequence.xml (+16/-0)
stock_rma/crm_view.xml (+210/-0)
stock_rma/stock.py (+69/-0)
stock_rma/stock_data.xml (+22/-0)
stock_rma/stock_view.xml (+63/-0)
stock_routings/__init__.py (+26/-0)
stock_routings/__terp__.py (+48/-0)
stock_routings/purchase/__init__.py (+25/-0)
stock_routings/purchase/purchase.py (+213/-0)
stock_routings/purchase/purchase_view.xml (+137/-0)
stock_routings/stock/__init__.py (+26/-0)
stock_routings/stock/stock.py (+701/-0)
stock_routings/stock/stock_view.xml (+360/-0)
stock_routings/stock/stock_wizard.xml (+11/-0)
stock_routings/stock/wizard/__init__.py (+1/-0)
stock_routings/stock/wizard/wizard_change_planned_date.py (+139/-0)
survey/__init__.py (+28/-0)
survey/__terp__.py (+41/-0)
survey/i18n/bg.po (+707/-0)
survey/i18n/cs.po (+695/-0)
survey/i18n/de.po (+697/-0)
survey/i18n/et.po (+696/-0)
survey/i18n/fr_BE.po (+688/-0)
survey/i18n/hr.po (+704/-0)
survey/i18n/sl.po (+695/-0)
survey/i18n/survey.pot (+688/-0)
survey/i18n/zh_CN.po (+695/-0)
survey/report/__init__.py (+27/-0)
survey/report/survey_analysis_report.py (+330/-0)
survey/report/survey_form.py (+256/-0)
survey/security/ir.model.access.csv (+20/-0)
survey/specification/final spec (+157/-0)
survey/survey.py (+1060/-0)
survey/survey_data.xml (+11/-0)
survey/survey_demo.xml (+1740/-0)
survey/survey_que_wizard.xml (+66/-0)
survey/survey_report.xml (+17/-0)
survey/survey_view.xml (+782/-0)
survey/survey_wizard.xml (+12/-0)
survey/wizard/__init__.py (+26/-0)
survey/wizard/wizard_print_survey.py (+72/-0)
survey/wizard/wizard_survey.py (+184/-0)
test_server/__terp__.py (+44/-0)
tiny_purchase/report/order.rml.OTHER (+91/-0)
training/__init__.py (+30/-0)
training/__terp__.py (+74/-0)
training/base_contact_view.xml (+60/-0)
training/dummy.py (+10/-0)
training/dummy_view.xml (+25/-0)
training/partner.py (+91/-0)
training/partner_view.xml (+68/-0)
training/process/course_subscription_process.xml (+179/-0)
training/process/plan_course_process.xml (+118/-0)
training/report/__init__.py (+25/-0)
training/report/delivery_support.rml (+159/-0)
training/report/evaluation_from_participant.rml (+235/-0)
training/report/evaluation_from_skateholder.rml (+200/-0)
training/report/in_construction.py (+199/-0)
training/report/in_construction.rml (+31/-0)
training/report/training_course.rml (+316/-0)
training/report/training_hiring_form.rml (+311/-0)
training/report/training_presence.rml (+218/-0)
training/report/training_presence_certificate.rml (+227/-0)
training/report/training_seance_cancel.rml (+134/-0)
training/report/training_session_cancel.rml (+171/-0)
training/report/training_subscription_cancel.rml (+226/-0)
training/report/training_subscription_confirm.rml (+265/-0)
training/security/ir.model.access.csv (+44/-0)
training/security/training_security.xml (+183/-0)
training/training.py (+862/-0)
training/training_demo.xml (+163/-0)
training/training_report.xml (+111/-0)
training/training_sequence.xml (+16/-0)
training/training_view.xml (+1285/-0)
training/training_wizard.xml (+21/-0)
training/wizard/__init__.py (+26/-0)
training/wizard/wizard_not_implemented.py (+30/-0)
training/wizard/wizard_subscription_line_invoice.py (+119/-0)
training/workflow/catalog_workflow.xml (+86/-0)
training/workflow/course_workflow.xml (+89/-0)
training/workflow/offer_workflow.xml (+53/-0)
training/workflow/seance_workflow.xml (+116/-0)
training/workflow/session_workflow.xml (+120/-0)
training/workflow/subscription_workflow.xml (+82/-0)
training_exam/__init__.py (+24/-0)
training_exam/__terp__.py (+46/-0)
training_exam/report/__init__.py (+25/-0)
training_exam/report/in_construction.py (+69/-0)
training_exam/report/training_exam_cancel.rml (+199/-0)
training_exam/report/training_exam_confirm.rml (+280/-0)
training_exam/security/ir.model.access.csv (+11/-0)
training_exam/security/training_exam_security.xml (+14/-0)
training_exam/training_exam.py (+207/-0)
training_exam/training_exam_report.xml (+20/-0)
training_exam/training_exam_view.xml (+423/-0)
training_exam/workflow/planned_exam_workflow.xml (+116/-0)
training_exam/workflow/questionnaire_workflow.xml (+98/-0)
training_room/__init__.py (+23/-0)
training_room/__terp__.py (+42/-0)
training_room/security/ir.model.access.csv (+6/-0)
training_room/training_room.py (+46/-0)
training_room/training_room_view.xml (+91/-0)
travel/__terp__.py.OTHER (+38/-0)
uml_dia/codegen_openerp.py.OTHER (+323/-0)
use_control/__init__.py.OTHER (+25/-0)
use_control/__terp__.py.OTHER (+43/-0)
use_control/module.py (+66/-0)
use_control/module.xml (+7/-0)
use_control/security/ir.model.access.csv (+6/-0)
use_control/services.py.OTHER (+162/-0)
use_control/use_control.py.OTHER (+109/-0)
users_ldap/__terp__.py.OTHER (+42/-0)
users_ldap/users_ldap.py.OTHER (+189/-0)
users_ldap/users_ldap_view.xml.OTHER (+56/-0)
wiki_extension/__init__.py (+26/-0)
wiki_extension/__terp__.py (+52/-0)
wiki_extension/i18n/ca.po (+88/-0)
wiki_extension/i18n/es.po (+88/-0)
wiki_extension/i18n/fr.po (+78/-0)
wiki_extension/i18n/fr_FR.po (+77/-0)
wiki_extension/i18n/wiki_extension.pot (+77/-0)
wiki_extension/object/__init__.py (+26/-0)
wiki_extension/object/wiki.py (+67/-0)
wiki_extension/view/wiki_view.xml (+88/-0)
wiki_extension/wizard/__init__.py (+24/-0)
zarafa/email_view.xml.OTHER (+76/-0)
zarafa/sednacom_view.xml.OTHER (+61/-0)
zarafa/sednazarafa_view.xml.OTHER (+71/-0)
Path conflict: <deleted> / mrp_bom_customization
Path conflict: <deleted> / mrp_bom_customization/mrp_bom_customization_view.xml
Path conflict: <deleted> / sale_margin_old
Path conflict: <deleted> / mrp_bom_customization/mrp_bom_customization.py
Conflict adding files to account_analytic_package.  Created directory.
Conflict because account_analytic_package is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_analytic_package/__terp__.py
Contents conflict in account_analytic_package/account_analytic_package.py
Conflict adding files to account_analytic_progress.  Created directory.
Conflict because account_analytic_progress is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_analytic_progress/__terp__.py
Conflict adding file account_anglo_saxon.  Moved existing file to account_anglo_saxon.moved.
Conflict adding files to account_asset.  Created directory.
Conflict because account_asset is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_asset/__terp__.py
Contents conflict in account_asset/account_asset.py
Contents conflict in account_asset/account_asset_invoice.py
Contents conflict in account_asset/account_asset_invoice_view.xml
Contents conflict in account_asset/account_asset_view.xml
Contents conflict in account_asset/account_asset_wizard.xml
Conflict adding files to account_asset/security.  Created directory.
Conflict because account_asset/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_asset/security/ir.model.access.csv
Conflict adding files to account_asset/wizard.  Created directory.
Conflict because account_asset/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_asset/wizard/__init__.py
Contents conflict in account_asset/wizard/wizard_asset_close.py
Contents conflict in account_asset/wizard/wizard_asset_compute.py
Contents conflict in account_asset/wizard/wizard_asset_modify.py
Conflict adding files to account_base.  Created directory.
Conflict because account_base is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to account_bob_import.  Created directory.
Conflict because account_bob_import is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_bob_import/bob_import_step_1.py
Conflict adding files to account_coda.  Created directory.
Conflict because account_coda is not versioned, but has versioned children.  Versioned directory.
Conflict adding file account_coda.  Moved existing file to account_coda.moved.
Contents conflict in account_coda/__terp__.py
Conflict adding files to account_coda_2_1_d.  Created directory.
Conflict because account_coda_2_1_d is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_coda_2_1_d/__terp__.py
Conflict adding files to account_invoice_analytic_required.  Created directory.
Conflict because account_invoice_analytic_required is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_analytic_required/__terp__.py
Conflict adding files to account_invoice_number.  Created directory.
Conflict because account_invoice_number is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_number/__terp__.py
Contents conflict in account_invoice_number/account_invoice_number.py
Conflict adding files to account_invoice_payment_term.  Created directory.
Conflict because account_invoice_payment_term is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to account_invoice_payment_term/report.  Created directory.
Conflict because account_invoice_payment_term/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_payment_term/report/invoice.rml
Contents conflict in account_invoice_payment_term/report/invoice.sxw
Conflict adding files to account_invoice_salesman.  Created directory.
Conflict because account_invoice_salesman is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to account_payment_extension.  Created directory.
Conflict because account_payment_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/__init__.py
Contents conflict in account_payment_extension/__terp__.py
Contents conflict in account_payment_extension/account_invoice.py
Contents conflict in account_payment_extension/account_move_line.py
Conflict adding files to account_payment_extension/i18n.  Created directory.
Conflict because account_payment_extension/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/i18n/account_payment_extension.pot
Contents conflict in account_payment_extension/i18n/ca_ES.po
Contents conflict in account_payment_extension/i18n/es_ES.po
Contents conflict in account_payment_extension/payment.py
Contents conflict in account_payment_extension/payment_view.xml
Conflict adding files to account_payment_extension/wizard.  Created directory.
Conflict because account_payment_extension/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/wizard/__init__.py
Contents conflict in account_payment_extension/wizard/wizard_payment_order.py
Contents conflict in account_payment_extension/wizard/wizard_populate_statement.py
Conflict adding files to account_regularization.  Created directory.
Conflict because account_regularization is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_regularization/__init__.py
Contents conflict in account_regularization/__terp__.py
Contents conflict in account_regularization/account.py
Conflict adding files to account_regularization/wizard.  Created directory.
Conflict because account_regularization/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_regularization/wizard/__init__.py
Contents conflict in account_regularization/wizard/account_regularization.py
Conflict adding files to account_reverse.  Created directory.
Conflict because account_reverse is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reverse/__init__.py
Contents conflict in account_reverse/__terp__.py
Contents conflict in account_reverse/account.py
Conflict adding files to account_reverse/wizard.  Created directory.
Conflict because account_reverse/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reverse/wizard/__init__.py
Contents conflict in account_reverse/wizard/account_move_reverse.py
Conflict adding files to account_simulation.  Created directory.
Conflict because account_simulation is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to account_simulation/wizard.  Created directory.
Conflict because account_simulation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_simulation/wizard/wizard_account_chart.py
Conflict adding files to account_voucher_workflow.  Created directory.
Conflict because account_voucher_workflow is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_voucher_workflow/__terp__.py
Contents conflict in account_voucher_workflow/account_voucher_view.xml
Contents conflict in account_voucher_workflow/account_voucher_workflow.xml
Contents conflict in account_voucher_workflow/voucher.py
Conflict adding files to airport.  Created directory.
Conflict because airport is not versioned, but has versioned children.  Versioned directory.
Contents conflict in airport/__terp__.py
Contents conflict in airport/ticket.rml
Conflict adding files to analytic_partners.  Created directory.
Conflict because analytic_partners is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to analytic_partners/report.  Created directory.
Conflict because analytic_partners/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in analytic_partners/report/analytic_account_partners.rml
Conflict adding files to asterisk.  Created directory.
Conflict because asterisk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/__terp__.py
Conflict adding files to asterisk/script.  Created directory.
Conflict because asterisk/script is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/script/simple_write.py
Conflict adding files to auto_email_account.  Created directory.
Conflict because auto_email_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_account/__terp__.py
Contents conflict in auto_email_account/invoice.py
Conflict adding files to auto_email_account/wizard.  Created directory.
Conflict because auto_email_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_account/wizard/wizard_send_email.py
Conflict adding files to auto_email_sale.  Created directory.
Conflict because auto_email_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_sale/__terp__.py
Contents conflict in auto_email_sale/sale.py
Conflict adding files to auto_email_sale/wizard.  Created directory.
Conflict because auto_email_sale/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_sale/wizard/wizard_send_email.py
Conflict adding files to auto_email_stock.  Created directory.
Conflict because auto_email_stock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_stock/__terp__.py
Conflict adding files to auto_email_stock/wizard.  Created directory.
Conflict because auto_email_stock/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in auto_email_stock/wizard/wizard_partial_picking.py
Contents conflict in auto_email_stock/wizard/wizard_send_email.py
Conflict adding files to base_contact_city.  Created directory.
Conflict because base_contact_city is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_contact_city/__init__.py
Contents conflict in base_contact_city/__terp__.py
Conflict adding files to base_contact_team.  Created directory.
Conflict because base_contact_team is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_contact_team/__terp__.py
Text conflict in base_crypt/__openerp__.py
Contents conflict in base_crypt/base_update.xml
Text conflict in base_crypt/crypt.py
Conflict adding files to base_language.  Created directory.
Conflict because base_language is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_language/__terp__.py
Contents conflict in base_language/base_language_data.xml
Conflict adding files to base_module_doc_rst.  Created directory.
Conflict because base_module_doc_rst is not versioned, but has versioned children.  Versioned directory.
Conflict adding file base_module_doc_rst.  Moved existing file to base_module_doc_rst.moved.
Conflict adding files to base_module_doc_rst/wizard.  Created directory.
Conflict because base_module_doc_rst/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_doc_rst/wizard/wizard_tech_guide_rst.py
Conflict adding files to base_partner_relation.  Created directory.
Conflict because base_partner_relation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_relation/partner_relation.py
Conflict adding files to base_partner_sequence.  Created directory.
Conflict because base_partner_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_sequence/__terp__.py
Conflict adding files to base_partner_surname.  Created directory.
Conflict because base_partner_surname is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_surname/partner.py
Contents conflict in base_partner_surname/partner_view.xml
Conflict adding files to board_service.  Created directory.
Conflict because board_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_service/board_service_view.xml
Conflict adding files to bookstore.  Created directory.
Conflict because bookstore is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/invoice.py
Conflict adding files to bookstore/report.  Created directory.
Conflict because bookstore/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/report/invoice.rml
Contents conflict in bookstore/report/quotation.rml
Contents conflict in bookstore/report/quotation.sxw
Contents conflict in bookstore/report/sales_order.rml
Contents conflict in bookstore/sale.py
Conflict adding files to c2c_budget.  Created directory.
Conflict because c2c_budget is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/__init__.py
Contents conflict in c2c_budget/__terp__.py
Contents conflict in c2c_budget/account.py
Contents conflict in c2c_budget/analytic_account.py
Contents conflict in c2c_budget/c2c_budget.py
Contents conflict in c2c_budget/c2c_budget_item.py
Contents conflict in c2c_budget/c2c_budget_line.py
Contents conflict in c2c_budget/c2c_budget_report_abstraction.py
Contents conflict in c2c_budget/c2c_budget_version.py
Contents conflict in c2c_budget/c2c_budget_view.xml
Contents conflict in c2c_budget/c2c_budget_wizard_abstraction.py
Conflict adding files to c2c_budget/report.  Created directory.
Conflict because c2c_budget/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/report/budget_by_period.py
Contents conflict in c2c_budget/report/budget_vs_reality.py
Conflict adding files to c2c_budget/wizard.  Created directory.
Conflict because c2c_budget/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/wizard/budget_by_period.py
Contents conflict in c2c_budget/wizard/validate_budget_structure.py
Conflict adding files to c2c_reporting_tools.  Created directory.
Conflict because c2c_reporting_tools is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to c2c_reporting_tools/flowables.  Created directory.
Conflict because c2c_reporting_tools/flowables is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/flowables/simple_row_table.py
Contents conflict in c2c_reporting_tools/flowables/timebox_chart.py
Conflict adding files to c2c_reporting_tools/reports.  Created directory.
Conflict because c2c_reporting_tools/reports is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/reports/standard_report.py
Contents conflict in c2c_reporting_tools/translation.py
Conflict adding files to c2c_scan_bvr.  Created directory.
Conflict because c2c_scan_bvr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_scan_bvr/__init__.py
Contents conflict in c2c_scan_bvr/__terp__.py
Conflict adding files to c2c_scan_bvr/wizard.  Created directory.
Conflict because c2c_scan_bvr/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_scan_bvr/wizard/__init__.py
Contents conflict in c2c_scan_bvr/wizard/scan_bvr.py
Conflict adding files to cci_account.  Created directory.
Conflict because cci_account is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to cci_account/report.  Created directory.
Conflict because cci_account/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/report/aged_trial_balance.py
Contents conflict in cci_account/report/aged_trial_balance.rml
Contents conflict in cci_account/report/aged_trial_balance.sxw
Contents conflict in cci_account/report/cci_draft_invoice_info.py
Contents conflict in cci_account/report/cci_draft_invoice_info.rml
Contents conflict in cci_account/report/cci_draft_invoice_info.sxw
Contents conflict in cci_account/report/cci_vcs_report.rml
Contents conflict in cci_account/report/cci_vcs_report.sxw
Contents conflict in cci_account/report/partner_balance.py
Contents conflict in cci_account/report/partner_balance.rml
Contents conflict in cci_account/report/partner_balance.sxw
Contents conflict in cci_account/report/report_account_invoice_layout.py
Contents conflict in cci_account/report/report_account_invoice_layout.rml
Contents conflict in cci_account/report/special_message_invoice.py
Contents conflict in cci_account/report/special_message_invoice.rml
Contents conflict in cci_account/report/third_party_ledger.py
Contents conflict in cci_account/report/third_party_ledger.rml
Contents conflict in cci_account/report/third_party_ledger.sxw
Conflict adding files to cci_membership.  Created directory.
Conflict because cci_membership is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/cci_membership_view.xml
Conflict adding files to cci_membership/report.  Created directory.
Conflict because cci_membership/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/report/report_members_total_sold.rml
Contents conflict in cci_membership/report/report_members_total_sold.sxw
Conflict adding files to cci_mission.  Created directory.
Conflict because cci_mission is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to cci_mission/report.  Created directory.
Conflict because cci_mission/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/report/report_print_carnet.rml
Contents conflict in cci_mission/report/report_print_carnet.sxw
Contents conflict in cci_mission/report/report_print_carnet1.rml
Conflict adding files to cci_mission/wizard.  Created directory.
Conflict because cci_mission/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/wizard/cci_encode_cash.py
Contents conflict in cci_mission/wizard/wizard_federation_sending.py
Conflict adding files to cci_partner.  Created directory.
Conflict because cci_partner is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/__terp__.py
Contents conflict in cci_partner/cci_data.xml
Contents conflict in cci_partner/cci_partner.py
Contents conflict in cci_partner/cci_partner_view.xml
Conflict adding files to cci_partner/report.  Created directory.
Conflict because cci_partner/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/report/report_count_invoices.py
Contents conflict in cci_partner/report/report_count_invoices.rml
Contents conflict in cci_partner/report/report_count_invoices.sxw
Conflict adding files to cci_purchase.  Created directory.
Conflict because cci_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_purchase/cci_purchase.py
Contents conflict in cci_purchase/cci_purchase_workflow.xml
Conflict adding files to cci_translation.  Created directory.
Conflict because cci_translation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_translation/cci_translation_view.xml
Conflict adding files to chricar_partner_parent_companies.  Created directory.
Conflict because chricar_partner_parent_companies is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_partner_parent_companies/__terp__.py
Contents conflict in chricar_partner_parent_companies/partner_parent_companies.py
Contents conflict in chricar_partner_parent_companies/partner_parent_companies_view.xml
Conflict adding files to chricar_product_image.  Created directory.
Conflict because chricar_product_image is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_product_image/chricar_product_image_view.xml
Conflict adding files to chricar_product_image/i18n.  Created directory.
Conflict because chricar_product_image/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to city.  Created directory.
Conflict because city is not versioned, but has versioned children.  Versioned directory.
Contents conflict in city/__terp__.py
Contents conflict in city/city.py
Conflict adding files to city/i18n.  Created directory.
Conflict because city/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in city/i18n/ca_ES.po
Contents conflict in city/i18n/es_ES.po
Conflict adding files to commission_pricelist.  Created directory.
Conflict because commission_pricelist is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission_pricelist/__terp__.py
Contents conflict in commission_pricelist/commission.py
Conflict adding files to commission_pricelist/report.  Created directory.
Conflict because commission_pricelist/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission_pricelist/report/saleagent_info.py
Contents conflict in commission_pricelist/saleagent_report.xml
Conflict adding files to commission_rate.  Created directory.
Conflict because commission_rate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission_rate/commission.py
Conflict adding files to comparison.  Created directory.
Conflict because comparison is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/comparison.py
Conflict adding files to comparison/website.  Created directory.
Conflict because comparison/website is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to comparison/website/erpComparator.  Created directory.
Conflict because comparison/website/erpComparator is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to comparison/website/erpComparator/erpcomparator.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/common.py
Contents conflict in comparison/website/erpComparator/erpcomparator/controllers.py
Contents conflict in comparison/website/erpComparator/erpcomparator/rpc.py
Conflict adding files to comparison/website/erpComparator/erpcomparator/static.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to comparison/website/erpComparator/erpcomparator/static/css.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/css is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/css/new_style.css
Conflict adding files to comparison/website/erpComparator/erpcomparator/static/images.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/images is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to comparison/website/erpComparator/erpcomparator/static/javascript.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/javascript is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/javascript/comparison.js
Contents conflict in comparison/website/erpComparator/erpcomparator/static/javascript/treegrid.js
Conflict adding files to comparison/website/erpComparator/erpcomparator/subcontrollers.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/subcontrollers is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/comparison.py
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/graph.py
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/login.py
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/softwares.py
Conflict adding files to comparison/website/erpComparator/erpcomparator/subcontrollers/templates.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/subcontrollers/templates is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/templates/about.kid
Contents conflict in comparison/website/erpComparator/erpcomparator/subcontrollers/templates/comparison.kid
Conflict adding files to comparison/website/erpComparator/erpcomparator/templates.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/templates is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/templates/master.kid
Contents conflict in comparison/website/erpComparator/erpcomparator/tinyres.py
Conflict adding files to crm_livechat.  Created directory.
Conflict because crm_livechat is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to crm_livechat/crm-lc.  Created directory.
Conflict because crm_livechat/crm-lc is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to crm_livechat/crm-lc/livechat.  Created directory.
Conflict because crm_livechat/crm-lc/livechat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_livechat/crm-lc/livechat/common.py
Contents conflict in crm_livechat/crm-lc/livechat/rpc.py
Conflict adding files to crm_livechat/crm-lc/livechat/subcontrollers.  Created directory.
Conflict because crm_livechat/crm-lc/livechat/subcontrollers is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to crm_livechat/crm-lc/livechat/subcontrollers/livechat.  Created directory.
Conflict because crm_livechat/crm-lc/livechat/subcontrollers/livechat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_livechat/crm-lc/livechat/subcontrollers/livechat/chatfunc.py
Conflict adding files to crm_telemarketing.  Created directory.
Conflict because crm_telemarketing is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to crm_telemarketing/wizard.  Created directory.
Conflict because crm_telemarketing/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/wizard/direct_poll.py
Conflict adding files to currency_rate.  Created directory.
Conflict because currency_rate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate/res_currency.py
Conflict adding files to currency_rate/wizard.  Created directory.
Conflict because currency_rate/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate/wizard/currency_rate.py
Conflict adding files to document_extension.  Created directory.
Conflict because document_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_extension/document.py
Conflict adding files to document_rule.  Created directory.
Conflict because document_rule is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_rule/document_data.xml
Conflict adding files to document_webdav_old.  Created directory.
Conflict because document_webdav_old is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_webdav_old/document.py
Conflict adding files to ecommerce.  Created directory.
Conflict because ecommerce is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to ecommerce/catalog.  Created directory.
Conflict because ecommerce/catalog is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/catalog/catalog.py
Contents conflict in ecommerce/catalog/catalog_view.xml
Contents conflict in ecommerce/ecommerce.py
Contents conflict in ecommerce/ecommerce_demo.xml
Contents conflict in ecommerce/ecommerce_view.xml
Conflict adding files to ecommerce/partner.  Created directory.
Conflict because ecommerce/partner is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/partner/partner.py
Contents conflict in ecommerce/partner/partner_view.xml
Conflict adding files to ecommerce/report.  Created directory.
Conflict because ecommerce/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/report/invoice.rml
Conflict adding files to ecommerce/sale_order.  Created directory.
Conflict because ecommerce/sale_order is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/sale_order/sale_order.py
Conflict adding files to ecommerce/wizard.  Created directory.
Conflict because ecommerce/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/wizard/wizard_mailsend.py
Conflict adding files to edi.  Created directory.
Conflict because edi is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to edi/wizard.  Created directory.
Conflict because edi/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in edi/wizard/wizard_edi_import.py
Conflict adding files to email_account.  Created directory.
Conflict because email_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_account/__init__.py
Contents conflict in email_account/__terp__.py
Conflict adding files to email_account/i18n.  Created directory.
Conflict because email_account/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_account/i18n/ca_ES.po
Contents conflict in email_account/i18n/email_account.pot
Contents conflict in email_account/i18n/es_ES.po
Conflict adding files to email_account/wizard.  Created directory.
Conflict because email_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_account/wizard/__init__.py
Contents conflict in email_account/wizard/wizard_send_email.py
Conflict adding files to email_sale.  Created directory.
Conflict because email_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_sale/__init__.py
Contents conflict in email_sale/__terp__.py
Conflict adding files to email_sale/i18n.  Created directory.
Conflict because email_sale/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_sale/i18n/ca_ES.po
Contents conflict in email_sale/i18n/email_sale.pot
Contents conflict in email_sale/i18n/es_ES.po
Conflict adding files to email_sale/wizard.  Created directory.
Conflict because email_sale/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_sale/wizard/__init__.py
Contents conflict in email_sale/wizard/wizard_send_email.py
Conflict adding files to esale_joomla.  Created directory.
Conflict because esale_joomla is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/__terp__.py
Conflict adding files to esale_joomla/connector.  Created directory.
Conflict because esale_joomla/connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/esale_joomla.py
Contents conflict in esale_joomla/esale_joomla_view.xml
Contents conflict in esale_joomla/esale_joomla_wizard.xml
Conflict adding files to esale_joomla/wizard.  Created directory.
Conflict because esale_joomla/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/wizard/__init__.py
Contents conflict in esale_joomla/wizard/wizard_esale_import.py
Contents conflict in esale_joomla/wizard/wizard_product_stock.py
Contents conflict in esale_joomla/wizard/wizard_taxes_export.py
Conflict adding files to esale_osc.  Created directory.
Conflict because esale_osc is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/__init__.py
Contents conflict in esale_osc/__terp__.py
Conflict adding files to esale_osc/connector.  Created directory.
Conflict because esale_osc/connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/connector/openerp-synchro.php
Conflict adding files to esale_osc/connector/xmlrpcutils.  Created directory.
Conflict because esale_osc/connector/xmlrpcutils is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/esale_oscom.py
Contents conflict in esale_osc/esale_oscom_product.py
Contents conflict in esale_osc/esale_oscom_product_view.xml
Contents conflict in esale_osc/esale_oscom_view.xml
Contents conflict in esale_osc/esale_oscom_wizard.xml
Conflict adding files to esale_osc/security.  Created directory.
Conflict because esale_osc/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/security/ir.model.access.csv
Contents conflict in esale_osc/shipping_product_data.xml
Conflict adding files to esale_osc/wizard.  Created directory.
Conflict because esale_osc/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/wizard/__init__.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_export_products.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_export_select_products.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_import_sos.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_update_stocks.py
Conflict adding files to etl.  Created directory.
Conflict because etl is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl/doc.  Created directory.
Conflict because etl/doc is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl/lib.  Created directory.
Conflict because etl/lib is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl/lib/demo.  Created directory.
Conflict because etl/lib/demo is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl/lib/demo/input.  Created directory.
Conflict because etl/lib/demo/input is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl/lib/demo/output.  Created directory.
Conflict because etl/lib/demo/output is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/output/test1_partner.csv
Contents conflict in etl/lib/demo/test1.py
Contents conflict in etl/lib/demo/test2.py
Contents conflict in etl/lib/demo/test3.py
Contents conflict in etl/lib/demo/vcard_openobject.py
Conflict adding files to etl/lib/etl.  Created directory.
Conflict because etl/lib/etl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/__init__.py
Conflict adding files to etl/lib/etl/component.  Created directory.
Conflict because etl/lib/etl/component is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/__init__.py
Contents conflict in etl/lib/etl/component/component.py
Conflict adding files to etl/lib/etl/component/control.  Created directory.
Conflict because etl/lib/etl/component/control is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/control/__init__.py
Contents conflict in etl/lib/etl/component/control/data_count.py
Contents conflict in etl/lib/etl/component/control/sleep.py
Conflict adding files to etl/lib/etl/component/input.  Created directory.
Conflict because etl/lib/etl/component/input is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/input/__init__.py
Contents conflict in etl/lib/etl/component/input/csv_in.py
Contents conflict in etl/lib/etl/component/input/data.py
Contents conflict in etl/lib/etl/component/input/openobject_in.py
Contents conflict in etl/lib/etl/component/input/sql_in.py
Contents conflict in etl/lib/etl/component/input/vcard_in.py
Conflict adding files to etl/lib/etl/component/output.  Created directory.
Conflict because etl/lib/etl/component/output is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/output/__init__.py
Contents conflict in etl/lib/etl/component/output/csv_out.py
Contents conflict in etl/lib/etl/component/output/openobject_out.py
Contents conflict in etl/lib/etl/component/output/sql_out.py
Conflict adding files to etl/lib/etl/component/transform.  Created directory.
Conflict because etl/lib/etl/component/transform is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/transform/__init__.py
Contents conflict in etl/lib/etl/component/transform/data_filter.py
Contents conflict in etl/lib/etl/component/transform/data_map.py
Contents conflict in etl/lib/etl/component/transform/diff.py
Contents conflict in etl/lib/etl/component/transform/join.py
Contents conflict in etl/lib/etl/component/transform/logger.py
Contents conflict in etl/lib/etl/component/transform/logger_bloc.py
Contents conflict in etl/lib/etl/component/transform/merge.py
Contents conflict in etl/lib/etl/component/transform/schema_validator.py
Contents conflict in etl/lib/etl/component/transform/sort.py
Contents conflict in etl/lib/etl/component/transform/unique.py
Conflict adding files to etl/lib/etl/connector.  Created directory.
Conflict because etl/lib/etl/connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/connector/__init__.py
Contents conflict in etl/lib/etl/connector/connector.py
Contents conflict in etl/lib/etl/connector/file_connector.py
Contents conflict in etl/lib/etl/connector/localfile.py
Contents conflict in etl/lib/etl/connector/openobject_connector.py
Contents conflict in etl/lib/etl/connector/sql_connector.py
Contents conflict in etl/lib/etl/connector/url_connector.py
Contents conflict in etl/lib/etl/etl.py
Contents conflict in etl/lib/etl/etl_socket.py
Contents conflict in etl/lib/etl/job.py
Contents conflict in etl/lib/etl/logger.py
Contents conflict in etl/lib/etl/signal.py
Contents conflict in etl/lib/etl/tools.py
Contents conflict in etl/lib/etl/transformer.py
Contents conflict in etl/lib/etl/transition.py
Conflict adding files to etl/lib/etl_test.  Created directory.
Conflict because etl/lib/etl_test is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl_test/etl_test.py
Conflict adding files to etl_interface.  Created directory.
Conflict because etl_interface is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/__init__.py
Contents conflict in etl_interface/__terp__.py
Conflict adding files to etl_interface/etl_component.  Created directory.
Conflict because etl_interface/etl_component is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to etl_interface/etl_component/control.  Created directory.
Conflict because etl_interface/etl_component/control is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_component/control/data_count.py
Contents conflict in etl_interface/etl_component/control/data_count_view.xml
Contents conflict in etl_interface/etl_component/control/sleep.py
Contents conflict in etl_interface/etl_component/control/sleep_view.xml
Conflict adding files to etl_interface/etl_component/input.  Created directory.
Conflict because etl_interface/etl_component/input is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_component/input/__init__.py
Contents conflict in etl_interface/etl_component/input/csv_in.py
Contents conflict in etl_interface/etl_component/input/csv_in_view.xml
Contents conflict in etl_interface/etl_component/input/excel_in.py
Contents conflict in etl_interface/etl_component/input/excel_in_view.xml
Contents conflict in etl_interface/etl_component/input/openobject_in.py
Contents conflict in etl_interface/etl_component/input/openobject_in_view.xml
Contents conflict in etl_interface/etl_component/input/sql_in_view.xml
Contents conflict in etl_interface/etl_component/input/vcard_in.py
Contents conflict in etl_interface/etl_component/input/vcard_in_view.xml
Contents conflict in etl_interface/etl_component/input/xml_in.py
Contents conflict in etl_interface/etl_component/input/xml_in_view.xml
Conflict adding files to etl_interface/etl_component/output.  Created directory.
Conflict because etl_interface/etl_component/output is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_component/output/__init__.py
Contents conflict in etl_interface/etl_component/output/csv_out.py
Contents conflict in etl_interface/etl_component/output/csv_out_view.xml
Contents conflict in etl_interface/etl_component/output/openobject_out.py
Contents conflict in etl_interface/etl_component/output/openobject_out_view.xml
Contents conflict in etl_interface/etl_component/output/sql_out_view.xml
Conflict adding files to etl_interface/etl_component/transform.  Created directory.
Conflict because etl_interface/etl_component/transform is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_component/transform/__init__.py
Contents conflict in etl_interface/etl_component/transform/data_map.py
Contents conflict in etl_interface/etl_component/transform/logger.py
Contents conflict in etl_interface/etl_component/transform/logger_view.xml
Contents conflict in etl_interface/etl_component/transform/map_view.xml
Contents conflict in etl_interface/etl_component/transform/sort.py
Contents conflict in etl_interface/etl_component/transform/sort_view.xml
Conflict adding files to etl_interface/etl_connector.  Created directory.
Conflict because etl_interface/etl_connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_connector/__init__.py
Contents conflict in etl_interface/etl_connector/localfile.py
Contents conflict in etl_interface/etl_connector/localfile_view.xml
Contents conflict in etl_interface/etl_connector/openobject_connector.py
Contents conflict in etl_interface/etl_connector/openobject_connector_view.xml
Contents conflict in etl_interface/etl_connector/sql_connector.py
Contents conflict in etl_interface/etl_connector/sql_connector_view.xml
Contents conflict in etl_interface/etl_interface.py
Contents conflict in etl_interface/scheduler.py
Conflict adding files to fashion.  Created directory.
Conflict because fashion is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fashion/picture.py
Conflict adding files to fashion/wizard.  Created directory.
Conflict because fashion/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fashion/wizard/fashion_help_wizard.py
Conflict adding files to fleet_maintenance.  Created directory.
Conflict because fleet_maintenance is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fleet_maintenance/crm.py
Contents conflict in fleet_maintenance/crm_view.xml
Contents conflict in fleet_maintenance/invoice.py
Contents conflict in fleet_maintenance/sale.py
Contents conflict in fleet_maintenance/sale_view.xml
Contents conflict in fleet_maintenance/stock.py
Contents conflict in fleet_maintenance/stock_view.xml
Conflict adding files to gnucash.  Created directory.
Conflict because gnucash is not versioned, but has versioned children.  Versioned directory.
Contents conflict in gnucash/__terp__.py
Contents conflict in gnucash/gnucash_wizard.py
Conflict adding files to health.  Created directory.
Conflict because health is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/__init__.py
Contents conflict in health/__terp__.py
Contents conflict in health/categories.xml
Contents conflict in health/data.xml
Contents conflict in health/famille-medicament.xml
Contents conflict in health/forme-medicament.xml
Contents conflict in health/health.py
Contents conflict in health/health_view.xml
Contents conflict in health/medicaments-full.xml
Contents conflict in health/medicaments.xml
Contents conflict in health/pathos.xml
Conflict adding files to health/report.  Created directory.
Conflict because health/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/report.xml
Contents conflict in health/report/anniversaire.py
Contents conflict in health/report/anniversaire.rml
Contents conflict in health/report/anniversaire.sxw
Contents conflict in health/report/entreesortie.py
Contents conflict in health/report/entreesortie.rml
Contents conflict in health/report/entreesortie.sxw
Contents conflict in health/report/mouvementsemestriel.py
Contents conflict in health/report/mouvementsemestriel.rml
Contents conflict in health/report/mouvementsemestriel.sxw
Contents conflict in health/report/presence.py
Contents conflict in health/report/presence.rml
Contents conflict in health/report/presence.sxw
Contents conflict in health/report/regimecaisse.py
Contents conflict in health/report/regimecaisse.rml
Contents conflict in health/report/regimecaisse.sxw
Contents conflict in health/soins.xml
Contents conflict in health/typechambre.xml
Conflict adding files to health/wizard.  Created directory.
Conflict because health/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/wizard.xml
Contents conflict in health/wizard/anniversaire.py
Contents conflict in health/wizard/entreesortie.py
Contents conflict in health/wizard/facturation.py
Contents conflict in health/wizard/facturer.py
Contents conflict in health/wizard/mouvementsemestriel.py
Contents conflict in health/wizard/presence.py
Contents conflict in health/wizard/regimecaisse.py
Conflict adding files to hotel.  Created directory.
Conflict because hotel is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/__init__.py
Contents conflict in hotel/__terp__.py
Contents conflict in hotel/hotel.py
Contents conflict in hotel/hotel_data.xml
Contents conflict in hotel/hotel_folio_workflow.xml
Contents conflict in hotel/hotel_report.xml
Contents conflict in hotel/hotel_view.xml
Contents conflict in hotel/hotel_wizard.xml
Conflict adding files to hotel/report.  Created directory.
Conflict because hotel/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/report/__init__.py
Contents conflict in hotel/report/hotel_report.py
Contents conflict in hotel/report/total_folio.rml
Contents conflict in hotel/report/total_folio.sxw
Conflict adding files to hotel/security.  Created directory.
Conflict because hotel/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/security/hotel_security.xml
Contents conflict in hotel/security/ir.model.access.csv
Conflict adding files to hotel/wizard.  Created directory.
Conflict because hotel/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/wizard/__init__.py
Contents conflict in hotel/wizard/hotel_wizard.py
Conflict adding files to hotel_housekeeping.  Created directory.
Conflict because hotel_housekeeping is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/__init__.py
Contents conflict in hotel_housekeeping/__terp__.py
Contents conflict in hotel_housekeeping/hotel_housekeeping.py
Contents conflict in hotel_housekeeping/hotel_housekeeping_view.xml
Contents conflict in hotel_housekeeping/hotel_housekeeping_workflow.xml
Conflict adding files to hotel_housekeeping/security.  Created directory.
Conflict because hotel_housekeeping/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/security/ir.model.access.csv
Conflict adding files to hotel_reservation.  Created directory.
Conflict because hotel_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/hotel_reservation.py
Contents conflict in hotel_reservation/hotel_reservation_sequence.xml
Contents conflict in hotel_reservation/hotel_reservation_view.xml
Contents conflict in hotel_reservation/hotel_reservation_wizard.xml
Contents conflict in hotel_reservation/hotel_reservation_workflow.xml
Conflict adding files to hotel_restaurant.  Created directory.
Conflict because hotel_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/__init__.py
Contents conflict in hotel_restaurant/__terp__.py
Contents conflict in hotel_restaurant/hotel_restaurant.py
Contents conflict in hotel_restaurant/hotel_restaurant_data.xml
Contents conflict in hotel_restaurant/hotel_restaurant_report.xml
Contents conflict in hotel_restaurant/hotel_restaurant_sequence.xml
Contents conflict in hotel_restaurant/hotel_restaurant_view.xml
Contents conflict in hotel_restaurant/hotel_restaurant_wizard.xml
Contents conflict in hotel_restaurant/hotel_restaurant_workflow.xml
Conflict adding files to hotel_restaurant/report.  Created directory.
Conflict because hotel_restaurant/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/report/__init__.py
Contents conflict in hotel_restaurant/report/bill.rml
Contents conflict in hotel_restaurant/report/hotel_restaurant_report.py
Contents conflict in hotel_restaurant/report/kot.rml
Contents conflict in hotel_restaurant/report/res_table.rml
Conflict adding files to hotel_restaurant/security.  Created directory.
Conflict because hotel_restaurant/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/security/ir.model.access.csv
Conflict adding files to hotel_restaurant/wizard.  Created directory.
Conflict because hotel_restaurant/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/wizard/__init__.py
Contents conflict in hotel_restaurant/wizard/hotel_restaurant_wizard.py
Conflict adding files to hr_contract_available.  Created directory.
Conflict because hr_contract_available is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_available/__terp__.py
Contents conflict in hr_contract_available/hr_contract_available_view.xml
Conflict adding files to hr_holidays_request.  Created directory.
Conflict because hr_holidays_request is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/hr_holiday_wizard.xml
Contents conflict in hr_holidays_request/hr_holidays_request.py
Contents conflict in hr_holidays_request/hr_holidays_request_view.xml
Conflict adding files to hr_holidays_request/report.  Created directory.
Conflict because hr_holidays_request/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/report/hr_holiday_report.py
Contents conflict in hr_holidays_request/report/hrreport_form.rml
Contents conflict in hr_holidays_request/report/hrreport_form.sxw
Conflict adding files to hr_holidays_request/wizard.  Created directory.
Conflict because hr_holidays_request/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/wizard/hr_holiday.py
Conflict adding files to hr_performance.  Created directory.
Conflict because hr_performance is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/hr_performance.py
Conflict adding files to hr_performance/report.  Created directory.
Conflict because hr_performance/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/report/performance.rml
Contents conflict in hr_performance/report/performance.sxw
Conflict adding files to hr_skill.  Created directory.
Conflict because hr_skill is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to hr_skill/report.  Created directory.
Conflict because hr_skill/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/report/evaluation.rml
Contents conflict in hr_skill/report/evaluation.sxw
Contents conflict in hr_skill/report/skillreport.rml
Conflict adding files to hr_timesheet_ical.  Created directory.
Conflict because hr_timesheet_ical is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to hr_timesheet_ical/wizard.  Created directory.
Conflict because hr_timesheet_ical/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_timesheet_ical/wizard/__init__.py
Contents conflict in hr_timesheet_ical/wizard/urllib2.py
Contents conflict in hr_timesheet_ical/wizard/wizard_ical.py
Conflict adding files to huissier.  Created directory.
Conflict because huissier is not versioned, but has versioned children.  Versioned directory.
Contents conflict in huissier/huissier_report.xml
Contents conflict in huissier/huissier_wizard.xml
Conflict adding files to huissier/report.  Created directory.
Conflict because huissier/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in huissier/report/badge.rml
Contents conflict in huissier/report/code_bar_lot.rml
Contents conflict in huissier/report/pv.py
Contents conflict in huissier/report/ticket.rml
Conflict adding files to huissier/wizard.  Created directory.
Conflict because huissier/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in huissier/wizard/wizard_invoice_labels.py
Conflict adding files to import_export.  Created directory.
Conflict because import_export is not versioned, but has versioned children.  Versioned directory.
Contents conflict in import_export/__terp__.py
Conflict adding files to invoice_sequence.  Created directory.
Conflict because invoice_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_sequence/invoice.py
Conflict adding files to l10n_chart_ch_german.  Created directory.
Conflict because l10n_chart_ch_german is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ch_german/account_tax_code.xml
Conflict adding files to l10n_chart_de_skr03.  Created directory.
Conflict because l10n_chart_de_skr03 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_de_skr03/account_chart.xml
Contents conflict in l10n_chart_de_skr03/account_tax.xml
Conflict adding files to l10n_chart_in.  Created directory.
Conflict because l10n_chart_in is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_in/__terp__.py
Contents conflict in l10n_chart_in/account_chart.xml
Conflict adding files to l10n_chart_pl.  Created directory.
Conflict because l10n_chart_pl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_pl/__terp__.py
Contents conflict in l10n_chart_pl/account_chart.xml
Contents conflict in l10n_chart_pl/account_tax.xml
Contents conflict in l10n_chart_pl/account_tax_code.xml
Conflict adding files to l10n_fr_account_generation.  Created directory.
Conflict because l10n_fr_account_generation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_fr_account_generation/partner.py
Conflict adding files to l10n_simple.  Created directory.
Conflict because l10n_simple is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_simple/__init__.py
Contents conflict in l10n_simple/__terp__.py
Contents conflict in l10n_simple/account_pcmn_belgium.xml
Conflict adding files to label.  Created directory.
Conflict because label is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/__init__.py
Contents conflict in label/__terp__.py
Conflict adding files to label/i18n.  Created directory.
Conflict because label/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/i18n/ca_ES.po
Contents conflict in label/i18n/es_ES.po
Contents conflict in label/i18n/label.pot
Conflict adding files to label/report.  Created directory.
Conflict because label/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/report/__init__.py
Contents conflict in label/report_label.py
Conflict adding files to label/wizard.  Created directory.
Conflict because label/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/wizard/__init__.py
Contents conflict in label/wizard/wizard_partner_labels.py
Conflict adding files to library.  Created directory.
Conflict because library is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/__terp__.py
Contents conflict in library/account.py
Contents conflict in library/library_editor_supplier.py
Contents conflict in library/library_view.xml
Contents conflict in library/mrp.py
Contents conflict in library/purchase.py
Contents conflict in library/sale.py
Conflict adding files to lunch.  Created directory.
Conflict because lunch is not versioned, but has versioned children.  Versioned directory.
Conflict adding file lunch.  Moved existing file to lunch.moved.
Contents conflict in lunch/lunch_view.xml
Conflict adding files to magento_openerp_synchro.  Created directory.
Conflict because magento_openerp_synchro is not versioned, but has versioned children.  Versioned directory.
Contents conflict in magento_openerp_synchro/magento.py
Contents conflict in magento_openerp_synchro/magento_utils.py
Contents conflict in magento_openerp_synchro/product.py
Conflict adding files to magento_openerp_synchro/wizard.  Created directory.
Conflict because magento_openerp_synchro/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in magento_openerp_synchro/wizard/magento_category_synchronize.py
Contents conflict in magento_openerp_synchro/wizard/magento_product_synchronize.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_correct.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_import.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_update.py
Conflict adding files to maintenance_editor.  Created directory.
Conflict because maintenance_editor is not versioned, but has versioned children.  Versioned directory.
Contents conflict in maintenance_editor/__init__.py
Contents conflict in maintenance_editor/__terp__.py
Contents conflict in maintenance_editor/maintenance_editor.py
Contents conflict in maintenance_editor/maintenance_editor_view.xml
Conflict adding files to maintenance_editor/security.  Created directory.
Conflict because maintenance_editor/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in maintenance_editor/security/ir.model.access.csv
Contents conflict in maintenance_editor/security/maintenance_security.xml
Conflict adding files to marketing.  Created directory.
Conflict because marketing is not versioned, but has versioned children.  Versioned directory.
Conflict adding file marketing.  Moved existing file to marketing.moved.
Conflict adding files to md_hr_contract.  Created directory.
Conflict because md_hr_contract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_contract/md_hr_contract.py
Contents conflict in md_hr_contract/md_hr_contract_view.xml
Conflict adding files to md_hr_employee.  Created directory.
Conflict because md_hr_employee is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_employee/md_hr_employee.py
Contents conflict in md_hr_employee/md_hr_employee_data.xml
Conflict adding files to membership_card.  Created directory.
Conflict because membership_card is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/__init__.py
Contents conflict in membership_card/__terp__.py
Conflict adding files to membership_card/i18n.  Created directory.
Conflict because membership_card/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/i18n/ca_ES.po
Contents conflict in membership_card/i18n/es_ES.po
Contents conflict in membership_card/i18n/membership_card.pot
Contents conflict in membership_card/membership_card.py
Conflict adding files to membership_card/report.  Created directory.
Conflict because membership_card/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/report/__init__.py
Contents conflict in membership_card/report/membership_card.rml
Contents conflict in membership_card/report/membership_card.sxw
Contents conflict in membership_card/report/membership_card_address.rml
Contents conflict in membership_card/report/membership_card_address.sxw
Contents conflict in membership_card/report/membership_card_report.py
Conflict adding files to membership_card/wizard.  Created directory.
Conflict because membership_card/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/wizard/__init__.py
Conflict adding files to mrp_bom_customization.  Created directory.
Conflict because mrp_bom_customization is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_bom_customization/__init__.py
Contents conflict in mrp_bom_customization/__terp__.py
Contents conflict in mrp_bom_customization/configurator_view.xml
Contents conflict in mrp_bom_customization/configurator_wizard.py
Contents conflict in mrp_bom_customization/mrp.py
Contents conflict in mrp_bom_customization/mrp_bom_customization.py
Contents conflict in mrp_bom_customization/mrp_bom_customization_view.xml
Conflict adding files to mrp_prodlot_autosplit.  Created directory.
Conflict because mrp_prodlot_autosplit is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_prodlot_autosplit/__init__.py
Contents conflict in mrp_prodlot_autosplit/__terp__.py
Contents conflict in mrp_prodlot_autosplit/product.py
Contents conflict in mrp_prodlot_autosplit/stock.py
Contents conflict in mrp_prodlot_autosplit/stock_view.xml
Conflict adding files to multi_company_account.  Created directory.
Conflict because multi_company_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/__init__.py
Contents conflict in multi_company_account/__terp__.py
Contents conflict in multi_company_account/multi_company_account.py
Contents conflict in multi_company_account/multi_company_account_data.xml
Contents conflict in multi_company_account/multi_company_account_view.xml
Conflict adding files to multi_company_currency.  Created directory.
Conflict because multi_company_currency is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_currency/__terp__.py
Contents conflict in multi_company_currency/multi_currency.py
Contents conflict in multi_company_currency/multi_currency_view.xml
Conflict adding files to network.  Created directory.
Conflict because network is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/__terp__.py
Contents conflict in network/network.py
Contents conflict in network/network_view.xml
Conflict adding files to network/security.  Created directory.
Conflict because network/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/security/ir.model.access.csv
Conflict adding files to olap.  Created directory.
Conflict because olap is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/__terp__.py
Conflict adding files to olap/cli.  Created directory.
Conflict because olap/cli is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cli/Makefile
Contents conflict in olap/cli/tinybi.py
Conflict adding files to olap/cube.  Created directory.
Conflict because olap/cube is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/cross.py
Contents conflict in olap/cube/cube.py
Contents conflict in olap/cube/datatype.py
Contents conflict in olap/cube/formatstring.py
Contents conflict in olap/cube/level.py
Conflict adding files to olap/cube/levels.  Created directory.
Conflict because olap/cube/levels is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/levels/level_interface.py
Contents conflict in olap/cube/levels/level_normal.py
Conflict adding files to olap/cube/mdx_input.  Created directory.
Conflict because olap/cube/mdx_input is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/mdx_input/mdx_input.py
Contents conflict in olap/cube/mdx_operator.py
Conflict adding files to olap/cube/mdx_output.  Created directory.
Conflict because olap/cube/mdx_output is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/mdx_output/mdx_output.py
Contents conflict in olap/cube/mdx_parser.py
Contents conflict in olap/cube/measure.py
Contents conflict in olap/cube/query.py
Contents conflict in olap/cube/slicer.py
Conflict adding files to olap/data.  Created directory.
Conflict because olap/data is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/data/olap_cube_view.xml
Contents conflict in olap/data/olap_cube_workflow.xml
Contents conflict in olap/data/olap_demo.xml
Contents conflict in olap/data/olap_fact_view.xml
Contents conflict in olap/data/olap_view.xml
Contents conflict in olap/data/olap_wizard.xml
Contents conflict in olap/olap.py
Conflict adding files to olap/wizard.  Created directory.
Conflict because olap/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/wizard/wizard_application_configure.py
Contents conflict in olap/wizard/wizard_clear_logs.py
Contents conflict in olap/wizard/wizard_load_columns.py
Contents conflict in olap/wizard/wizard_load_configured_table.py
Contents conflict in olap/wizard/wizard_load_data.py
Contents conflict in olap/wizard/wizard_query_builder.py
Contents conflict in olap/wizard/wizard_test_connection.py
Conflict adding files to olap_crm.  Created directory.
Conflict because olap_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_crm/olap_crm.xml
Conflict adding files to olap_extract.  Created directory.
Conflict because olap_extract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_extract/__terp__.py
Contents conflict in olap_extract/olap_extract_wizard.xml
Conflict adding files to olap_sale.  Created directory.
Conflict because olap_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_sale/__terp__.py
Contents conflict in olap_sale/olap_sale.xml
Conflict adding files to partner_spam.  Created directory.
Conflict because partner_spam is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_spam/__init__.py
Contents conflict in partner_spam/__terp__.py
Conflict adding files to partner_spam/i18n.  Created directory.
Conflict because partner_spam/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_spam/i18n/ca_ES.po
Contents conflict in partner_spam/i18n/es_ES.po
Contents conflict in partner_spam/i18n/partner_spam.pot
Conflict adding files to partner_spam/wizard.  Created directory.
Conflict because partner_spam/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_spam/wizard/__init__.py
Contents conflict in partner_spam/wizard/wizard_sms.py
Contents conflict in partner_spam/wizard/wizard_spam.py
Conflict adding files to portal.  Created directory.
Conflict because portal is not versioned, but has versioned children.  Versioned directory.
Conflict adding file portal.  Moved existing file to portal.moved.
Contents conflict in portal/portal.py
Conflict adding files to portal/wizard.  Created directory.
Conflict because portal/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal/wizard/create_menu.py
Conflict adding files to portal_account.  Created directory.
Conflict because portal_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_account/__terp__.py
Contents conflict in portal_account/portal_account_data.xml
Contents conflict in portal_account/portal_conf_data.xml
Conflict adding files to portal_analytic.  Created directory.
Conflict because portal_analytic is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_analytic/__terp__.py
Contents conflict in portal_analytic/portal_analytic_data.xml
Conflict adding files to portal_analytic_package.  Created directory.
Conflict because portal_analytic_package is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_analytic_package/__terp__.py
Conflict adding files to portal_sale.  Created directory.
Conflict because portal_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_sale/__terp__.py
Contents conflict in portal_sale/portal_conf_data.xml
Contents conflict in portal_sale/portal_sale_data.xml
Conflict adding files to portal_service.  Created directory.
Conflict because portal_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_service/__terp__.py
Contents conflict in portal_service/portal_crm_data.xml
Contents conflict in portal_service/portal_crm_view.xml
Contents conflict in portal_service/portal_project_data.xml
Contents conflict in portal_service/portal_scrum_data.xml
Contents conflict in portal_service/scrum.py
Conflict adding files to product_catalog_report.  Created directory.
Conflict because product_catalog_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/__terp__.py
Conflict adding files to product_catalog_report/report.  Created directory.
Conflict because product_catalog_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/report/product_catalog.py
Contents conflict in product_catalog_report/report/product_catalog.rml
Conflict adding files to product_expiry.  Created directory.
Conflict because product_expiry is not versioned, but has versioned children.  Versioned directory.
Conflict adding file product_expiry.  Moved existing file to product_expiry.moved.
Contents conflict in product_expiry/product_expiry.py
Conflict adding files to product_extended.  Created directory.
Conflict because product_extended is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/__init__.py
Contents conflict in product_extended/__terp__.py
Contents conflict in product_extended/product_extended.py
Contents conflict in product_extended/product_extended_view.xml
Conflict adding files to product_lot_foundry.  Created directory.
Conflict because product_lot_foundry is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_lot_foundry/product_lot_foundry_view.xml
Contents conflict in product_lot_foundry/sale_order.py
Contents conflict in product_lot_foundry/sale_order_view.xml
Conflict adding files to product_qt.  Created directory.
Conflict because product_qt is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_qt/__terp__.py
Contents conflict in product_qt/product_qt_view.xml
Conflict adding files to product_search_reference.  Created directory.
Conflict because product_search_reference is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_search_reference/product.py
Conflict adding files to product_variant_configurator.  Created directory.
Conflict because product_variant_configurator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_configurator/__terp__.py
Contents conflict in product_variant_configurator/configurator_view.xml
Contents conflict in product_variant_configurator/configurator_wizard.py
Contents conflict in product_variant_configurator/product.py
Conflict adding files to product_variant_multi.  Created directory.
Conflict because product_variant_multi is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/__terp__.py
Contents conflict in product_variant_multi/demo_data.xml
Contents conflict in product_variant_multi/product_variant.py
Conflict adding files to product_visible_discount.  Created directory.
Conflict because product_visible_discount is not versioned, but has versioned children.  Versioned directory.
Conflict adding file product_visible_discount.  Moved existing file to product_visible_discount.moved.
Contents conflict in product_visible_discount/__terp__.py
Contents conflict in product_visible_discount/product.py
Conflict adding files to productivity_analysis.  Created directory.
Conflict because productivity_analysis is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/__terp__.py
Conflict adding files to profile_business_game.  Created directory.
Conflict because profile_business_game is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_business_game/profile_game_data.xml
Contents conflict in profile_business_game/profile_game_phase1.py
Conflict adding files to profile_cci.  Created directory.
Conflict because profile_cci is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_cci/__terp__.py
Conflict adding files to profile_dm.  Created directory.
Conflict because profile_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_dm/__terp__.py
Conflict adding files to proforma_followup.  Created directory.
Conflict because proforma_followup is not versioned, but has versioned children.  Versioned directory.
Contents conflict in proforma_followup/__terp__.py
Conflict adding files to purchase_delivery.  Created directory.
Conflict because purchase_delivery is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to purchase_delivery/wizard.  Created directory.
Conflict because purchase_delivery/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_delivery/wizard/delivery_purchase_order.py
Conflict adding files to purchase_discount.  Created directory.
Conflict because purchase_discount is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_discount/purchase_discount.py
Contents conflict in purchase_discount/purchase_discount_report.xml
Conflict adding files to purchase_discount/report.  Created directory.
Conflict because purchase_discount/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_discount/report/order.py
Contents conflict in purchase_discount/report/order.rml
Conflict adding files to purchase_journal.  Created directory.
Conflict because purchase_journal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_journal/purchase_journal_view.xml
Conflict adding files to purchase_number.  Created directory.
Conflict because purchase_number is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_number/__terp__.py
Conflict adding files to purchase_number/report.  Created directory.
Conflict because purchase_number/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_number/report/purchase_order.rml
Contents conflict in purchase_number/report/purchase_order.sxw
Conflict adding files to purchase_tender.  Created directory.
Conflict because purchase_tender is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_tender/__terp__.py
Conflict adding files to radiotv.  Created directory.
Conflict because radiotv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/__init__.py
Contents conflict in radiotv/__terp__.py
Conflict adding files to radiotv/i18n.  Created directory.
Conflict because radiotv/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/i18n/ca_ES.po
Contents conflict in radiotv/i18n/es_ES.po
Contents conflict in radiotv/i18n/radiotv.pot
Contents conflict in radiotv/radiotv.py
Conflict adding files to radiotv/report.  Created directory.
Conflict because radiotv/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/report/__init__.py
Contents conflict in radiotv/report/broadcast_compact_report.py
Contents conflict in radiotv/report/broadcast_declaration_report.py
Contents conflict in radiotv/report/broadcast_report.py
Contents conflict in radiotv/report/common.py
Conflict adding files to radiotv/wizard.  Created directory.
Conflict because radiotv/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/wizard/__init__.py
Contents conflict in radiotv/wizard/export_table.py
Contents conflict in radiotv/wizard/wizard_broadcast_compact_report.py
Contents conflict in radiotv/wizard/wizard_broadcast_declaration_report.py
Contents conflict in radiotv/wizard/wizard_copy_broadcasts.py
Contents conflict in radiotv/wizard/wizard_export_broadcasts.py
Contents conflict in radiotv/wizard/wizard_export_channels_programs.py
Contents conflict in radiotv/wizard/wizard_export_podcasts.py
Conflict adding files to report_analytic_planning_delegate.  Created directory.
Conflict because report_analytic_planning_delegate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic_planning_delegate/__terp__.py
Contents conflict in report_analytic_planning_delegate/report_analytic_planning_view.xml
Conflict adding files to report_analytic_planning_long_term.  Created directory.
Conflict because report_analytic_planning_long_term is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic_planning_long_term/__terp__.py
Conflict adding files to report_hotel_restaurant.  Created directory.
Conflict because report_hotel_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_hotel_restaurant/__init__.py
Contents conflict in report_hotel_restaurant/__terp__.py
Contents conflict in report_hotel_restaurant/report_hotel_restaurant.py
Contents conflict in report_hotel_restaurant/report_hotel_restaurant_view.xml
Conflict adding files to report_hotel_restaurant/security.  Created directory.
Conflict because report_hotel_restaurant/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_hotel_restaurant/security/ir.model.access.csv
Conflict adding files to sale_category.  Created directory.
Conflict because sale_category is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to sale_category/report.  Created directory.
Conflict because sale_category/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_category/report/sale_category_report.rml
Conflict adding files to sale_delivery.  Created directory.
Conflict because sale_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_delivery/sale_delivery.py
Conflict adding files to sale_forecast.  Created directory.
Conflict because sale_forecast is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to sale_forecast/report.  Created directory.
Conflict because sale_forecast/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/report/sale_forecast_salesman.py
Contents conflict in sale_forecast/sale_forecast.py
Conflict adding files to sale_layout.  Created directory.
Conflict because sale_layout is not versioned, but has versioned children.  Versioned directory.
Conflict adding file sale_layout.  Moved existing file to sale_layout.moved.
Contents conflict in sale_layout/__terp__.py
Conflict adding files to sale_layout/report.  Created directory.
Conflict because sale_layout/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_layout/report/report_sale_layout.py
Contents conflict in sale_layout/report/report_sale_layout.rml
Contents conflict in sale_layout/report/report_sale_layout.sxw
Contents conflict in sale_layout/sale_layout.py
Contents conflict in sale_layout/sale_layout_view.xml
Conflict adding file sale_margin.  Moved existing file to sale_margin.moved.
Conflict adding files to sale_margin_old.  Created directory.
Conflict because sale_margin_old is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_margin_old/sale_margin.py
Conflict adding files to sale_numbers.  Created directory.
Conflict because sale_numbers is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_numbers/__terp__.py
Conflict adding files to sale_numbers/report.  Created directory.
Conflict because sale_numbers/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_numbers/report/sale_order.rml
Contents conflict in sale_numbers/report/sale_order.sxw
Conflict adding files to sale_payment.  Created directory.
Conflict because sale_payment is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_payment/__init__.py
Contents conflict in sale_payment/__terp__.py
Contents conflict in sale_payment/sale_payment.py
Conflict adding files to sale_product_multistep_configurator.  Created directory.
Conflict because sale_product_multistep_configurator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_product_multistep_configurator/__init__.py
Contents conflict in sale_product_multistep_configurator/__terp__.py
Contents conflict in sale_product_multistep_configurator/sale_product_multistep_configurator.py
Contents conflict in sale_product_multistep_configurator/sale_product_multistep_configurator.xml
Contents conflict in sale_product_multistep_configurator/sale_view.xml
Conflict adding files to sale_supplier_direct_delivery.  Created directory.
Conflict because sale_supplier_direct_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_supplier_direct_delivery/mrp.py
Contents conflict in sale_supplier_direct_delivery/product.py
Contents conflict in sale_supplier_direct_delivery/purchase.py
Contents conflict in sale_supplier_direct_delivery/sale.py
Conflict adding files to sale_tax_include.  Created directory.
Conflict because sale_tax_include is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_tax_include/sale_tax_incl.py
Conflict adding files to sale_wo_prices.  Created directory.
Conflict because sale_wo_prices is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_wo_prices/__init__.py
Contents conflict in sale_wo_prices/__terp__.py
Contents conflict in sale_wo_prices/sale_view.xml
Conflict adding files to sales_purchase_seq.  Created directory.
Conflict because sales_purchase_seq is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sales_purchase_seq/sales_purchase_seq.py
Conflict adding files to sandwich.  Created directory.
Conflict because sandwich is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to sandwich/report.  Created directory.
Conflict because sandwich/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/report/sandwich_report.rml
Contents conflict in sandwich/report/sandwich_report.sxw
Conflict adding files to segmentation.  Created directory.
Conflict because segmentation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in segmentation/__terp__.py
Conflict adding files to smsclient.  Created directory.
Conflict because smsclient is not versioned, but has versioned children.  Versioned directory.
Contents conflict in smsclient/smsclient.py
Conflict adding files to smsclient/wizard.  Created directory.
Conflict because smsclient/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in smsclient/wizard/sendcode.py
Contents conflict in smsclient/wizard/verifycode.py
Conflict adding files to smtpclient.  Created directory.
Conflict because smtpclient is not versioned, but has versioned children.  Versioned directory.
Contents conflict in smtpclient/__terp__.py
Conflict adding files to smtpclient/i18n.  Created directory.
Conflict because smtpclient/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in smtpclient/i18n/ca_ES.po
Contents conflict in smtpclient/i18n/es_ES.po
Contents conflict in smtpclient/serveraction.py
Contents conflict in smtpclient/serveraction_view.xml
Contents conflict in smtpclient/smtpclient.py
Contents conflict in smtpclient/smtpclient_view.xml
Conflict adding files to smtpclient/wizard.  Created directory.
Conflict because smtpclient/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in smtpclient/wizard/sendcode.py
Contents conflict in smtpclient/wizard/testemail.py
Contents conflict in smtpclient/wizard/verifycode.py
Contents conflict in smtpclient/wizard/wizard_spam.py
Conflict adding files to stock_planning.  Created directory.
Conflict because stock_planning is not versioned, but has versioned children.  Versioned directory.
Conflict adding file stock_planning.  Moved existing file to stock_planning.moved.
Contents conflict in stock_planning/stock_planning.py
Contents conflict in stock_planning/stock_planning_view.xml
Conflict adding file survey.  Moved existing file to survey.moved.
Conflict adding files to thunderbird.  Created directory.
Conflict because thunderbird is not versioned, but has versioned children.  Versioned directory.
Conflict adding file thunderbird.  Moved existing file to thunderbird.moved.
Contents conflict in thunderbird/thunderbird_interface.zip
Contents conflict in thunderbird/tiny_plugin-2.0.xpi
Conflict adding files to tiny_purchase.  Created directory.
Conflict because tiny_purchase is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to tiny_purchase/report.  Created directory.
Conflict because tiny_purchase/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tiny_purchase/report/order.rml
Contents conflict in tiny_purchase/report/order.sxw
Conflict adding files to travel.  Created directory.
Conflict because travel is not versioned, but has versioned children.  Versioned directory.
Contents conflict in travel/__terp__.py
Conflict adding files to uml_dia.  Created directory.
Conflict because uml_dia is not versioned, but has versioned children.  Versioned directory.
Contents conflict in uml_dia/codegen_openerp.py
Conflict adding files to use_control.  Created directory.
Conflict because use_control is not versioned, but has versioned children.  Versioned directory.
Contents conflict in use_control/__init__.py
Contents conflict in use_control/__terp__.py
Contents conflict in use_control/services.py
Contents conflict in use_control/use_control.py
Conflict adding files to users_ldap.  Created directory.
Conflict because users_ldap is not versioned, but has versioned children.  Versioned directory.
Conflict adding file users_ldap.  Moved existing file to users_ldap.moved.
Contents conflict in users_ldap/__terp__.py
Contents conflict in users_ldap/users_ldap.py
Contents conflict in users_ldap/users_ldap_view.xml
Conflict adding files to zarafa.  Created directory.
Conflict because zarafa is not versioned, but has versioned children.  Versioned directory.
Contents conflict in zarafa/email_view.xml
Contents conflict in zarafa/sednacom_view.xml
Contents conflict in zarafa/sednazarafa_view.xml
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/pniederlag
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Needs Resubmitting
Review via email: mp+67170@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Hello Peter,

I think you submitted this proposal onto the wrong branch, this is the official addons branch, and your submitted branch is apparently an extra-addons branch, as you have submitted it against extra-addons-5.0 with far less conflicts.

I'm cancelling this merge proposal, please resubmit another appropriate one against the desired extra-addons if needed.

By the way, you almost certainly cannot propose the same patched branch for merging on extra-addons-5.0 and other versions of extra-addons, as these branches have diverged quite a lot, I assume.
Instead, you should grab a fresh copy of each extra-addons branch, apply you patch, and submit each one as merge proposal against the corresponding master branch.

Thanks for your contributions!

review: Needs Resubmitting

Unmerged revisions

4337. By OpenERP Germany

Fix #806832, dont change name when UoS Qty is changed

4336. By Stephane Wirtel (OpenERP)

[FIX] Add the copyright of Raphael Valyi
[FIX] Use the None constant instead of the dict on the stack
[FIX] Give the context to the browse function
[FIX] Use the browse_record object instead of a self.write function
[REF] Remove the commented code
[FIX] Add the help attribute on one field, to explain the behavior of
this field

4335. By Stephane Wirtel (OpenERP)

[FIX] Add the import needed by the _ method

4334. By Jay Vora (Serpent Consulting Services)

[FIX] Sale_margin : Corrections for foreign currency

4333. By Albert Cervera i Areny - http://www.NaN-tic.com

[FIX] nan_partner_risk: Use partner's accounts instead of all payables/receivables of that partner. Also, if credit_limit is 0.0/False show risk percent to 100%.

4332. By Albert Cervera i Areny - http://www.NaN-tic.com

[FIX] nan_partner_risk: Fixed typo in Spanish translation.

4331. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

4330. By Albert Cervera i Areny - http://www.NaN-tic.com

[FIX] nan_account_statement_of_accounts: Fix syntax error in __terp__.py introduced in previous commit.

4329. By Albert Cervera i Areny - http://www.NaN-tic.com

[IMP] nan_account_statement_of_accounts: Show partially reconciled move lines in blue.

4328. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '__init__.py'
2--- __init__.py 1970-01-01 00:00:00 +0000
3+++ __init__.py 2011-07-07 11:22:45 +0000
4@@ -0,0 +1,1 @@
5+import account_product_fiscal_classification
6\ No newline at end of file
7
8=== added file '__terp__.py'
9--- __terp__.py 1970-01-01 00:00:00 +0000
10+++ __terp__.py 2011-07-07 11:22:45 +0000
11@@ -0,0 +1,33 @@
12+# -*- encoding: utf-8 -*-
13+#########################################################################
14+# #
15+# Copyright (C) 2010 Raphaël Valyi #
16+# #
17+#This program is free software: you can redistribute it and/or modify #
18+#it under the terms of the GNU General Public License as published by #
19+#the Free Software Foundation, either version 3 of the License, or #
20+#(at your option) any later version. #
21+# #
22+#This program is distributed in the hope that it will be useful, #
23+#but WITHOUT ANY WARRANTY; without even the implied warranty of #
24+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
25+#GNU General Public License for more details. #
26+# #
27+#You should have received a copy of the GNU General Public License #
28+#along with this program. If not, see <http://www.gnu.org/licenses/>. #
29+#########################################################################
30+
31+{
32+ "name" : "Account Product Fiscal Classification",
33+ "version" : "0.1",
34+ "author" : "Akretion.com",
35+ "description": """Account Product Fiscal Classification
36+ """,
37+ 'website': 'http://www.akretion.com',
38+ 'depends': ["account", "product"],
39+ 'init_xml': [],
40+ 'update_xml': ['product_view.xml'],
41+ 'demo_xml': [],
42+ 'installable': True,
43+ 'active': False,
44+}
45
46=== added directory 'account_analytic_package'
47=== added file 'account_analytic_package/__terp__.py.OTHER'
48--- account_analytic_package/__terp__.py.OTHER 1970-01-01 00:00:00 +0000
49+++ account_analytic_package/__terp__.py.OTHER 2011-07-07 11:22:45 +0000
50@@ -0,0 +1,43 @@
51+# -*- encoding: utf-8 -*-
52+##############################################################################
53+#
54+# OpenERP, Open Source Management Solution
55+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
56+# $Id$
57+#
58+# This program is free software: you can redistribute it and/or modify
59+# it under the terms of the GNU General Public License as published by
60+# the Free Software Foundation, either version 3 of the License, or
61+# (at your option) any later version.
62+#
63+# This program is distributed in the hope that it will be useful,
64+# but WITHOUT ANY WARRANTY; without even the implied warranty of
65+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
66+# GNU General Public License for more details.
67+#
68+# You should have received a copy of the GNU General Public License
69+# along with this program. If not, see <http://www.gnu.org/licenses/>.
70+#
71+##############################################################################
72+{
73+ "name" : "Account Analytic Package - To configure Analytic Account for product packages",
74+ "description": """The Module allows to configure analytic account for product packages.
75+ Views for total and monthly product packages weight, Amount analysis.""",
76+ "version" : "1.0",
77+ "author" : "Tiny",
78+ "category" : "Generic Modules/Accounting",
79+ "module": "",
80+ "website": "http://www.openerp.com",
81+ "depends" : ["account","product","crm"],
82+ "init_xml" : [],
83+ "update_xml" : [
84+ "security/ir.model.access.csv",
85+ "account_analytic_package_view.xml"
86+ ],
87+ "demo_xml" : [],
88+ "active": False,
89+ "installable": True,
90+
91+}
92+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
93+
94
95=== added file 'account_analytic_package/account_analytic_package.py.OTHER'
96--- account_analytic_package/account_analytic_package.py.OTHER 1970-01-01 00:00:00 +0000
97+++ account_analytic_package/account_analytic_package.py.OTHER 2011-07-07 11:22:45 +0000
98@@ -0,0 +1,161 @@
99+# -*- encoding: utf-8 -*-
100+##############################################################################
101+#
102+# OpenERP, Open Source Management Solution
103+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
104+# $Id$
105+#
106+# This program is free software: you can redistribute it and/or modify
107+# it under the terms of the GNU General Public License as published by
108+# the Free Software Foundation, either version 3 of the License, or
109+# (at your option) any later version.
110+#
111+# This program is distributed in the hope that it will be useful,
112+# but WITHOUT ANY WARRANTY; without even the implied warranty of
113+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
114+# GNU General Public License for more details.
115+#
116+# You should have received a copy of the GNU General Public License
117+# along with this program. If not, see <http://www.gnu.org/licenses/>.
118+#
119+##############################################################################
120+import operator
121+from osv import osv, fields
122+
123+
124+class account_analytic_account(osv.osv):
125+ _inherit = "account.analytic.account"
126+ _columns = {
127+ 'package_ok': fields.boolean('Used in Package'),
128+ }
129+account_analytic_account()
130+
131+
132+class product_product(osv.osv):
133+ _inherit = "product.product"
134+ _columns = {
135+ 'package_weight': fields.float('Package Weight', digits=(16,2)),
136+ }
137+ _defaults = {
138+ 'package_weight': lambda *args: 0.0
139+ }
140+product_product()
141+
142+class crm_case_section(osv.osv):
143+ _inherit = "crm.case.section"
144+ _columns = {
145+ 'package_product_id': fields.many2one('product.product', 'Package Product'),
146+ 'analytic_account_id': fields.many2one('account.analytic.account', 'Main Analytic Account'),
147+ 'analytic_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
148+ }
149+crm_case_section()
150+
151+class crm_case(osv.osv):
152+ _inherit = "crm.case"
153+ def case_open(self, cr, uid, ids, *args):
154+ res = super(crm_case, self).case_open(cr, uid, ids, *args)
155+ for case in self.browse(cr,uid, ids):
156+ section = case.section_id
157+ if section.package_product_id and section.analytic_account_id and section.analytic_journal_id:
158+ partner = self.pool.get('res.users').browse(cr, uid, uid).address_id.partner_id.id
159+ aids = self.pool.get('account.analytic.account').search(cr, uid, [('partner_id','=',partner),('state','in',('open','draft','pending')),('parent_id','child_of',[section.analytic_account_id.id])])
160+ if not aids:
161+ raise osv.except_osv('You can not open this case !', 'No valid analytic account defined for your user.\nPlease contact the administrator.')
162+ self.pool.get('account.analytic.line').create(cr, uid, {
163+ 'name': case.name,
164+ 'amount': 0.0,
165+ 'unit_amount': 1,
166+ 'product_uom_id': section.package_product_id.uom_id.id,
167+ 'product_id': section.package_product_id.id,
168+ 'account_id': aids[0],
169+ 'general_account_id': section.package_product_id.property_account_income.id or section.package_product_id.categ_id.property_account_income_categ.id,
170+ 'journal_id': section.analytic_journal_id.id,
171+ 'user_id': uid,
172+ 'ref': 'CASE'+str(case.id)
173+ })
174+ return res
175+crm_case()
176+
177+
178+class account_analytic_line_package(osv.osv):
179+ _name = "account.analytic.line.package"
180+ _auto = False
181+ _order = 'date desc'
182+ def init(self, cr):
183+ cr.execute("""
184+ CREATE OR REPLACE VIEW account_analytic_line_package AS (
185+ select
186+ l.id,
187+ l.name,
188+ l.date,
189+ a.partner_id,
190+ a.id as account_id,
191+ l.product_id,
192+ p.package_weight as unit_weight,
193+ p.package_weight*l.unit_amount as total_weight,
194+ l.unit_amount
195+ from
196+ account_analytic_line l
197+ left join
198+ account_analytic_account a on (l.account_id=a.id)
199+ left join
200+ product_product p on (p.id=l.product_id)
201+ where
202+ l.product_id is not null and
203+ p.package_weight<>0 and
204+ a.package_ok
205+ )
206+ """)
207+ _columns = {
208+ 'name': fields.char('Name', size=128, readonly=True, select=1),
209+ 'date': fields.date('Date', readonly=True, select=1),
210+ 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
211+ 'account_id': fields.many2one('account.analytic.account', 'Account', readonly=True),
212+ 'product_id': fields.many2one('product.product', 'Product', select=2, readonly=True),
213+ 'unit_amount': fields.float('Quantity', readonly=True),
214+ 'unit_weight': fields.float('Unit Weight', readonly=True),
215+ 'total_weight': fields.float('Total Weight', readonly=True),
216+ }
217+account_analytic_line_package()
218+
219+class account_analytic_line_package_month(osv.osv):
220+ _name = "account.analytic.line.package.month"
221+ _auto = False
222+ def init(self, cr):
223+ cr.execute("""
224+ CREATE OR REPLACE VIEW account_analytic_line_package_month AS (
225+ select
226+ min(l.id) as id,
227+ to_char(l.date, 'YYYY-MM-01') as name,
228+ a.partner_id,
229+ l.product_id,
230+ sum(p.package_weight*l.unit_amount) as total_weight,
231+ sum(case when p.package_weight>0 then p.package_weight*l.unit_amount else 0 end) as total_activity,
232+ sum(case when p.package_weight<0 then -p.package_weight*l.unit_amount else 0 end) as total_service
233+ from
234+ account_analytic_line l
235+ left join
236+ account_analytic_account a on (l.account_id=a.id)
237+ left join
238+ product_product p on (p.id=l.product_id)
239+ where
240+ l.product_id is not null and
241+ p.package_weight<>0 and
242+ a.package_ok
243+ group by
244+ l.product_id,
245+ a.partner_id,
246+ to_char(l.date, 'YYYY-MM-01')
247+ )
248+ """)
249+ _columns ={
250+ 'name': fields.date('Date', readonly=True, select=1),
251+ 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
252+ 'product_id': fields.many2one('product.product', 'Product', select=2, readonly=True),
253+ 'total_weight': fields.float('Total Weight', readonly=True),
254+ 'total_activity': fields.float('Total Activity', readonly=True),
255+ 'total_service': fields.float('Total Service', readonly=True),
256+ }
257+account_analytic_line_package_month()
258+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
259+
260
261=== added directory 'account_analytic_progress'
262=== added file 'account_analytic_progress/__terp__.py.OTHER'
263--- account_analytic_progress/__terp__.py.OTHER 1970-01-01 00:00:00 +0000
264+++ account_analytic_progress/__terp__.py.OTHER 2011-07-07 11:22:45 +0000
265@@ -0,0 +1,43 @@
266+# -*- encoding: utf-8 -*-
267+##############################################################################
268+#
269+# OpenERP, Open Source Management Solution
270+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
271+# $Id$
272+#
273+# This program is free software: you can redistribute it and/or modify
274+# it under the terms of the GNU General Public License as published by
275+# the Free Software Foundation, either version 3 of the License, or
276+# (at your option) any later version.
277+#
278+# This program is distributed in the hope that it will be useful,
279+# but WITHOUT ANY WARRANTY; without even the implied warranty of
280+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
281+# GNU General Public License for more details.
282+#
283+# You should have received a copy of the GNU General Public License
284+# along with this program. If not, see <http://www.gnu.org/licenses/>.
285+#
286+##############################################################################
287+{
288+ "name" : "Account Analytic Progress - Define Progress bar for analytic accounts",
289+ "description": """Progress bar for analytic accounts.
290+This is the module used for displaying the shared funded
291+development projects on the Tiny ERP website.""",
292+ "version" : "1.0",
293+ "author" : "tiny",
294+ "category" : "Generic Modules/Accounting",
295+ "module": "",
296+ "website": "http://www.openerp.com",
297+ "depends" : ["account_analytic_analysis"],
298+ "init_xml" : [],
299+ "update_xml" : [
300+ "account_analytic_progress_view.xml"
301+ ],
302+ "demo_xml" : [],
303+ "active": False,
304+ "installable": True,
305+
306+}
307+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
308+
309
310=== added directory 'account_anglo_saxon'
311=== renamed directory 'account_anglo_saxon' => 'account_anglo_saxon.moved'
312=== added file 'account_anglo_saxon/__init__.py'
313--- account_anglo_saxon/__init__.py 1970-01-01 00:00:00 +0000
314+++ account_anglo_saxon/__init__.py 2011-07-07 11:22:45 +0000
315@@ -0,0 +1,26 @@
316+# -*- encoding: utf-8 -*-
317+##############################################################################
318+#
319+# OpenERP, Open Source Management Solution
320+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
321+# $Id$
322+#
323+# This program is free software: you can redistribute it and/or modify
324+# it under the terms of the GNU General Public License as published by
325+# the Free Software Foundation, either version 3 of the License, or
326+# (at your option) any later version.
327+#
328+# This program is distributed in the hope that it will be useful,
329+# but WITHOUT ANY WARRANTY; without even the implied warranty of
330+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
331+# GNU General Public License for more details.
332+#
333+# You should have received a copy of the GNU General Public License
334+# along with this program. If not, see <http://www.gnu.org/licenses/>.
335+#
336+##############################################################################
337+import product
338+import stock
339+import purchase
340+import invoice
341+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
342\ No newline at end of file
343
344=== added file 'account_anglo_saxon/__terp__.py'
345--- account_anglo_saxon/__terp__.py 1970-01-01 00:00:00 +0000
346+++ account_anglo_saxon/__terp__.py 2011-07-07 11:22:45 +0000
347@@ -0,0 +1,44 @@
348+# -*- encoding: utf-8 -*-
349+##############################################################################
350+#
351+# OpenERP, Open Source Management Solution
352+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
353+# $Id$
354+#
355+# This program is free software: you can redistribute it and/or modify
356+# it under the terms of the GNU General Public License as published by
357+# the Free Software Foundation, either version 3 of the License, or
358+# (at your option) any later version.
359+#
360+# This program is distributed in the hope that it will be useful,
361+# but WITHOUT ANY WARRANTY; without even the implied warranty of
362+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
363+# GNU General Public License for more details.
364+#
365+# You should have received a copy of the GNU General Public License
366+# along with this program. If not, see <http://www.gnu.org/licenses/>.
367+#
368+##############################################################################
369+
370+
371+{
372+ "name" : "Stock Accounting for Anglo Saxon countries",
373+ "version" : "1.2",
374+ "author" : "Tiny, Veritos",
375+ "website" : "http://tinyerp.com - http://veritos.nl",
376+ "description" : """This module will support the Anglo-Saxons accounting methodology by
377+ changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries
378+ and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales.
379+ Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.
380+ This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account
381+ when the invoice is created to transfer this amount to the debtor or creditor account.
382+ Secondly, price differences between actual purchase price and fixed product standard price are booked on a seperate account""",
383+ "depends" : ["product", "account", "sale", "purchase", "stock"],
384+ "category" : "Generic Modules/Inventory Control",
385+ "init_xml" : [],
386+ "demo_xml" : [],
387+ "update_xml" : ["product_view.xml",],
388+ "active": False,
389+ "installable": True
390+}
391+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
392\ No newline at end of file
393
394=== added file 'account_anglo_saxon/invoice.py'
395--- account_anglo_saxon/invoice.py 1970-01-01 00:00:00 +0000
396+++ account_anglo_saxon/invoice.py 2011-07-07 11:22:45 +0000
397@@ -0,0 +1,179 @@
398+# -*- encoding: utf-8 -*-
399+##############################################################################
400+#
401+# OpenERP, Open Source Management Solution
402+# Copyright (C)
403+# 2004-2008 Tiny SPRL (<http://tiny.be>).
404+# 2009-2010 Veritos (http://veritos.nl).
405+# All Rights Reserved
406+# $Id$
407+#
408+# This program is free software: you can redistribute it and/or modify
409+# it under the terms of the GNU General Public License as published by
410+# the Free Software Foundation, either version 3 of the License, or
411+# (at your option) any later version.
412+#
413+# This program is distributed in the hope that it will be useful,
414+# but WITHOUT ANY WARRANTY; without even the implied warranty of
415+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
416+# GNU General Public License for more details.
417+#
418+# You should have received a copy of the GNU General Public License
419+# along with this program. If not, see <http://www.gnu.org/licenses/>.
420+#
421+##############################################################################
422+
423+from osv import fields, osv
424+
425+class account_invoice_line(osv.osv):
426+ _inherit = "account.invoice.line"
427+
428+ def move_line_get(self, cr, uid, invoice_id, context=None):
429+ res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context)
430+ inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
431+ if inv.type in ('out_invoice','out_refund'):
432+ for i_line in inv.invoice_line:
433+ if i_line.product_id:
434+ if inv.type == 'out_invoice':
435+ # debit account dacc will be the output account
436+ # first check the product, if empty check the category
437+ dacc = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
438+ if not dacc:
439+ dacc = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
440+ else:
441+ # = out_refund
442+ # debit account dacc will be the input account
443+ # first check the product, if empty check the category
444+ dacc = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
445+ if not dacc:
446+ dacc = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
447+ # in both cases the credit account cacc will be the expense account
448+ # first check the product, if empty check the category
449+ cacc = i_line.product_id.product_tmpl_id.property_account_expense and i_line.product_id.product_tmpl_id.property_account_expense.id
450+ if not cacc:
451+ cacc = i_line.product_id.categ_id.property_account_expense_categ and i_line.product_id.categ_id.property_account_expense_categ.id
452+
453+ if dacc and cacc:
454+ res.append({
455+ 'type':'src',
456+ 'name': i_line.name[:64],
457+ 'price_unit':i_line.product_id.product_tmpl_id.standard_price,
458+ 'quantity':i_line.quantity,
459+ 'price':i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
460+ 'account_id':dacc,
461+ 'product_id':i_line.product_id.id,
462+ 'uos_id':i_line.uos_id.id,
463+ 'account_analytic_id':i_line.account_analytic_id.id,
464+ 'taxes':i_line.invoice_line_tax_id,
465+ })
466+
467+ res.append({
468+ 'type':'src',
469+ 'name': i_line.name[:64],
470+ 'price_unit':i_line.product_id.product_tmpl_id.standard_price,
471+ 'quantity':i_line.quantity,
472+ 'price': -1 * i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
473+ 'account_id':cacc,
474+ 'product_id':i_line.product_id.id,
475+ 'uos_id':i_line.uos_id.id,
476+ 'account_analytic_id':i_line.account_analytic_id.id,
477+ 'taxes':i_line.invoice_line_tax_id,
478+ })
479+ elif inv.type in ('in_invoice','in_refund'):
480+ for i_line in inv.invoice_line:
481+ if i_line.product_id:
482+ if i_line.product_id.product_tmpl_id.type != 'service':
483+ # get the price difference account at the product
484+ acc = i_line.product_id.product_tmpl_id.property_account_creditor_price_difference and i_line.product_id.product_tmpl_id.property_account_creditor_price_difference.id
485+ if not acc:
486+ # if not found on the product get the price difference account at the category
487+ acc = i_line.product_id.categ_id.property_account_creditor_price_difference_categ and i_line.product_id.categ_id.property_account_creditor_price_difference_categ.id
488+ a = None
489+ if inv.type == 'in_invoice':
490+ # oa will be the stock input account
491+ # first check the product, if empty check the category
492+ oa = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
493+ if not oa:
494+ oa = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
495+ else:
496+ # = in_refund
497+ # oa will be the stock output account
498+ # first check the product, if empty check the category
499+ oa = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
500+ if not oa:
501+ oa = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
502+ if oa:
503+ # get the fiscal position
504+ fpos = i_line.invoice_id.fiscal_position or False
505+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
506+ diff_res = []
507+ # calculate and write down the possible price difference between invoice price and product price
508+ for line in res:
509+ if a == line['account_id'] and i_line.product_id.id == line['product_id']:
510+ uom = i_line.product_id.uos_id or i_line.product_id.uom_id
511+ standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.product_tmpl_id.standard_price, i_line.uos_id.id)
512+ if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
513+ price_diff = i_line.price_unit - standard_price
514+ line.update({'price':standard_price * line['quantity']})
515+ diff_res.append({
516+ 'type':'src',
517+ 'name': i_line.name[:64],
518+ 'price_unit':price_diff,
519+ 'quantity':line['quantity'],
520+ 'price': price_diff * line['quantity'],
521+ 'account_id':acc,
522+ 'product_id':line['product_id'],
523+ 'uos_id':line['uos_id'],
524+ 'account_analytic_id':line['account_analytic_id'],
525+ 'taxes':line.get('taxes',[]),
526+ })
527+ res += diff_res
528+ return res
529+
530+ def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
531+ if not product:
532+ return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
533+ else:
534+ res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
535+
536+ if type in ('in_invoice','in_refund'):
537+ product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
538+ if type == 'in_invoice':
539+ oa = product_obj.product_tmpl_id.property_stock_account_input and product_obj.product_tmpl_id.property_stock_account_input.id
540+ if not oa:
541+ oa = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id
542+ else:
543+ oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
544+ if not oa:
545+ oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
546+ if oa:
547+ fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
548+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
549+ res['value'].update({'account_id':a})
550+ return res
551+
552+account_invoice_line()
553+
554+class account_invoice(osv.osv):
555+ _inherit = "account.invoice"
556+
557+ def _refund_cleanup_lines(self, cr, uid, lines):
558+ for line in lines:
559+ inv_id = line['invoice_id']
560+ inv_obj = self.browse(cr,uid,inv_id[0])
561+ if inv_obj.type == 'in_invoice':
562+ if line.get('product_id',False):
563+ product_obj = self.pool.get('product.product').browse(cr,uid,line['product_id'][0])
564+ oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
565+ if not oa:
566+ oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
567+ if oa:
568+ fpos = inv_obj.fiscal_position or False
569+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
570+ account_data = self.pool.get('account.account').read(cr,uid,[a],['name'])[0]
571+ line.update({'account_id': (account_data['id'],account_data['name'])})
572+ res = super(account_invoice,self)._refund_cleanup_lines(cr, uid, lines)
573+ return res
574+
575+account_invoice()
576+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
577\ No newline at end of file
578
579=== added file 'account_anglo_saxon/product.py'
580--- account_anglo_saxon/product.py 1970-01-01 00:00:00 +0000
581+++ account_anglo_saxon/product.py 2011-07-07 11:22:45 +0000
582@@ -0,0 +1,57 @@
583+# -*- encoding: utf-8 -*-
584+##############################################################################
585+#
586+# OpenERP, Open Source Management Solution
587+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
588+# $Id$
589+#
590+# This program is free software: you can redistribute it and/or modify
591+# it under the terms of the GNU General Public License as published by
592+# the Free Software Foundation, either version 3 of the License, or
593+# (at your option) any later version.
594+#
595+# This program is distributed in the hope that it will be useful,
596+# but WITHOUT ANY WARRANTY; without even the implied warranty of
597+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
598+# GNU General Public License for more details.
599+#
600+# You should have received a copy of the GNU General Public License
601+# along with this program. If not, see <http://www.gnu.org/licenses/>.
602+#
603+##############################################################################
604+
605+from osv import fields, osv
606+
607+class product_category(osv.osv):
608+ _inherit = "product.category"
609+ _columns = {
610+ 'property_account_creditor_price_difference_categ': fields.property(
611+ 'account.account',
612+ type='many2one',
613+ relation='account.account',
614+ string="Price Difference Account",
615+ method=True,
616+ view_load=True,
617+ help="This account will be used to value price difference between purchase price and cost price."),
618+
619+ }
620+product_category()
621+
622+class product_template(osv.osv):
623+ _inherit = "product.template"
624+ _columns = {
625+ 'property_account_creditor_price_difference': fields.property(
626+ 'account.account',
627+ type='many2one',
628+ relation='account.account',
629+ string="Price Difference Account",
630+ method=True,
631+ view_load=True,
632+ help="This account will be used to value price difference between purchase price and cost price."),
633+
634+ }
635+product_template()
636+
637+
638+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
639+
640
641=== added file 'account_anglo_saxon/product_view.xml'
642--- account_anglo_saxon/product_view.xml 1970-01-01 00:00:00 +0000
643+++ account_anglo_saxon/product_view.xml 2011-07-07 11:22:45 +0000
644@@ -0,0 +1,53 @@
645+<?xml version="1.0"?>
646+<openerp>
647+ <data>
648+ <record id="product_normal_form_view" model="ir.ui.view">
649+ <field name="name">product.normal.form.inherit.stock</field>
650+ <field name="model">product.product</field>
651+ <field name="type">form</field>
652+ <field name="inherit_id" ref="account.product_normal_form_view"/>
653+ <field name="arch" type="xml">
654+ <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
655+ <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
656+ <newline/>
657+<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
658+<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
659+ </xpath>
660+ </field>
661+ </record>
662+
663+ <record id="product_template_form_view" model="ir.ui.view">
664+ <field name="name">product.template.product.form.inherit</field>
665+ <field name="model">product.template</field>
666+ <field name="type">form</field>
667+ <field name="inherit_id" ref="account.product_template_form_view"/>
668+ <field name="arch" type="xml">
669+ <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
670+ <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
671+ <newline/>
672+<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
673+<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
674+ </xpath>
675+ </field>
676+ </record>
677+
678+ <record id="view_category_property_form" model="ir.ui.view">
679+ <field name="name">product.category.property.form.inherit.stock</field>
680+ <field name="model">product.category</field>
681+ <field name="type">form</field>
682+ <field name="inherit_id" ref="product.product_category_form_view"/>
683+ <field name="arch" type="xml">
684+ <form position="inside">
685+ <group col="2" colspan="2">
686+ <separator string=" Accounting Property" colspan="2"/>
687+ <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
688+<!-- <field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
689+<!-- <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
690+ </group>
691+ </form>
692+ </field>
693+ </record>
694+
695+ </data>
696+</openerp>
697+
698
699=== added file 'account_anglo_saxon/purchase.py'
700--- account_anglo_saxon/purchase.py 1970-01-01 00:00:00 +0000
701+++ account_anglo_saxon/purchase.py 2011-07-07 11:22:45 +0000
702@@ -0,0 +1,42 @@
703+# -*- encoding: utf-8 -*-
704+##############################################################################
705+#
706+# OpenERP, Open Source Management Solution
707+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
708+# $Id$
709+#
710+# This program is free software: you can redistribute it and/or modify
711+# it under the terms of the GNU General Public License as published by
712+# the Free Software Foundation, either version 3 of the License, or
713+# (at your option) any later version.
714+#
715+# This program is distributed in the hope that it will be useful,
716+# but WITHOUT ANY WARRANTY; without even the implied warranty of
717+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
718+# GNU General Public License for more details.
719+#
720+# You should have received a copy of the GNU General Public License
721+# along with this program. If not, see <http://www.gnu.org/licenses/>.
722+#
723+##############################################################################
724+
725+from osv import fields, osv
726+
727+class purchase_order(osv.osv):
728+ _name = "purchase.order"
729+ _inherit = "purchase.order"
730+ _description = "Purchase order"
731+
732+ def inv_line_create(self, cr, uid, a, ol):
733+ line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
734+ if ol.product_id:
735+ oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id
736+ if not oa:
737+ oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id
738+ if oa:
739+ fpos = ol.order_id.fiscal_position or False
740+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
741+ line[2].update({'account_id': a})
742+ return line
743+purchase_order()
744+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
745\ No newline at end of file
746
747=== added file 'account_anglo_saxon/sale.py'
748--- account_anglo_saxon/sale.py 1970-01-01 00:00:00 +0000
749+++ account_anglo_saxon/sale.py 2011-07-07 11:22:45 +0000
750@@ -0,0 +1,44 @@
751+# -*- encoding: utf-8 -*-
752+##############################################################################
753+#
754+# OpenERP, Open Source Management Solution
755+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
756+# $Id$
757+#
758+# This program is free software: you can redistribute it and/or modify
759+# it under the terms of the GNU General Public License as published by
760+# the Free Software Foundation, either version 3 of the License, or
761+# (at your option) any later version.
762+#
763+# This program is distributed in the hope that it will be useful,
764+# but WITHOUT ANY WARRANTY; without even the implied warranty of
765+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
766+# GNU General Public License for more details.
767+#
768+# You should have received a copy of the GNU General Public License
769+# along with this program. If not, see <http://www.gnu.org/licenses/>.
770+#
771+##############################################################################
772+
773+from osv import fields, osv
774+
775+#class sale_order_line(osv.osv):
776+# _name = 'sale.order.line'
777+# _description = 'Sale Order line'
778+# _inherit = 'sale.order.line'
779+#
780+# def invoice_line_create(self, cr, uid, ids, context={}):
781+# line_ids = super('sale_order_line',self).invoice_line_create(cr, uid, ids, context)
782+# invoice_line_obj = self.pool.get('account.invoice.line')
783+# for line in invoice_line_obj.browse(cr, uid, line_ids):
784+# if line.product_id:
785+# a = line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id
786+# if not a:
787+# a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id
788+# if a:
789+# a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
790+# invoice_line_obj.write(cr, uid, line.id, {'account_id':a})
791+#
792+#sale_order_line()
793+
794+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
795
796=== added file 'account_anglo_saxon/stock.py'
797--- account_anglo_saxon/stock.py 1970-01-01 00:00:00 +0000
798+++ account_anglo_saxon/stock.py 2011-07-07 11:22:45 +0000
799@@ -0,0 +1,64 @@
800+# -*- encoding: utf-8 -*-
801+##############################################################################
802+#
803+# OpenERP, Open Source Management Solution
804+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
805+# $Id$
806+#
807+# This program is free software: you can redistribute it and/or modify
808+# it under the terms of the GNU General Public License as published by
809+# the Free Software Foundation, either version 3 of the License, or
810+# (at your option) any later version.
811+#
812+# This program is distributed in the hope that it will be useful,
813+# but WITHOUT ANY WARRANTY; without even the implied warranty of
814+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
815+# GNU General Public License for more details.
816+#
817+# You should have received a copy of the GNU General Public License
818+# along with this program. If not, see <http://www.gnu.org/licenses/>.
819+#
820+##############################################################################
821+
822+from osv import fields,osv
823+
824+#----------------------------------------------------------
825+# Stock Picking
826+#----------------------------------------------------------
827+class stock_picking(osv.osv):
828+ _inherit = "stock.picking"
829+ _description = "Packing List"
830+
831+ def action_invoice_create(self, cr, uid, ids, journal_id=False,
832+ group=False, type='out_invoice', context=None):
833+ '''Return ids of created invoices for the pickings'''
834+ res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context)
835+ if type == 'in_refund':
836+ for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
837+ for ol in inv.invoice_line:
838+ if ol.product_id:
839+ oa = ol.product_id.product_tmpl_id.property_stock_account_output and ol.product_id.product_tmpl_id.property_stock_account_output.id
840+ if not oa:
841+ oa = ol.product_id.categ_id.property_stock_account_output_categ and ol.product_id.categ_id.property_stock_account_output_categ.id
842+ if oa:
843+ fpos = ol.invoice_id.fiscal_position or False
844+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
845+ self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
846+
847+ elif type == 'in_invoice':
848+ for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
849+ for ol in inv.invoice_line:
850+ if ol.product_id:
851+ oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id
852+ if not oa:
853+ oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id
854+ if oa:
855+ fpos = ol.invoice_id.fiscal_position or False
856+ a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
857+ self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
858+ return res
859+
860+stock_picking()
861+
862+
863+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
864
865=== added directory 'account_asset'
866=== added file 'account_asset/__terp__.py.OTHER'
867--- account_asset/__terp__.py.OTHER 1970-01-01 00:00:00 +0000
868+++ account_asset/__terp__.py.OTHER 2011-07-07 11:22:45 +0000
869@@ -0,0 +1,173 @@
870+# -*- encoding: utf-8 -*-
871+##############################################################################
872+#
873+# OpenERP, Open Source Management Solution
874+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
875+# $Id$
876+#
877+# This program is free software: you can redistribute it and/or modify
878+# it under the terms of the GNU General Public License as published by
879+# the Free Software Foundation, either version 3 of the License, or
880+# (at your option) any later version.
881+#
882+# This program is distributed in the hope that it will be useful,
883+# but WITHOUT ANY WARRANTY; without even the implied warranty of
884+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
885+# GNU General Public License for more details.
886+#
887+# You should have received a copy of the GNU General Public License
888+# along with this program. If not, see <http://www.gnu.org/licenses/>.
889+#
890+##############################################################################
891+{
892+ "name" : "Asset management",
893+ "version" : "1.1",
894+ "depends" : ["account"],
895+ "author" : "Tiny, Grzegorz Grzelak (Cirrus.pl)",
896+ "description": """Financial and accounting asset management.
897+ Allows to define
898+ * Assets.
899+ * Asset usage period and method.
900+ * Asset category.
901+ * Asset method types
902+ * Default accounts for methods and categories
903+ * Depreciation methods:
904+ - Straight-Line
905+ - Declining-Balance
906+ - Sum of Year Digits
907+ - Units of Production - this method can be used for individual depreciation schedule.
908+ - Progressive
909+ * Method Parameters:
910+ - Starting interval (period)
911+ - Number of depreciation intervals
912+ - Number of intervals per year
913+ - Progressive factor for Declining-Balance method
914+ - Salvage Value
915+ - Life Quantity for Unit of Production method
916+ * Functionality:
917+ - Defining the asset in invoice when purchasing
918+ - Adjusting the asset value in purchasing Refund
919+ - Periodical entering of units of production
920+ - Periodical asset calculation
921+ - Sales invoice stops the depreciation and make final postings
922+ * Wizards:
923+ - Initial Values for continuing depreciation from previous system
924+ - Revaluation
925+ - Abandonment
926+ - Method parameters changing
927+ - Suppressing and Resuming depreciation
928+ - Localisation changing
929+
930+This module is based on original Tiny module account_asset version 1.0 of the same name "Financial and accounting asset management".
931+
932+Purpose of the module is to aid fixed assets management and integrate this management into the accounting system.
933+
934+Terms used in the module:
935+- Asset - product or set of products which are used internally in company for longer time and must be taken into asset registry.
936+- Asset Category - Term for grouping assets into hierarchical structure.
937+- Asset Method - Calculation rules of depreciation. Asset can have few methods. For each asset element or for each kind of depreciation (cost and tax).
938+- Method Type - Used for differentiation of method types and for default settings.
939+- Method Defaults - Settings assigned to method types (and categories) simplifying creation of asset settings.
940+
941+Usage of the module:
942+====================
943+Introduction settings:
944+1. Creating Asset categories (optional)
945+2. Creating Method Types (optional)
946+3. Setting Method Defaults (optional)
947+
948+Usual activities:
949+4. Creating Asset
950+5. Purchasing Asset
951+6. Calculating Asset depreciation
952+
953+Rare activities:
954+7. Acquiring asset
955+8. Sale of asset
956+9. Revaluation of asset
957+10. Asset abandonment
958+11. Suppressing and resuming the depreciation
959+12. Changing a localisation
960+
961+============================
962+1. Create Asset categories in menu "Financial Management - Configuration - Assets - Asset Categories". Categories can be hierarchical. Read farther how hierarchy works for Method Defaults and for Periodical Calculation. You can review hierarchy of categories in menu "Financial Management - Configuration - Assets - Category Structure"
963+
964+2. Create Method types in menu "Financial Management - Configuration - Assets - Asset Method Types". You should create method type for every kind of depreciation. Fe. you use fast depreciation for computer equipment and slow depreciation for buildings. You can also create different types for cost depreciation and for tax depreciation (if you use tax depreciation).
965+
966+3. Create Method Defaults in menu "Financial Management - Configuration - Assets - Asset Method Defaults". You can create default settings for method type only or for pairs of method type and asset category. It is suggested to accounting manager to design asset categories hierarchy and assign defaults to categories and method types before system start. If it will be well designed accountants will have simplified and more error-proof job later on. All accounts, calculation methods and other parameters will be entered automatically during asset creation. Note that as Categories are hierarchical the defaults will work also hierarchical for all children categories. It means that if there is no defaults line for certain pair of Method Type and Category system look for pairs of Method Type and parent Category. It looks for such pair till root of Category.
967+
968+4. Create asset in menu "Financial Management - Configuration - Assets - Assets" or in "Financial Management - Assets - Assets". In Asset form you should enter the name of asset, asset code (abbreviation or numerical symbol which can be set in Sequence settings). Then you select Asset category. It is optional step but it would be used to enter method defaults.
969+
970+Then you go to methods creation. Asset can have many methods. They can be used when asset is a set of several elements. Fe. Computer set consisting PC, screen and printer. When they have the same depreciation rule they can be in one method (invoice lines assigned to the same method). If they have different depreciation rules they have to be in different methods.
971+
972+As a first step in creation of method select Method Type. After Method Type selection many fields can be filled automatically. First system creates the method Name from Method Type Code, Asset name and Asset Code. It would simplify Method selection in invoice line. Then system fills other fields according to method type defaults. There are accounts, calculation methods and other values. You can change Method name and other default settings before asset saving but when you select Method type again (even to the same type) these fields will be reverted back to defaults.
973+
974+5. As buying is the most common way to possess the asset you usually have to assign the created asset method to supplier invoice line. So when you create the draft supplier invoice you have to open the invoice line and select the created asset method. Notice that after method selection the invoice line account would be changed to Asset Account which was set in Asset method. Then when you create the invoice the asset state changes to Normal, Asset method state changes to Open and method is ready for depreciation.
975+
976+When asset purchase is subject of refund and asset should change the value according to that you should assign Refund line to asset method as you did during Purchasing. Method value will be reflected to the refund value.
977+
978+When an asset should consist few elements and these elements will be depreciated the same way (with the same rules) you can assignt few invoice lines to the same method. (From the same invoice or another). But if elements depreciation rules differs you should create separate methods for these elements.
979+
980+6. To make asset calculation choose "Financial Management - Periodical Processing - Assets Calculation - Compute Assets". You have to select period of calculation and date of postings. Selected period is also used as posting period so Date must be in Period. Then you can select Asset Category and Method Type which you would like to compute. Remember that Categories are hierarchical and work for all children.
981+
982+7. When you possesed the asset different way than purchasing (by own production or investment) or you wish to continue depreciation started in other system you can use wizard Initial Values. If you continue depreciation you can enter:
983+ a. Base Value as starting Total.
984+ b. Expense Value as depreciation already made.
985+ c. Intervals Before as number of intervals already calculated.
986+You can also Enter Base Value only as Residual left from previous depreciation (don't enter Expense Value and Intervals Before in such case).
987+
988+You can use this wizard also to make starting account move if asset was produced by you or is a result of investment recorded previously in other accounts.
989+
990+Remember that Wizards allows you to make note about previous depreciation in history entry. You can use Notes field for that.
991+
992+8. When asset is to be sold you can assign appropriate method to the Customer invoice line. System will make needed postings and stop the asset method.
993+
994+9. If you wish to revalue the method you can use Revalue Method button. Select parameters for postings and for asset history.
995+
996+10. If you wish to abandon the asset you can use Abandon Method button. Parameters in wizard are described in labels.
997+
998+11. You can wish suppress or resume the depreciation. You can use Suppress and Resume buttons for that. If method has state "Suppressed" it is not calculated.
999+
1000+12. Some local rules require to trace the asset localisation. You can use for that the button "Change Localisation" on asset tab "Other Information". This wizard will change localisation text and make proper entry in asset history.
1001+
1002+Remarks:
1003+- All wizard actions are traced in Asset history. You can use Asset history as Asset registry.
1004+- Period in Method is used as indication of starting interval. If you have monthly periods, Intervals per Year is 4 (quarterly) and you set period July or August the calculation will start on September anyway. Depreciation is calculated always in last period of interval. If you set Intervals per Year to 1 (yearly depreciation) system calculates asset in 4th quarter or in December. In last case it calculates depreciation for whole year. If you wish to calculate different interval in first December than in following Decembers you can try to change method parameters using Change Parameters wizard at appropriate moment.
1005+- If you make mistake in depreciations or in wizard actions you can delete created accounting moves usual way in Financial menu. They are in draft state after creation so they can be deleted. You can recreate depreciation moves in Compute Asset wizard. Deleting the moves created by wizards doesn't delete asset history entries.
1006+- You can also manually create account moves for special postings not covered by this module functionality. In such case you have to assign move lines to asset method. You can use this possibility to add tax depreciation:
1007+ a. Create special method type for tax.
1008+ b. Create tax method for asset.
1009+ c. Create manually initial account move.
1010+ d. Create account move lines with proper accounts for assets.
1011+ e. Assign account move lines to asset method.
1012+ f. Use periodical depreciation computing as usual.
1013+ You can try to use Initial Values wizard instead of points c, d, e.
1014+
1015+- Unit of Production method. If you are not satisfied with any calculation method functionality or you wish to have individual depreciation schedule for method you can adopt Unit of Production calculation method for that:
1016+ a. Select Units of Production as Computation Method
1017+ b. Enter 100 in Life Quantity in method.
1018+ c. On Usage tab use Create Usage Line wizard to create usage entries for the method.
1019+ d. Enter percentage values as usage entries.
1020+Usage values can be entered in method tab Usage or in menu "Financial Management - Periodical Processing - Assets Calculation - Method Usage". Second method is recommended for use before every period computation.
1021+ """,
1022+ "website" : "http://www.openerp.com",
1023+ "category" : "Generic Modules/Accounting",
1024+ "init_xml" : [
1025+ ],
1026+ "demo_xml" : [
1027+ ],
1028+ "update_xml" : [
1029+ "security/ir.model.access.csv",
1030+ "account_asset_wizard.xml",
1031+ "account_asset_view.xml",
1032+ "account_asset_invoice_view.xml"
1033+ ],
1034+# "translations" : {
1035+# "fr": "i18n/french_fr.csv"
1036+# },
1037+ "active": False,
1038+ "installable": True,
1039+
1040+}
1041+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1042+
1043
1044=== added file 'account_asset/account_asset.py.OTHER'
1045--- account_asset/account_asset.py.OTHER 1970-01-01 00:00:00 +0000
1046+++ account_asset/account_asset.py.OTHER 2011-07-07 11:22:45 +0000
1047@@ -0,0 +1,803 @@
1048+# -*- encoding: utf-8 -*-
1049+##############################################################################
1050+#
1051+# OpenERP, Open Source Management Solution
1052+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
1053+# $Id$
1054+#
1055+# This program is free software: you can redistribute it and/or modify
1056+# it under the terms of the GNU General Public License as published by
1057+# the Free Software Foundation, either version 3 of the License, or
1058+# (at your option) any later version.
1059+#
1060+# This program is distributed in the hope that it will be useful,
1061+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1062+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1063+# GNU General Public License for more details.
1064+#
1065+# You should have received a copy of the GNU General Public License
1066+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1067+#
1068+##############################################################################
1069+
1070+from osv import osv, fields
1071+import time
1072+import math
1073+import mx.DateTime
1074+from tools.translate import _
1075+from tools import config
1076+#from mx.DateTime import RelativeDateTime, now, DateTime, localtime
1077+
1078+class account_asset_category(osv.osv):
1079+ _name = 'account.asset.category'
1080+ _description = 'Asset category'
1081+ _columns = {
1082+ 'code': fields.char('Asset Category Code', size=16, required=True, select=1),
1083+ 'name': fields.char('Asset Category', size=64, required=True, select=1),
1084+ 'note': fields.text('Note'),
1085+ 'parent_id': fields.many2one('account.asset.category', 'Parent Category'),
1086+ 'child_ids': fields.one2many('account.asset.category', 'parent_id', 'Children Categories'),
1087+
1088+ }
1089+
1090+ def _check_recursion(self, cr, uid, ids):
1091+ level = 100
1092+ while len(ids):
1093+ cr.execute('select distinct parent_id from account_asset_category where id in ('+','.join(map(str,ids))+')')
1094+ ids = filter(None, map(lambda x:x[0], cr.fetchall()))
1095+ if not level:
1096+ return False
1097+ level -= 1
1098+ return True
1099+
1100+ _constraints = [
1101+ (_check_recursion, _('Error ! You can not create recursive categories.'), ['parent_id'])
1102+ ]
1103+account_asset_category()
1104+
1105+class account_asset_asset(osv.osv):
1106+ _name = 'account.asset.asset'
1107+ _description = 'Asset'
1108+
1109+ def _amount_all(self, cr, uid, ids, name, args, context=None):
1110+ res = {}
1111+ for asset in self.browse(cr,uid,ids, context=context):
1112+ res[asset.id] = {
1113+ 'amount_total': 0.0,
1114+ 'amount_residual': 0.0,
1115+ }
1116+ for method in asset.method_ids:
1117+ res[asset.id]['amount_total'] += method.value_total
1118+ res[asset.id]['amount_residual'] += method.value_residual
1119+ return res
1120+
1121+
1122+ def _get_method(self, cr, uid, ids, context=None):
1123+ result = {}
1124+ for method in self.pool.get('account.asset.method').browse(cr, uid, ids, context=context):
1125+ result[method.asset_id.id] = True
1126+ return result.keys()
1127+
1128+ def _get_move_line(self, cr, uid, ids, context=None):
1129+ result = {}
1130+ for mline in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
1131+ if mline.asset_method_id:
1132+ result[mline.asset_method_id.asset_id.id] = True
1133+ return result.keys()
1134+
1135+ def clear(self, cr, uid, ids, context={}):
1136+ for asset in self.browse(cr, uid, ids, context):
1137+ ok = True
1138+ for met in asset.method_ids:
1139+ if met.state=='draft':
1140+ self.pool.get('account.asset.method').unlink(cr, uid, [met.id], context)
1141+ elif met.state != 'close':
1142+ ok = False
1143+ if ok:
1144+ self.write(cr, uid, [asset.id], {'state':'close'}, context)
1145+ else:
1146+ raise osv.except_osv(_('Warning !'), _('This wizard works only when asset have just Draft and Closed methods !'))
1147+
1148+ return True
1149+
1150+ _columns = {
1151+ 'name': fields.char('Asset', size=64, required=True, select=1),
1152+ 'code': fields.char('Asset Code', size=16, select=1, required=True, readonly=True, states={'draft':[('readonly',False)]}),
1153+ 'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
1154+ store={
1155+ 'account.asset.asset': (lambda self, cr, uid, ids, c={}: ids, ['method_ids'], 20),
1156+ 'account.asset.method': (_get_method, ['value_total','value_residual','entry_ids','state'], 20),
1157+ 'account.move.line': (_get_move_line, ['debit','credit','account_id','asset_method_id'], 20),
1158+ },
1159+ multi='all'),
1160+ 'amount_residual': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Residual',
1161+ store={
1162+ 'account.asset.asset': (lambda self, cr, uid, ids, c={}: ids, ['method_ids'], 20),
1163+ 'account.asset.method': (_get_method, ['value_total','value_residual','entry_ids','state'], 20),
1164+ 'account.move.line': (_get_move_line, ['debit','credit','account_id','asset_method_id'], 20),
1165+ },
1166+ multi='all'),
1167+
1168+ 'note': fields.text('Note'),
1169+ 'category_id': fields.many2one('account.asset.category', 'Asset Category', change_default=True),
1170+ 'localisation': fields.char('Localisation', size=32, select=2, readonly=True, states={'draft':[('readonly',False)]}, help = "Set this field before asset coonfirming. Later on you will have to use Change Localisation button."),
1171+ 'sequence': fields.integer('Seq.'),
1172+ 'date': fields.date('Date',readonly=True, states={'draft':[('readonly',False)]}, help = "Set this date or leave it empty to allow system set the first purchase date."),
1173+ 'state': fields.selection([('view','View'),('draft','Draft'),('normal','Normal'),('close','Closed')], 'Asset State', required=True, help = "Normal - Asset contains active methods (opened, suppressed or depreciated).\nClosed - Asset doesn't exist. All methods are sold or abandoned."),
1174+ 'active': fields.boolean('Active', select=2),
1175+ 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}, help = "If Date field is empty this field will be filled by first purchase."),
1176+ 'method_ids': fields.one2many('account.asset.method', 'asset_id', 'Asset Method Name', readonly=False, states={'close':[('readonly',True)]}),
1177+ 'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True)
1178+ }
1179+ _defaults = {
1180+ 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
1181+# 'date': lambda obj, cr, uid, context: time.strftime('%Y-%m-%d'),
1182+ 'active': lambda obj, cr, uid, context: True,
1183+ 'state': lambda obj, cr, uid, context: 'draft',
1184+ }
1185+
1186+ def unlink(self, cr, uid, ids, context={}):
1187+ for obj in self.browse(cr, uid, ids, context):
1188+ if obj.state != 'draft':
1189+ raise osv.except_osv(_('Error !'), _('You can dalete assets only in Draft state !'))
1190+ return super(account_asset_asset, self).unlink(cr, uid, ids, context)
1191+
1192+
1193+ def _localisation(self, cr, uid, asset_id, localisation, name, note, context={}):
1194+ asset = self.browse(cr, uid, asset_id, context)
1195+ self.pool.get('account.asset.history').create(cr, uid, {
1196+ 'type': "transfer",
1197+ 'asset_id' : asset_id,
1198+ 'name': name,
1199+# 'asset_total': asset.amount_total,
1200+# 'asset_residual': asset.amount_residual,
1201+ 'note': _("Asset transfered to: ") + str(localisation)+
1202+ "\n" + str(note or ""),
1203+ }, context)
1204+ self.pool.get('account.asset.asset').write(cr, uid, [asset_id], {
1205+ 'localisation': localisation,
1206+ }, context)
1207+ return True
1208+
1209+account_asset_asset()
1210+
1211+class account_asset_method_type(osv.osv):
1212+ _name = 'account.asset.method.type'
1213+ _description = 'Asset Method Type'
1214+ _columns = {
1215+ 'code': fields.char('Asset Method Type Code', size=16, required=True, select=1),
1216+ 'name': fields.char('Asset Method Type Name', size=64, required=True, select=1),
1217+ 'note': fields.text('Note'),
1218+ }
1219+account_asset_method_type()
1220+
1221+class account_asset_method_defaults(osv.osv):
1222+ _name = 'account.asset.method.defaults'
1223+ _description = 'Asset Method Delfaults'
1224+ _columns = {
1225+ 'asset_category': fields.many2one('account.asset.category', 'Asset Category', help = "Select the asset category for this set of defaults. If no selection defined defaults will concern to all methods of selected type."),
1226+ 'method_type': fields.many2one('account.asset.method.type', 'Method Type', required = True, help ="Select method type for this set of defaults.", ondelete = "cascade"),
1227+ 'account_asset_id': fields.many2one('account.account', 'Asset Account', help = "Select account used for cost basis of asset. It will be applied into invoice line when you select this asset in invoice line."),
1228+ 'account_expense_id': fields.many2one('account.account', 'Depr. Expense Account', help = "Select account used for depreciation expense (write-off). If you use direct method of depreciation this account should be the same as Asset Account."),
1229+ 'account_actif_id': fields.many2one('account.account', 'Depreciation Account', help = "Select account used for depreciation amount."),
1230+ 'account_residual_id': fields.many2one('account.account', 'Sale Residual Account', help = "Select account used for sale residual."),
1231+ 'account_impairment_id': fields.many2one('account.account', 'Impairment Account', help = "Select account used for impairment amount. Used in revaluation."),
1232+ 'account_abandon_id': fields.many2one('account.account', 'Abandonment Account', help = "Select account used for abandonment loss amount."),
1233+ 'journal_id': fields.many2one('account.journal', 'Journal', ),
1234+ 'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
1235+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
1236+ 'method': fields.selection([('linear','Straight-Line'), ('decbalance','Declining-Balance'), ('syd', 'Sum of Years Digits'), ('uop','Units of Production'), ('progressive','Progressive')], 'Computation Method', ),
1237+ 'method_progress_factor': fields.float('Progressive factor', help = "Specify the factor of progression in depreciation. It is used in Declining-Balance method. When linear depreciation is 20% per year, and you want apply Double-Declining Balance you should choose Declining-Balance method and enter 0,40 (40%) as Progressive factor."),
1238+# 'method_time': fields.selection([('interval','Interval'),('endofyear','End of Year')], 'Time Method'),
1239+ 'method_delay': fields.integer('Number of Intervals'),
1240+ 'method_period': fields.integer('Intervals per Year'),
1241+
1242+ }
1243+
1244+ _defaults = {
1245+ 'method': lambda obj, cr, uid, context: 'linear',
1246+# 'method_time': lambda obj, cr, uid, context: 'interval',
1247+ 'method_progress_factor': lambda obj, cr, uid, context: 0.3,
1248+ 'method_delay': lambda obj, cr, uid, context: 5,
1249+ 'method_period': lambda obj, cr, uid, context: 1,
1250+ }
1251+
1252+account_asset_method_defaults()
1253+
1254+
1255+class account_asset_method(osv.osv): # Asset method = Asset Method
1256+ def _amount_total(self, cr, uid, ids, name, args, context={}):
1257+ if not ids:
1258+ return {}
1259+# id_set=",".join(map(str,ids))
1260+ res = {}
1261+ for id in ids: #
1262+ res[id] = {}
1263+
1264+ method = self.browse(cr, uid, id, context)
1265+ cr.execute("SELECT SUM(l.debit-l.credit) AS asset_acc_vals \
1266+ FROM account_asset_method p \
1267+ LEFT JOIN account_move_line l \
1268+ ON (p.id=l.asset_method_id) \
1269+ WHERE p.id = %s AND l.account_id = p.account_asset_id" % (id, ))
1270+ asset_acc_val = cr.fetchone()[0] or 0.0
1271+
1272+ if method.account_asset_id.id == method.account_expense_id.id: # Direct method
1273+ if (asset_acc_val == 0.0) and (method.state == 'close'):
1274+ write_off = 0.0
1275+ else:
1276+ cr.execute("SELECT SUM(l.debit) AS writeoff \
1277+ FROM account_asset_method p \
1278+ LEFT JOIN account_move_line l \
1279+ ON (p.id=l.asset_method_id) \
1280+ WHERE p.id = %s AND p.account_actif_id = l.account_id" % (id, ))
1281+ write_off = cr.fetchone()[0] or 0.0
1282+ res[id]['value_total'] = asset_acc_val + write_off
1283+ res[id]['value_residual'] = asset_acc_val
1284+ else: # Indirect method
1285+ cr.execute("SELECT SUM(l.debit-l.credit) AS expense_acc_vals \
1286+ FROM account_asset_method p \
1287+ LEFT JOIN account_move_line l \
1288+ ON (p.id=l.asset_method_id) \
1289+ WHERE p.id = %s AND l.account_id = p.account_expense_id" % (id, ))
1290+
1291+ expense_acc_val = cr.fetchone()[0] or 0.0
1292+ res[id]['value_total'] = asset_acc_val
1293+ res[id]['value_residual'] = asset_acc_val + expense_acc_val
1294+ return res
1295+
1296+ def _finish_depreciation(self, cr, uid, method, context={}):
1297+ if method.state == 'open':
1298+ self.write(cr, uid, [method.id], {
1299+ 'state': 'depreciated'
1300+ })
1301+ method.state='depreciated'
1302+ return True
1303+
1304+ def _close(self, cr, uid, method, context={}):
1305+ if method.state<>'close':
1306+ self.write(cr, uid, [method.id], {
1307+ 'state': 'close'
1308+ })
1309+ method.state='close'
1310+ ok = (method.asset_id.state == 'normal')
1311+ any_open = self.search(cr, uid, [('asset_id','=',method.asset_id.id),('state','<>','close')])
1312+ if ok and not any_open:
1313+ self.pool.get('account.asset.asset').write(cr, uid, [method.asset_id.id], {
1314+ 'state': 'close'
1315+ }, context)
1316+ method.asset_id.state='close'
1317+ return True
1318+
1319+ def _initial(self, cr, uid, method, period_id, date, base, expense, acc_impairment, intervals_before, name, note, context):
1320+ period = self._check_date(cr, uid, period_id, date, context)
1321+ self._post_3lines_move(cr, uid, method=method, period = period, date = date, \
1322+ acc_third_id = acc_impairment, base = base, expense = expense, method_initial = True, context = context)
1323+ self.validate(cr, uid, [method.id], context)
1324+ if not method.asset_id.date:
1325+ self.pool.get('account.asset.asset').write(cr, uid, [method.asset_id.id], {
1326+ 'date': date,
1327+ })
1328+ if intervals_before:
1329+ self.write(cr, uid, [method.id], {'intervals_before': intervals_before}, context)
1330+ self.pool.get('account.asset.history')._history_line(cr, uid, "initial", method, name, \
1331+ base, expense, False, note, context)
1332+ return True
1333+
1334+
1335+ def _reval(self, cr, uid, method, period_id, date, base, expense, acc_impairment, name, note, context={}):
1336+ period = self._check_date(cr, uid, period_id, date, context)
1337+ direct = (method.account_asset_id.id == method.account_expense_id.id)
1338+ expense = not direct and expense or False
1339+ self._post_3lines_move(cr, uid, method = method, period = period, date = date, acc_third_id = acc_impairment, \
1340+ base = base, expense = expense, reval=True, context = context)
1341+ self.pool.get('account.asset.history')._history_line(cr, uid, "reval", method, name, \
1342+ base, expense, False, note, context)
1343+ return True
1344+
1345+ def _abandon(self, cr, uid, methods, period_id, date, acc_abandon, name, note, context={}):
1346+ period = self._check_date(cr, uid, period_id, date, context)
1347+ for method in methods:
1348+ if method.state in ['open','suppressed','depreciated']:
1349+ direct = (method.account_asset_id.id == method.account_expense_id.id)
1350+ base = not direct and -method.value_total or - method.value_residual
1351+ expense = not direct and -(method.value_total - method.value_residual) or False
1352+ if base:
1353+ self._post_3lines_move(cr, uid, method = method, period = period, date = date, acc_third_id = acc_abandon, \
1354+ base = base, expense = expense, context = context)
1355+ self.pool.get('account.asset.history')._history_line(cr, uid, "abandon", method, name,
1356+ base, expense, False, note, context)
1357+ self._close(cr, uid, method, context)
1358+ return True
1359+
1360+ def _modif(self, cr, uid, method, method_delay, method_period, method_progress_factor, method_salvage, life, name, note, context={}):
1361+
1362+ note2 = _("Changing of method parameters to:") + \
1363+ _('\n Number of Intervals: ')+ str(method_delay) + \
1364+ _('\n Intervals per Year: ')+ str(method_period) + \
1365+ _('\n Progressive Factor: ') + str(method_progress_factor) + \
1366+ _('\n Salvage Value: ') + str(method_salvage or 0.0)+ \
1367+ _('\n Life Quantity: ') + str(life or 0.0)+ \
1368+ "\n" + str(note or "")
1369+
1370+ self.pool.get('account.asset.history')._history_line(cr, uid, "change", method, name, 0.0, 0.0, False, note2, context )
1371+ self.write(cr, uid, [method.id], {
1372+ 'method_delay': method_delay,
1373+ 'method_period': method_period,
1374+ 'method_progress_factor': method_progress_factor,
1375+ 'method_salvage': method_salvage,
1376+ 'life': life,
1377+ }, context)
1378+ return True
1379+
1380+
1381+ def _suppress(self, cr, uid, methods, name, note, context={}):
1382+ for method in methods:
1383+ if method.state == 'open':
1384+ self.pool.get('account.asset.history')._history_line(cr, uid, "suppression", method, name, 0.0, 0.0, False, note, context )
1385+ self.write(cr, uid, [method.id], {
1386+ 'state': 'suppressed'
1387+ })
1388+ method.state='suppressed'
1389+ return True
1390+
1391+ def _resume(self, cr, uid, methods, name, note, context={}):
1392+ for method in methods:
1393+ if method.state == 'suppressed':
1394+ self.pool.get('account.asset.history')._history_line(cr, uid, "resuming", method, name, 0.0, 0.0, False, note, context )
1395+ self.write(cr, uid, [method.id], {
1396+ 'state': 'open'
1397+ })
1398+ method.state='open'
1399+ return True
1400+
1401+
1402+ def _get_next_period(self, cr, uid, context={}):
1403+ period_obj = self.pool.get('account.period')
1404+ periods = period_obj.find(cr, uid, time.strftime('%Y-%m-%d'), context)
1405+ if periods:
1406+ cp = period_obj.browse(cr, uid, periods[0], context)
1407+ return period_obj.next(cr, uid, cp, 1, context)
1408+ else:
1409+ return False
1410+
1411+ def _get_line(self, cr, uid, ids, context=None):
1412+ result = {}
1413+ for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
1414+ if line.asset_method_id:
1415+ result[line.asset_method_id.id] = True
1416+ return result.keys()
1417+
1418+
1419+ _name = 'account.asset.method'
1420+ _description = 'Asset method'
1421+ _columns = {
1422+ 'name': fields.char('Method name', size=64, select=1, required=True, readonly=True, states={'draft':[('readonly',False)]}),
1423+ 'method_type': fields.many2one('account.asset.method.type', 'Method Type', required=True, readonly=True, states={'draft':[('readonly',False)]}),
1424+ 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True, ondelete='cascade'),
1425+ 'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = "Select account used for cost basis of asset. It will be applied into invoice line when you select this asset in invoice line."),
1426+ 'account_expense_id': fields.many2one('account.account', 'Depr. Expense Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = "Select account used for depreciation expense (write-off). If you use direct method of depreciation this account should be the same as Asset Account."),
1427+ 'account_actif_id': fields.many2one('account.account', 'Depreciation Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = "Select account used for depreciation amounts."),
1428+ 'account_residual_id': fields.many2one('account.account', 'Sale Residual Account', help = "Select account used for residual when asset is sold. You can change the account before sale operation."),
1429+
1430+ 'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
1431+ 'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic Journal', help = "Not implemented yet."),
1432+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', help = "Not implemented yet."),
1433+ 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = "Select period indicating first interval."),
1434+ 'method': fields.selection([('linear','Straight-Line'), ('decbalance','Declining-Balance'), ('syd', 'Sum of Years Digits'), ('uop','Units of Production'), ('progressive','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
1435+ 'method_progress_factor': fields.float('Progressive Factor', readonly=True, states={'draft':[('readonly',False)]}, help = "Specify the factor of progression in depreciation. Used in Declining-Balance and Progressive method only. When linear depreciation is 20% per year, and you want apply Double-Declining Balance you should choose Declining-Balance method and enter 0,40 (40%) as Progressive factor."),
1436+# TODO You can implement depreciation calculation from fixed date.
1437+# 'method_time': fields.selection([('interval','Interval'),('date','Start Date')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
1438+# 'date_start' : fields.date('Start Date',readonly=True, states={'draft':[('readonly',False)]}, help = "Date of depreciation calculation start."),
1439+ 'method_delay': fields.integer('Number of Intervals', readonly=True, states={'draft':[('readonly',False)]}, help = "How many intervals this asset is to be calculated in its life. If asset was calculated in other system before specify Intervals Before too."),
1440+ 'intervals_before' : fields.integer('Intervals Before', readonly=True, states={'draft':[('readonly',False)]}, help = "Number of intervals calculated before asset is managed in this system. Used with Initial Values wizard. If you start asset in this system keep zero."),
1441+ 'method_period': fields.integer('Intervals per Year', readonly=True, states={'draft':[('readonly',False)]}, help = "Specify the number of depreciations to be made in year. This number cannot be less then number of periods in year."),
1442+ 'method_salvage': fields.float('Salvage Value', readonly=True, states={'draft':[('readonly',False)]}, help = "Value planned to be residual after full depreciation process"),
1443+ 'method_end': fields.date('Ending Date'),
1444+ 'date': fields.date('Date Created'),
1445+ 'entry_ids': fields.one2many('account.move.line', 'asset_method_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
1446+ 'life': fields.float('Life Quantity', readonly=True, states={'draft':[('readonly',False)]}, help = "Quantity of production which make the asset method used up. Used only in Units of Production computation method and cannot be zero in this case."),
1447+ 'usage_ids': fields.one2many('account.asset.method.usage', 'asset_method_id', 'Usage'),
1448+ 'value_total': fields.function(_amount_total, method=True, digits=(16, int(config['price_accuracy'])), string='Gross Value',
1449+ store={
1450+ 'account.asset.method': (lambda self, cr, uid, ids, c={}: ids, ['entry_ids','state'], 10),
1451+ 'account.move.line': (_get_line, ['debit','credit','account_id','asset_method_id'], 10),
1452+ },
1453+ multi='all'),
1454+ 'value_residual': fields.function(_amount_total, method=True, digits=(16, int(config['price_accuracy'])), string='Residual Value',
1455+ store={
1456+ 'account.asset.method': (lambda self, cr, uid, ids, c={}: ids, ['entry_ids','state'], 10),
1457+ 'account.move.line': (_get_line, ['debit','credit','account_id','asset_method_id'], 10),
1458+ },
1459+ multi='all'),
1460+ 'state': fields.selection([('draft','Draft'), ('open','Open'), ('suppressed','Suppressed'),('depreciated','Depreciated'), ('close','Closed')], 'Method State', required=True, help = "Open - Ready for calculation.\nSuppressed - Not calculated.\nDepreciated - Depreciation finished but method exists (can be sold or abandoned).\nClosed - Asset method doesn't exist (sold or abandoned)."),
1461+
1462+ }
1463+
1464+ _defaults = {
1465+# 'type': lambda obj, cr, uid, context: 'direct',
1466+ 'state': lambda obj, cr, uid, context: 'draft',
1467+ 'method': lambda obj, cr, uid, context: 'linear',
1468+# 'method_time': lambda obj, cr, uid, context: 'interval',
1469+ 'method_progress_factor': lambda obj, cr, uid, context: 0.3,
1470+ 'method_delay': lambda obj, cr, uid, context: 5,
1471+ 'method_period': lambda obj, cr, uid, context: 12,
1472+ 'date': lambda obj, cr, uid, context: time.strftime('%Y-%m-%d'),
1473+ 'period_id': _get_next_period,
1474+ }
1475+
1476+ def unlink(self, cr, uid, ids, context={}):
1477+ for obj in self.browse(cr, uid, ids, context):
1478+ if obj.state != 'draft':
1479+ raise osv.except_osv(_('Error !'), _('You can dalete method only in Draft state !'))
1480+ return super(account_asset_method, self).unlink(cr, uid, ids, context)
1481+
1482+ def _check_method(self, cr, uid, ids):
1483+ obj_self = self.browse(cr, uid, ids[0])
1484+ if (12 % obj_self.method_period) == 0:
1485+ return True
1486+ return False
1487+
1488+ _constraints = [
1489+ (_check_method, _('Error ! Number of intervals per year must be 1, 2, 3, 4, 6 or 12.'), ['method_period']),
1490+ ]
1491+
1492+ def validate(self, cr, uid, ids, context={}):
1493+ self.write(cr, uid, ids, {'state':'open'}, context)
1494+ method = self.browse(cr, uid, ids[0], context)
1495+ self.pool.get('account.asset.asset').write(cr, uid, [method.asset_id.id], {'state':'normal'}, context)
1496+ method.asset_id.state = 'normal'
1497+ return True
1498+
1499+ def get_defaults(self, cr, uid, method_type_id, asset_category_id, context={}):
1500+ default_obj = self.pool.get('account.asset.method.defaults')
1501+ if not asset_category_id:
1502+ defaults_id = default_obj.search(cr,uid,[('method_type','=',method_type_id),('asset_category','=',False)])
1503+ else:
1504+ defaults_id = default_obj.search(cr,uid,[('method_type','=',method_type_id),('asset_category','=',asset_category_id)])
1505+ if not defaults_id:
1506+ asset_cat_obj = self.pool.get('account.asset.category')
1507+ parent_cat_id = asset_category_id
1508+ n = 100
1509+ while asset_cat_obj.browse(cr, uid, parent_cat_id,{}).parent_id and not defaults_id and n != 0:
1510+ parent_cat_id = asset_cat_obj.browse(cr, uid, parent_cat_id,{}).parent_id.id
1511+ defaults_id = default_obj.search(cr,uid,[('method_type','=',method_type_id),('asset_category','=',parent_cat_id)])
1512+ n = n - 1
1513+ return defaults_id and default_obj.browse(cr, uid, defaults_id[0],{}) or False
1514+
1515+ def onchange_take_defaults(self, cr, uid, ids, method_type_id, name, asset_code, asset_name, asset_category_id, context={}):
1516+ result = {}
1517+ if method_type_id:
1518+ defaults = self.get_defaults(cr, uid, method_type_id, asset_category_id, context)
1519+ if defaults:
1520+ result['account_expense_id'] = defaults.account_expense_id.id
1521+ result['account_actif_id'] = defaults.account_actif_id.id
1522+ result['account_asset_id'] = defaults.account_asset_id.id
1523+ result['account_residual_id'] = defaults.account_residual_id.id
1524+ result['journal_id'] = defaults.journal_id.id
1525+ result['journal_analytic_id'] = defaults.journal_analytic_id.id
1526+ result['account_analytic_id'] = defaults.account_analytic_id.id
1527+ result['method'] = defaults.method
1528+ result['method_progress_factor'] = defaults.method_progress_factor
1529+ result['method_time'] = defaults.method_time
1530+ result['method_delay'] = defaults.method_delay
1531+ result['method_period'] = defaults.method_period
1532+ as_code = asset_code or ""
1533+ as_name = asset_name or ""
1534+ type_code = self.pool.get('account.asset.method.type').browse(cr, uid, method_type_id,{}).code
1535+ result['name'] = as_name + " (" + as_code + ")" + ' - ' + type_code
1536+ return {'value': result}
1537+
1538+# Method is used to post Asset sale, revaluation, abandon and initial values (initial can create 4 lines move)
1539+ def _post_3lines_move(self, cr, uid, method, period, date, acc_third_id, base=0.0, expense=0.0, method_initial=False, reval=False, context={}):
1540+ move_id = self.pool.get('account.move').create(cr, uid, {
1541+ 'journal_id': method.journal_id.id,
1542+ 'period_id': period.id,
1543+ 'date': date,
1544+ 'name': '/', # GG fix, was 'name': method.name or method.asset_id.name,
1545+ 'ref': method.name
1546+ })
1547+ result = [move_id]
1548+ entries =[]
1549+ expense = expense and - expense or False
1550+ total = base
1551+ if method_initial:
1552+ residual = - total
1553+ elif reval:
1554+ residual = -(base + (expense or 0.0)) # expense is already negative
1555+ else:
1556+ residual = method.value_residual
1557+ if expense:
1558+ id = self.pool.get('account.move.line').create(cr, uid, {
1559+ 'name': method.name or method.asset_id.name,
1560+ 'move_id': move_id,
1561+ 'account_id': method.account_expense_id.id,
1562+ 'debit': expense > 0 and expense or 0.0,
1563+ 'credit': expense < 0 and -expense or 0.0,
1564+ 'ref': method.asset_id.code,
1565+ 'period_id': period.id,
1566+ 'journal_id': method.journal_id.id,
1567+ # 'partner_id': method.asset_id.partner_id.id,
1568+ 'date': date,
1569+ 'asset_method_id': method.id
1570+ })
1571+ entries.append((4,id,False),)
1572+ if method_initial: # Only for initial values
1573+ id_depr = self.pool.get('account.move.line').create(cr, uid, {
1574+ 'name': method.name or method.asset_id.name,
1575+ 'move_id': move_id,
1576+ 'account_id': method.account_actif_id.id,
1577+ 'debit': expense < 0 and -expense or 0.0,
1578+ 'credit': expense > 0 and expense or 0.0,
1579+ 'ref': method.asset_id.code,
1580+ 'period_id': period.id,
1581+ 'journal_id': method.journal_id.id,
1582+ # 'partner_id': method.asset_id.partner_id.id,
1583+ 'date': date,
1584+ 'asset_method_id': method.id
1585+ })
1586+ entries.append((4,id_depr,False),)
1587+
1588+ id2 = self.pool.get('account.move.line').create(cr, uid, {
1589+ 'name': method.name or method.asset_id.name,
1590+ 'move_id': move_id,
1591+ 'account_id': method.account_asset_id.id,
1592+ 'debit': total > 0 and total or 0.0,
1593+ 'credit': total < 0 and -total or 0.0,
1594+ 'ref': method.asset_id.code,
1595+ 'period_id': period.id,
1596+ 'journal_id': method.journal_id.id,
1597+# 'partner_id': method.asset_id.partner_id.id,
1598+ 'date': date,
1599+ 'asset_method_id': method.id
1600+ })
1601+ id3 = self.pool.get('account.move.line').create(cr, uid, {
1602+ 'name': method.name or method.asset_id.name,
1603+ 'move_id': move_id,
1604+ 'account_id': acc_third_id, #method.account_actif_id.id,
1605+ 'debit': residual > 0 and residual or 0.0,
1606+ 'credit': residual < 0 and -residual or 0.0,
1607+ 'ref': method.asset_id.code,
1608+ 'period_id': period.id,
1609+ 'journal_id': method.journal_id.id,
1610+# 'partner_id': method.asset_id.partner_id.id,
1611+ 'date': date,
1612+ 'asset_method_id': method.id
1613+ })
1614+ entries.append([(4, id2, False),(4, id3, False)])
1615+ self.pool.get('account.asset.method').write(cr, uid, [method.id], {
1616+ 'entry_ids': entries,
1617+ })
1618+# TODO automatic move posting according to journal setting.
1619+ return result
1620+
1621+
1622+ def _post_move(self, cr, uid, method, period, date, amount, context={}):
1623+ move_id = self.pool.get('account.move').create(cr, uid, {
1624+ 'journal_id': method.journal_id.id,
1625+ 'period_id': period.id,
1626+ 'date': date,
1627+ 'name': '/', # GG fix, was 'name': method.name or method.asset_id.name,
1628+ 'ref': method.name
1629+ })
1630+ result = [move_id]
1631+ id = self.pool.get('account.move.line').create(cr, uid, {
1632+ 'name': method.name or method.asset_id.name,
1633+ 'move_id': move_id,
1634+ 'account_id': method.account_expense_id.id,
1635+ 'credit': amount>0 and amount or 0.0,
1636+ 'debit': amount<0 and -amount or 0.0,
1637+ 'ref': method.asset_id.code,
1638+ 'period_id': period.id,
1639+ 'journal_id': method.journal_id.id,
1640+# 'partner_id': method.asset_id.partner_id.id,
1641+ 'date': date,
1642+ 'asset_method_id': method.id
1643+ })
1644+ id2 = self.pool.get('account.move.line').create(cr, uid, {
1645+ 'name': method.name or method.asset_id.name,
1646+ 'move_id': move_id,
1647+ 'account_id': method.account_actif_id.id,
1648+ 'debit': amount >0 and amount or 0.0,
1649+ 'credit': amount <0 and -amount or 0.0,
1650+ 'ref': method.asset_id.code,
1651+ 'period_id': period.id,
1652+ 'journal_id': method.journal_id.id,
1653+# 'partner_id': method.asset_id.partner_id.id,
1654+ 'date': date,
1655+ 'asset_method_id': method.id
1656+ })
1657+ self.pool.get('account.asset.method').write(cr, uid, [method.id], {
1658+ 'entry_ids': [(4, id2, False),(4,id,False)]
1659+ })
1660+# TODO automatic move posting according to journal setting.
1661+ return result
1662+
1663+ def _compute_move(self, cr, uid, method, period, date, usage, last_move_line, context={}):
1664+ result = []
1665+ gross = method.value_total - method.method_salvage
1666+ to_writeoff = method.value_residual - method.method_salvage
1667+ if usage: # Units of Production method
1668+ amount = gross * usage / method.life
1669+ else:
1670+ depr_entries_made = method.intervals_before
1671+ for line in method.entry_ids:
1672+ if (line.account_id == method.account_actif_id) and (line.period_id.date_start >= method.period_id.date_start):
1673+ depr_entries_made += 1 # count depreciation already made
1674+ intervals = method.method_delay - depr_entries_made
1675+ if intervals == 1:
1676+ amount = to_writeoff
1677+ else:
1678+ if method.method == 'linear':
1679+ amount = to_writeoff / intervals
1680+ elif method.method == 'progressive': # probably obsolete method
1681+ amount = to_writeoff * method.method_progress_factor
1682+ elif method.method == 'decbalance':
1683+ period_end = mx.DateTime.strptime(period.date_stop, '%Y-%m-%d')
1684+ if depr_entries_made == 0: # First year
1685+ amount = to_writeoff * method.method_progress_factor / method.method_period
1686+ elif (12 / period_end.month) == method.method_period: # First interval in calendar year
1687+ amount = to_writeoff * method.method_progress_factor / method.method_period
1688+ if amount < (gross / method.method_delay): # In declining-balance when amount less than amount for linear it switches to linear
1689+ amount = gross / method.method_delay
1690+ else: # In other cases repeat last entry
1691+ amount = last_move_line.debit
1692+ elif method.method == 'syd': # Sum of Year Digits method
1693+ years = method.method_delay / method.method_period
1694+ syd = years * (years + 1) / 2
1695+ year = years - math.floor(depr_entries_made / method.method_period)
1696+ if (depr_entries_made % method.method_period) == 0: # First interval in 12 month cycle
1697+ amount = gross * year / syd / method.method_period
1698+ else: # In other cases repeat last entry
1699+ amount = last_move_line.debit
1700+ if amount > to_writeoff:
1701+ amount = to_writeoff
1702+
1703+ result = self._post_move(cr, uid, method, period, date, amount, context)
1704+
1705+ if (to_writeoff == amount):
1706+ self.pool.get('account.asset.method')._finish_depreciation(cr, uid, method, context)
1707+ return result
1708+
1709+ def _compute_last_calculated(self, cr, uid, method, period, context={}):
1710+ cr.execute("SELECT m.id, m.period_id \
1711+ FROM account_move_line AS m \
1712+ WHERE m.asset_method_id = %s AND m.account_id = %s \
1713+ ORDER BY m.id DESC", (method.id, method.account_actif_id.id,))
1714+ pid = cr.fetchone()
1715+ if pid:
1716+ periods_obj = self.pool.get('account.period')
1717+ last_period = periods_obj.browse(cr, uid, pid[1], context)
1718+ if last_period.date_start < period.date_start:
1719+ ml_obj = self.pool.get('account.move.line')
1720+ last_move_line = ml_obj.browse(cr, uid, pid[0], context)
1721+ return last_move_line, True # last move line exists and do compute
1722+ else:
1723+ return False, False # last move line doesn't exists and don't compute
1724+ return False, True # last move line doesn't exists but do compute
1725+
1726+ def _compute_entries(self, cr, uid, method, period, date, context={}):
1727+ result = []
1728+ if (method.state=='open') and (period.date_start >= method.period_id.date_start):
1729+ usage = False
1730+ period_ok = False
1731+ last_move_line, compute_period = self._compute_last_calculated(cr, uid, method, period, context)
1732+ if compute_period: # it was no calculation for period yet
1733+ if method.method == 'uop':
1734+ usage_obj = self.pool.get('account.asset.method.usage')
1735+ usage_ids = usage_obj.search(cr, uid, [('period_id','=',period.id),('asset_method_id','=',method.id)])
1736+ usage = usage_ids and usage_obj.browse(cr, uid, usage_ids[0], context).usage or False
1737+ else:
1738+ period_ok = ((mx.DateTime.strptime(period.date_stop, '%Y-%m-%d').month % (12 / method.method_period)) == 0)
1739+ if (period_ok or usage):
1740+ result += self._compute_move(cr, uid, method, period, date, usage, last_move_line, context)
1741+ return result
1742+
1743+ def _check_date(self, cr, uid, period_id, date, context={}):
1744+ period_obj = self.pool.get('account.period')
1745+ period = period_obj.browse(cr, uid, period_id, context)
1746+ if (period.date_start > date) or (period.date_stop < date):
1747+ raise osv.except_osv(_('Error !'), _('Date must be in the period !'))
1748+ if period.state == 'done':
1749+ raise osv.except_osv(_('Error !'), _('Cannot post in closed period !'))
1750+ return period
1751+
1752+account_asset_method()
1753+
1754+class account_move_line(osv.osv):
1755+ _inherit = 'account.move.line'
1756+ _columns = {
1757+ 'asset_method_id': fields.many2one('account.asset.method', 'Asset Depr. Method', help = "Assign the asset as depreciation method if move line concerns the asset."),
1758+ }
1759+account_move_line()
1760+
1761+class account_asset_history(osv.osv):
1762+ _name = 'account.asset.history'
1763+ _description = 'Asset history'
1764+
1765+ _columns = {
1766+ 'name': fields.char('History name', size=64, select=1),
1767+ 'type': fields.selection([
1768+ ('change','Settings Change'),
1769+ ('purchase','Purchase'), # Crated after purchase for any method
1770+ ('refund','Purchase Refund'), # Crated after purchase refund for any method
1771+ ('reval', 'Revaluation'), # Crated after purchase for any method
1772+ ('initial', 'Initial Value'),
1773+ ('sale','Sale'),
1774+ ('closing','Closing'), # not used already
1775+ ('abandon','Abandonment'),
1776+ ('suppression','Depr. Suppression'),
1777+ ('resuming','Depr. Resuming'),
1778+ ('summary','Summary'), # Created after Summary on demand. Creates Summary of all methods (not implemented yet)
1779+ ('transfer','Transfer')], # Creted after changing of localisation
1780+ 'Entry Type', required=True, readonly=True),
1781+ 'user_id': fields.many2one('res.users', 'User', required=True),
1782+ 'date': fields.date('Date', required=True),
1783+ 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
1784+ 'asset_method_id': fields.many2one('account.asset.method', 'Method', ),
1785+ 'partner_id': fields.many2one('res.partner', 'Partner'),
1786+ 'invoice_id': fields.many2one('account.invoice', 'Invoice'),
1787+ 'change_total': fields.float('Total Change', digits=(16, int(config['price_accuracy']))),
1788+ 'change_expense': fields.float('Expense Change', digits=(16, int(config['price_accuracy']))),
1789+ 'method_end': fields.date('Ending Date'), # not used
1790+ 'note': fields.text('Note'),
1791+ }
1792+ _defaults = {
1793+ 'date': lambda *args: time.strftime('%Y-%m-%d'),
1794+ 'user_id': lambda self,cr, uid,ctx: uid,
1795+ }
1796+
1797+ def _history_line(self, cr, uid, type, method, name, total, expense, invoice, note, context={} ):
1798+ if type in ["purchase","initial"]:
1799+ note = _("Parameters set to:") + \
1800+ _('\n Number of Intervals: ')+ str(method.method_delay) + \
1801+ _('\n Intervals per Year: ')+ str(method.method_period) + \
1802+ _('\n Progressive Factor: ') + str(method.method_progress_factor) + \
1803+ _('\n Salvage Value: ') + str(method.method_salvage or 0.0)+ \
1804+ _('\n Life Quantity: ') + str(method.life or 0.0)+ \
1805+ _('\n Intervals Before: ') + str(method.intervals_before or 0.0)+ \
1806+ "\n" + str(note or "")
1807+
1808+ self.pool.get('account.asset.history').create(cr, uid, {
1809+ 'type': type,
1810+ 'asset_method_id': method.id,
1811+ 'asset_id' : method.asset_id.id,
1812+ 'name': name,
1813+ 'partner_id': invoice and invoice.partner_id.id,
1814+ 'invoice_id': invoice and invoice.id,
1815+ 'change_total': total,
1816+ 'change_expense': expense,
1817+# 'method_total': method.value_total,
1818+# 'method_residual': method.value_residual,
1819+# 'asset_total': method.asset_id.amount_total,
1820+# 'asset_residual': method.asset_id.amount_residual,
1821+ 'note': str(note or ""),
1822+ })
1823+
1824+
1825+account_asset_history()
1826+
1827+class account_asset_method_usage(osv.osv):
1828+ _name = 'account.asset.method.usage'
1829+ _description = 'Asset Method Usage'
1830+
1831+ def _get_period(self, cr, uid, context={}):
1832+ periods = self.pool.get('account.period').find(cr, uid)
1833+ if periods:
1834+ return periods[0]
1835+ else:
1836+ return False
1837+
1838+ _columns = {
1839+ 'asset_method_id': fields.many2one('account.asset.method', 'Method',required=True,),
1840+ 'period_id': fields.many2one('account.period', 'Period', required=True, help = "Select period which usage concerns."),
1841+ 'usage': fields.float('Usage', help = "Specify usage quantity in selected period."),
1842+ }
1843+
1844+ _defaults = {
1845+ 'period_id': _get_period,
1846+ }
1847+account_asset_method_usage()
1848+
1849+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1850+
1851
1852=== added file 'account_asset/account_asset_invoice.py.OTHER'
1853--- account_asset/account_asset_invoice.py.OTHER 1970-01-01 00:00:00 +0000
1854+++ account_asset/account_asset_invoice.py.OTHER 2011-07-07 11:22:45 +0000
1855@@ -0,0 +1,111 @@
1856+# -*- encoding: utf-8 -*-
1857+##############################################################################
1858+#
1859+# OpenERP, Open Source Management Solution
1860+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
1861+# $Id$
1862+#
1863+# This program is free software: you can redistribute it and/or modify
1864+# it under the terms of the GNU General Public License as published by
1865+# the Free Software Foundation, either version 3 of the License, or
1866+# (at your option) any later version.
1867+#
1868+# This program is distributed in the hope that it will be useful,
1869+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1870+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1871+# GNU General Public License for more details.
1872+#
1873+# You should have received a copy of the GNU General Public License
1874+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1875+#
1876+##############################################################################
1877+
1878+from osv import osv, fields
1879+import time
1880+from tools.translate import _
1881+
1882+class account_invoice(osv.osv):
1883+ _inherit = 'account.invoice'
1884+ def line_get_convert(self, cr, uid, x, part, date, context={}):
1885+ res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context)
1886+ res['asset_method_id'] = x.get('asset_method_id', False)
1887+ return res
1888+
1889+ def _refund_cleanup_lines(self, cr, uid, lines):
1890+ for line in lines:
1891+# raise osv.except_osv('Error !', 'method id %s %s %s %s'%line[0],line[1], line[2], line[5])
1892+ if 'asset_method_id' in line:
1893+# raise osv.except_osv('Error !', 'method id %s'%line[asset_method_id])
1894+ line['asset_method_id'] = line.get('asset_method_id', False) and line['asset_method_id'][0]
1895+ res = super(account_invoice, self)._refund_cleanup_lines(cr, uid, lines)
1896+ return res
1897+
1898+ def action_move_create(self, cr, uid, ids, *args):
1899+ res = super(account_invoice, self).action_move_create(cr, uid, ids, *args)
1900+ for inv in self.browse(cr, uid, ids):
1901+ if inv.type == "out_refund":
1902+ continue
1903+ for line in inv.invoice_line:
1904+ if not line.asset_method_id:
1905+ continue
1906+ if line.invoice_id.type == "in_invoice":
1907+ type = "purchase"
1908+ elif line.invoice_id.type == "in_refund":
1909+ type = "refund"
1910+ elif line.invoice_id.type == "out_invoice":
1911+ type = "sale"
1912+ method = line.asset_method_id
1913+ if type in ["purchase","refund"]:
1914+ if method.state=='draft':
1915+ self.pool.get('account.asset.method').validate(cr, uid, [method.id])
1916+ elif method.state in ["depreciated","closed"]:
1917+ raise osv.except_osv(_('Error !'), _('You cannot assign Product "%s" to Asset Method "%s". This method is already depreciated or is inactive (sold or abandoned).')%(line.product_id.name, method.name,))
1918+ if not line.asset_method_id.asset_id.date:
1919+ self.pool.get('account.asset.asset').write(cr, uid, [method.asset_id.id], {
1920+ 'date': line.invoice_id.date_invoice,
1921+ 'partner_id': line.invoice_id.partner_id.id,
1922+ })
1923+ base = (type == 'purchase') and line.price_subtotal or - line.price_subtotal
1924+ expense = 0.0
1925+ elif type == "sale":
1926+ if not method.account_residual_id:
1927+ raise osv.except_osv(_('Error !'), _('Product "%s" is assigned to Asset Method "%s". But this method has no Sale Residual Account to make asset moves.')%(line.product_id.name, method.name,))
1928+ elif line.asset_method_id.state in ["closed","draft"]:
1929+ raise osv.except_osv(_('Error !'), _('You cannot assign Product "%s" to Asset Method "%s". This method is in Draft state or is inactive (sold or abandoned).')%(line.product_id.name, method.name,))
1930+ direct = (method.account_asset_id.id == method.account_expense_id.id)
1931+ base = direct and - method.value_residual or -method.value_total
1932+ expense = not direct and -(method.value_total - method.value_residual) or False
1933+ method_obj = self.pool.get('account.asset.method')
1934+ method_obj._post_3lines_move(cr, uid, method= method, period=line.invoice_id.period_id, \
1935+ date = line.invoice_id.date_invoice, acc_third_id = method.account_residual_id.id, \
1936+ base = base, expense = expense,)
1937+ method_obj._close(cr, uid, method)
1938+ note = _("Product name: ") + line.product_id.name + ' ['+line.product_id.code+ \
1939+ _("]\nInvoice date: ") + line.invoice_id.date_invoice + \
1940+ _("\nPrice: ") + str(line.price_subtotal)
1941+ self.pool.get('account.asset.history')._history_line(cr, uid, type, method, line.product_id.name, base, expense, \
1942+ line.invoice_id, note, )
1943+ return res
1944+account_invoice()
1945+
1946+class account_invoice_line(osv.osv):
1947+ _inherit = 'account.invoice.line'
1948+ _columns = {
1949+ 'asset_method_id': fields.many2one('account.asset.method', 'Asset Method', help = "Select the asset depreciation method if you wish to assign the purchase invoice line to fixed asset. If method doesn't exists yet you will have to create it and probably the asset itself too. After selecting the asset method the invoice line account should change according to the asset method settings but please check it before creating the invoice."),
1950+ }
1951+
1952+ def move_line_get_item(self, cr, uid, line, context={}):
1953+ res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
1954+ res['asset_method_id'] = line.asset_method_id and line.asset_method_id.id or False
1955+ return res
1956+
1957+ def asset_method_id_change(self, cr, uid, ids, asset_method_id, type, context={}):
1958+ result = {}
1959+ if asset_method_id and type in ["in_invoice","in_refund"]:
1960+ result['account_id'] = self.pool.get('account.asset.method').browse(cr, uid, asset_method_id,{}).account_asset_id.id
1961+ return {'value': result}
1962+
1963+account_invoice_line()
1964+
1965+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1966+
1967
1968=== added file 'account_asset/account_asset_invoice_view.xml.OTHER'
1969--- account_asset/account_asset_invoice_view.xml.OTHER 1970-01-01 00:00:00 +0000
1970+++ account_asset/account_asset_invoice_view.xml.OTHER 2011-07-07 11:22:45 +0000
1971@@ -0,0 +1,43 @@
1972+<?xml version="1.0"?>
1973+<openerp>
1974+<data>
1975+
1976+ <record model="ir.ui.view" id="view_account_invoice_asset_form">
1977+ <field name="name">account.invoice.line.form</field>
1978+ <field name="model">account.invoice.line</field>
1979+ <field name="inherit_id" ref="account.view_invoice_line_form"/>
1980+ <field name="type">form</field>
1981+ <field name="arch" type="xml">
1982+ <field name="price_subtotal" position="after">
1983+ <field name="asset_method_id" context="name=name" domain ="[('state','in', ['draft','open','suppressed','depreciated'])]" on_change="asset_method_id_change(asset_method_id, parent.type)"/>
1984+ </field>
1985+ </field>
1986+ </record>
1987+
1988+ <record model="ir.ui.view" id="view_account_move_line_form">
1989+ <field name="name">account.move.line.form</field>
1990+ <field name="model">account.move.line</field>
1991+ <field name="inherit_id" ref="account.view_move_line_form"/>
1992+ <field name="type">form</field>
1993+ <field name="arch" type="xml">
1994+ <field name="analytic_account_id" position="after">
1995+ <field name="asset_method_id" context="name=name"/>
1996+ </field>
1997+ </field>
1998+ </record>
1999+
2000+ <record model="ir.ui.view" id="view_account_move_form">
2001+ <field name="name">account.move.form</field>
2002+ <field name="model">account.move</field>
2003+ <field name="inherit_id" ref="account.view_move_form"/>
2004+ <field name="type">form</field>
2005+ <field name="arch" type="xml">
2006+ <field name="quantity" position="after">
2007+ <field name="asset_method_id" context="name=name"/>
2008+ </field>
2009+ </field>
2010+ </record>
2011+
2012+
2013+</data>
2014+</openerp>
2015
2016=== added file 'account_asset/account_asset_view.xml.OTHER'
2017--- account_asset/account_asset_view.xml.OTHER 1970-01-01 00:00:00 +0000
2018+++ account_asset/account_asset_view.xml.OTHER 2011-07-07 11:22:45 +0000
2019@@ -0,0 +1,535 @@
2020+<?xml version="1.0"?>
2021+<openerp>
2022+<data>
2023+
2024+ <menuitem id="menu_finance_config_Assets" name="Assets" parent="account.menu_finance_configuration" sequence="30"/>
2025+
2026+
2027+
2028+# Asset Category
2029+
2030+ <record model="ir.ui.view" id="view_account_asset_category_form">
2031+ <field name="name">account.asset.category.form</field>
2032+ <field name="model">account.asset.category</field>
2033+ <field name="type">form</field>
2034+ <field name="arch" type="xml">
2035+ <form string="Asset Category">
2036+ <field name="code" select="1"/>
2037+ <field name="parent_id"/>
2038+ <field name="name" select="1" colspan = "4"/>
2039+ <field name="note" colspan="4"/>
2040+ </form>
2041+ </field>
2042+ </record>
2043+
2044+ <record model="ir.ui.view" id="view_account_asset_category_tree">
2045+ <field name="name">account.asset.category.tree</field>
2046+ <field name="model">account.asset.category</field>
2047+ <field name="type">tree</field>
2048+ <field name="arch" type="xml">
2049+ <tree string="Asset Categories">
2050+ <field name="code"/>
2051+ <field name="name"/>
2052+ </tree>
2053+ </field>
2054+ </record>
2055+ <record model="ir.actions.act_window" id="action_account_asset_category_form">
2056+ <field name="name">Asset Categories</field>
2057+ <field name="res_model">account.asset.category</field>
2058+ <field name="view_type">form</field>
2059+ <field name="view_mode">tree,form</field>
2060+ </record>
2061+
2062+ <menuitem
2063+ parent="menu_finance_config_Assets"
2064+ id="menu_action_account_asset_category_form"
2065+ action="action_account_asset_category_form" sequence="10"/>
2066+
2067+ <record id="asset_category_tree_view" model="ir.ui.view">
2068+ <field name="name">account.asset.category.tree</field>
2069+ <field name="model">account.asset.category</field>
2070+ <field name="type">tree</field>
2071+ <field name="field_parent">child_ids</field>
2072+ <field name="arch" type="xml">
2073+ <tree string="Asset Categories">
2074+ <field name="code"/>
2075+ <field name="name"/>
2076+ </tree>
2077+ </field>
2078+ </record>
2079+ <record id="asset_category_action" model="ir.actions.act_window">
2080+ <field name="name">Assets Category Structure</field>
2081+ <field name="type">ir.actions.act_window</field>
2082+ <field name="res_model">account.asset.category</field>
2083+ <field name="domain">[('parent_id','=',False)]</field>
2084+ <field name="view_type">tree</field>
2085+ <field name="view_id" ref="asset_category_tree_view"/>
2086+ </record>
2087+ <menuitem action="asset_category_action" id="menu_asset_category_action" parent="menu_finance_config_Assets" sequence="20"/>
2088+
2089+
2090+# Method Type
2091+
2092+ <record model="ir.ui.view" id="view_account_asset_method_type_form">
2093+ <field name="name">account.asset.method.type.form</field>
2094+ <field name="model">account.asset.method.type</field>
2095+ <field name="type">form</field>
2096+ <field name="arch" type="xml">
2097+ <form string="Asset Method Type">
2098+ <field name="code" select="1"/>
2099+ <field name="name" select="1"/>
2100+ <field name="note" colspan="4"/>
2101+ </form>
2102+ </field>
2103+ </record>
2104+
2105+ <record model="ir.ui.view" id="view_account_asset_method_type_tree">
2106+ <field name="name">account.asset.method.type.tree</field>
2107+ <field name="model">account.asset.method.type</field>
2108+ <field name="type">tree</field>
2109+ <field name="arch" type="xml">
2110+ <tree string="Asset Method Types">
2111+ <field name="code"/>
2112+ <field name="name"/>
2113+ </tree>
2114+ </field>
2115+ </record>
2116+
2117+ <record model="ir.actions.act_window" id="action_account_asset_method_type_form">
2118+ <field name="name">Asset Method Types</field>
2119+ <field name="res_model">account.asset.method.type</field>
2120+ <field name="view_type">form</field>
2121+ <field name="view_mode">tree,form</field>
2122+ </record>
2123+
2124+ <menuitem
2125+ parent="menu_finance_config_Assets"
2126+ id="menu_action_account_asset_method_type_form"
2127+ action="action_account_asset_method_type_form" sequence="30"/>
2128+
2129+# Method Defaults
2130+
2131+ <record model="ir.ui.view" id="view_account_asset_method_defaults_form">
2132+ <field name="name">account.asset.method.defaults.form</field>
2133+ <field name="model">account.asset.method.defaults</field>
2134+ <field name="type">form</field>
2135+ <field name="arch" type="xml">
2136+ <form string="Asset Method Defaults">
2137+ <field name='method_type' select="1"/>
2138+ <field name='asset_category' select="1"/>
2139+ <group colspan = "2" col = "2" >
2140+ <field name='account_asset_id'/>
2141+ <field name="account_expense_id"/>
2142+ <field name="account_actif_id"/>
2143+ <field name="account_residual_id"/>
2144+ <field name="account_impairment_id"/>
2145+ <field name="account_abandon_id"/>
2146+ <field name="journal_id"/>
2147+ <field name="journal_analytic_id"/>
2148+ <field name="account_analytic_id"/>
2149+ </group>
2150+ <group colspan = "2" col = "2" >
2151+ <field name="method"/>
2152+ <field name="method_progress_factor"/>
2153+<!-- <field name="method_time"/> -->
2154+ <field name="method_delay"/>
2155+ <field name="method_period"/>
2156+ </group>
2157+ </form>
2158+ </field>
2159+ </record>
2160+
2161+ <record model="ir.ui.view" id="view_account_asset_method_defaults_tree">
2162+ <field name="name">account.asset.method.defaults.tree</field>
2163+ <field name="model">account.asset.method.defaults</field>
2164+ <field name="type">tree</field>
2165+ <field name="arch" type="xml">
2166+ <tree string="Asset Method Defaults">
2167+ <field name='method_type' select="1"/>
2168+ <field name='asset_category' select="1"/>
2169+ </tree>
2170+ </field>
2171+ </record>
2172+
2173+ <record model="ir.actions.act_window" id="action_account_asset_method_defaults_form">
2174+ <field name="name">Asset Method Defaults</field>
2175+ <field name="res_model">account.asset.method.defaults</field>
2176+ <field name="view_type">form</field>
2177+ <field name="view_mode">tree,form</field>
2178+ </record>
2179+
2180+ <menuitem
2181+ parent="menu_finance_config_Assets"
2182+ id="menu_action_account_asset_method_defaults_form"
2183+ action="action_account_asset_method_defaults_form" sequence="40"/>
2184+
2185+# Asset History
2186+
2187+ <record model="ir.ui.view" id="view_account_asset_history_form">
2188+ <field name="name">account.asset.history.form</field>
2189+ <field name="model">account.asset.history</field>
2190+ <field name="type">form</field>
2191+ <field name="arch" type="xml">
2192+ <form string="Asset history">
2193+ <field name="date" select="1"/>
2194+ <field name="name" select="1"/>
2195+ <field name="type" select="1"/>
2196+ <field name="asset_method_id" select="1"/>
2197+ <field name="change_total"/>
2198+ <field name="change_expense"/>
2199+<!-- <field name="method_total"/>
2200+ <field name="method_residual"/>
2201+ <field name="asset_total"/>
2202+ <field name="asset_residual"/> -->
2203+ <field name="partner_id"/>
2204+ <field name="invoice_id"/>
2205+ <field name="user_id" select="1"/>
2206+<!-- <field name="method_delay"/>
2207+ <field name="method_period"/> -->
2208+<!-- <field name="method_end"/> -->
2209+ <separator string="Notes" colspan="4"/>
2210+ <field name="note" colspan="4" nolabel="1"/>
2211+ </form>
2212+ </field>
2213+ </record>
2214+
2215+ <record model="ir.ui.view" id="view_account_asset_history_tree">
2216+ <field name="name">account.asset.history.tree</field>
2217+ <field name="model">account.asset.history</field>
2218+ <field name="type">tree</field>
2219+ <field name="arch" type="xml">
2220+ <tree string="Asset History">
2221+ <field name="date" select="1"/>
2222+ <field name="type" select="1"/>
2223+ <field name="name" select="1"/>
2224+ <field name="asset_method_id" select="1"/>
2225+ <field name="change_total"/>
2226+ <field name="change_expense"/>
2227+<!-- <field name="method_total"/>
2228+ <field name="method_residual"/>
2229+ <field name="asset_total"/>
2230+ <field name="asset_residual"/> -->
2231+ <field name="invoice_id"/>
2232+ <field name="partner_id" select="1"/>
2233+ <field name="user_id" select="1"/>
2234+<!-- <field name="method_delay"/>
2235+ <field name="method_period"/>
2236+ <field name="method_end"/> -->
2237+ </tree>
2238+ </field>
2239+ </record>
2240+
2241+# Method Usage
2242+
2243+ <record model="ir.ui.view" id="view_account_asset_method_usage_form">
2244+ <field name="name">account.asset.method.usage.form</field>
2245+ <field name="model">account.asset.method.usage</field>
2246+ <field name="type">form</field>
2247+ <field name="arch" type="xml">
2248+ <form string="Method Usage">
2249+ <field name="period_id" select="1"/>
2250+ <field name="usage"/>
2251+ </form>
2252+ </field>
2253+ </record>
2254+
2255+ <record model="ir.ui.view" id="view_account_asset_method_usage_tree">
2256+ <field name="name">account.asset.method.usage.tree</field>
2257+ <field name="model">account.asset.method.usage</field>
2258+ <field name="type">tree</field>
2259+ <field name="arch" type="xml">
2260+ <tree string="Method Usage">
2261+ <field name="period_id" select="1"/>
2262+ <field name="usage"/>
2263+ </tree>
2264+ </field>
2265+ </record>
2266+
2267+ <record model="ir.ui.view" id="view_account_asset_method_usage_entryform">
2268+ <field name="name">account.asset.method.usage.entryform</field>
2269+ <field name="model">account.asset.method.usage</field>
2270+ <field name="type">form</field>
2271+ <field name="arch" type="xml">
2272+ <tree string="Method Usage">
2273+ <field name="period_id" select="1" readonly="1"/>
2274+ <field name="asset_method_id" readonly="1"/>
2275+ <field name="usage"/>
2276+ </tree>
2277+ </field>
2278+ </record>
2279+
2280+ <record model="ir.ui.view" id="view_account_asset_method_usage_entrytree">
2281+ <field name="name">account.asset.method.usage.entrytree</field>
2282+ <field name="model">account.asset.method.usage</field>
2283+ <field name="type">tree</field>
2284+ <field name="arch" type="xml">
2285+ <tree string="Method usage" editable = "top">
2286+ <field name="period_id" select="1" readonly="1"/>
2287+ <field name="asset_method_id" readonly="1"/>
2288+ <field name="usage" />
2289+ </tree>
2290+ </field>
2291+ </record>
2292+
2293+
2294+ <record model="ir.actions.act_window" id="action_account_asset_method_usage_periodical_entry">
2295+ <field name="name">Method Usage</field>
2296+ <field name="res_model">account.asset.method.usage</field>
2297+ <field name="view_type">form</field>
2298+ <field name="view_mode">tree</field>
2299+<!-- <field name="domain">[('state','=','normal')]</field> -->
2300+ <field name="view_id" ref="view_account_asset_method_usage_entrytree"/>
2301+ </record>
2302+
2303+ <menuitem id="menu_asset_method_usage" parent="menu_finance_periodical_assets" action="action_account_asset_method_usage_periodical_entry"/>
2304+
2305+
2306+# Asset method
2307+
2308+ <record model="ir.ui.view" id="view_account_asset_method_tree">
2309+ <field name="name">account.asset.method.tree</field>
2310+ <field name="model">account.asset.method</field>
2311+ <field name="type">tree</field>
2312+ <field name="arch" type="xml">
2313+ <tree string="Assets Methods">
2314+<!-- <field name="asset_id"/> -->
2315+ <field name="name"/>
2316+ <field name="method_type"/>
2317+ <field name="value_total"/>
2318+ <field name="value_residual"/>
2319+ <field name="state"/>
2320+ </tree>
2321+ </field>
2322+ </record>
2323+
2324+
2325+
2326+# Asset
2327+
2328+ <record model="ir.ui.view" id="view_account_asset_asset_form">
2329+ <field name="name">account.asset.asset.form</field>
2330+ <field name="model">account.asset.asset</field>
2331+ <field name="type">form</field>
2332+ <field name="arch" type="xml">
2333+ <form string="Asset">
2334+ <notebook colspan="4">
2335+ <page string="General info">
2336+ <group colspan = "4" col = "8" >
2337+ <field name="name" select="1" colspan = "4"/>
2338+ <field name="code" select="1"/>
2339+ <field name="category_id" select="1"/>
2340+ </group>
2341+ <field name="method_ids" colspan="4" nolabel="1" mode="form,tree">
2342+ <form string="Depreciation Methods">
2343+ <group colspan = "4" col = "8" >
2344+ <field name="method_type" select="1" on_change = "onchange_take_defaults(method_type, name, parent.code, parent.name, parent.category_id )"/>
2345+ <field name="name" select="1" colspan = "4"/>
2346+ <field name="state" readonly="1" />
2347+ </group>
2348+ <!-- <separator string="Methods" colspan="4"/> -->
2349+ <notebook colspan="4">
2350+ <page string="Depreciation Board">
2351+ <group colspan = "1" col="2">
2352+<!-- <separator string="Depreciation duration" colspan ="2"/> -->
2353+ <field name="period_id"/>
2354+ <field name="method"/>
2355+ <field name="method_delay"/>
2356+ <field name="method_period"/>
2357+ <field name="method_progress_factor" attrs="{'readonly':[('method','in',('linear','syd','uop'))]}"/>
2358+<!-- <field name="method_time"/> -->
2359+ <field name="method_salvage"/>
2360+ <field name="life" attrs="{'readonly':[('method','!=','uop')]}"/>
2361+ <!-- <field name="method_end"/> -->
2362+ <field name="intervals_before"/>
2363+ </group>
2364+ <group colspan = "1" col="2">
2365+ <field name="value_total"/>
2366+ <field name="value_residual"/>
2367+ <button name="%(wizard_asset_initial)d" states="draft" string="Initial Values" type="action" colspan="2"/>
2368+ <button name="%(wizard_asset_reval)d" states="open,suppressed" string="Revalue Method" type="action" colspan="2"/>
2369+ <button name="%(wizard_asset_abandon)d" states="open,suppressed,depreciated" string="Abandon Method" type="action" colspan="2"/>
2370+
2371+ <button name="%(wizard_asset_modify)d" states="open,suppressed" string="Change Parameters" type="action" colspan="2"/>
2372+ <button name="%(wizard_asset_close)d" states="open" string="Suppress Method" type="action" colspan="2"/>
2373+ <button name="%(wizard_asset_resume)d" states="suppressed" string="Resume Method" type="action" colspan="2"/>
2374+<!-- <button name="validate" states="draft" string="Confirm Method" type="object"/> -->
2375+ </group>
2376+ </page>
2377+ <page string="Accounts">
2378+ <group colspan = "2" col="2">
2379+<!-- <separator string="Accounts information" colspan ="2"/> -->
2380+ <field name="account_asset_id"/>
2381+ <field name="account_expense_id"/>
2382+ <field name="account_actif_id"/>
2383+ <field name="account_residual_id"/>
2384+ <field name="journal_id"/>
2385+ </group>
2386+ <group colspan = "2" col="2">
2387+ <field name="journal_analytic_id"/>
2388+ <field name="account_analytic_id"/>
2389+ <!-- <field name="type"/> Not used -->
2390+ </group>
2391+ </page>
2392+ <page string="Entries">
2393+ <field name="entry_ids" colspan="4" nolabel="1"/>
2394+ </page>
2395+ <page string="Usage" attrs="{'readonly':[('method','!=','uop')]}">
2396+ <field name="usage_ids" colspan="4" nolabel="1"/>
2397+ <button name="%(wizard_asset_usage_createlines)d" string="Create Usage Lines" type="action" colspan ="1"/>
2398+ </page>
2399+
2400+ </notebook>
2401+ </form>
2402+ </field>
2403+ <group colspan="4">
2404+ <field name="state" readonly="1" colspan = "1"/>
2405+ <button name="clear" states="normal" string="Clear Draft and Close" type="object"/>
2406+ </group>
2407+
2408+ </page>
2409+ <page string="Other Information">
2410+ <group colspan = "1" col="2">
2411+ <field name="date" select="2"/>
2412+ <field name="sequence"/>
2413+ <field name="partner_id" select="2"/>
2414+ </group>
2415+ <group colspan = "1" col="2">
2416+ <field name="amount_total"/>
2417+ <field name="amount_residual"/>
2418+ <field name="localisation" select="2"/>
2419+ <button name="%(wizard_asset_localisation)d" states="normal" string="Change Localisation" type="action" colspan = "2" />
2420+ </group>
2421+ <separator string="Asset Description" colspan="4"/>
2422+ <field name="note" colspan="4" nolabel="1"/>
2423+ </page>
2424+ <page string="Asset History">
2425+ <field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
2426+ </page>
2427+ </notebook>
2428+ </form>
2429+ </field>
2430+ </record>
2431+
2432+
2433+<!--
2434+ <record model="ir.ui.view" id="view_account_asset_board_form">
2435+ <field name="name">account.asset.board.form</field>
2436+ <field name="model">account.asset.board</field>
2437+ <field name="type">form</field>
2438+ <field name="arch" type="xml">
2439+ <form string="Asset board">
2440+ <field name="name" select="1"/>
2441+ <field name="asset_id" select="1"/>
2442+ <field name="value_gross" select="2"/>
2443+ <field name="value_asset"/>
2444+ <field name="value_asset_cumul"/>
2445+ <field name="value_net"/>
2446+ </form>
2447+ </field>
2448+ </record>
2449+ <record model="ir.ui.view" id="view_account_asset_board_tree">
2450+ <field name="name">account.asset.board.tree</field>
2451+ <field name="model">account.asset.board</field>
2452+ <field name="type">tree</field>
2453+ <field name="arch" type="xml">
2454+ <tree string="Asset board">
2455+ <field name="name"/>
2456+ <field name="asset_id"/>
2457+ <field name="value_gross"/>
2458+ <field name="value_asset"/>
2459+ <field name="value_asset_cumul"/>
2460+ <field name="value_net"/>
2461+ </tree>
2462+ </field>
2463+ </record>
2464+-->
2465+
2466+ <record model="ir.actions.act_window" id="action_account_asset_asset_form">
2467+ <field name="name">Assets</field>
2468+ <field name="res_model">account.asset.asset</field>
2469+ <field name="view_type">form</field>
2470+ <field name="view_mode">tree,form</field>
2471+ </record>
2472+
2473+ <menuitem
2474+ parent="menu_finance_config_Assets"
2475+ id="menu_action_account_asset_asset_form"
2476+ action="action_account_asset_asset_form" sequence="50"/>
2477+
2478+ <menuitem id="menu_finance_Assets" name="Assets" parent="account.menu_finance"/>
2479+
2480+ <record model="ir.ui.view" id="view_account_asset_asset_tree">
2481+ <field name="name">account.asset.asset.tree</field>
2482+ <field name="model">account.asset.asset</field>
2483+ <field name="type">tree</field>
2484+<!-- <field name="field_parent">child_ids</field> -->
2485+ <field name="arch" type="xml">
2486+ <tree string="Assets">
2487+<!-- <field name="sequence" select="1"/> -->
2488+ <field name="category_id" select="1"/>
2489+ <field name="date" select="1"/>
2490+ <field name="name" select="1"/>
2491+ <field name="code" select="1"/>
2492+ <field name="amount_total"/>
2493+ <field name="amount_residual"/>
2494+<!-- <field name="value_total"/> -->
2495+ <field name="state" select="1"/>
2496+ </tree>
2497+ </field>
2498+ </record>
2499+<!--
2500+ <record model="ir.actions.act_window" id="action_account_asset_asset_tree">
2501+ <field name="name">Asset Hierarchy</field>
2502+ <field name="res_model">account.asset.asset</field>
2503+ <field name="view_type">tree</field>
2504+ <field name="domain">[('parent_id','=',False)]</field>
2505+ <field name="view_id" ref="view_account_asset_asset_tree"/>
2506+ </record>
2507+
2508+ <menuitem
2509+ parent="menu_finance_Assets"
2510+ id="menu_action_account_asset_asset_tree"
2511+ action="action_account_asset_asset_tree"/>
2512+-->
2513+<!--
2514+ <record model="ir.actions.act_window" id="action_account_asset_asset_list">
2515+ <field name="name">Assets</field>
2516+ <field name="res_model">account.asset.asset</field>
2517+ <field name="view_type">form</field>
2518+ <field name="view_mode">form,tree</field>
2519+ </record>
2520+ <menuitem
2521+ parent="menu_finance_Assets"
2522+ id="menu_action_account_asset_asset_list"
2523+ action="action_account_asset_asset_list"/>
2524+-->
2525+
2526+ <record model="ir.actions.act_window" id="action_account_asset_asset_list_draft">
2527+ <field name="name">Draft Assets</field>
2528+ <field name="res_model">account.asset.asset</field>
2529+ <field name="view_type">form</field>
2530+ <field name="view_mode">tree,form</field>
2531+ <field name="domain">[('state','=','draft')]</field>
2532+ </record>
2533+ <menuitem
2534+ parent="menu_finance_Assets"
2535+ id="menu_action_account_asset_asset_list_draft"
2536+ action="action_account_asset_asset_list_draft"/>
2537+
2538+ <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
2539+ <field name="name">Open Assets</field>
2540+ <field name="res_model">account.asset.asset</field>
2541+ <field name="view_type">form</field>
2542+ <field name="view_mode">tree,form</field>
2543+ <field name="domain">[('state','=','normal')]</field>
2544+ </record>
2545+ <menuitem
2546+ parent="menu_finance_Assets"
2547+ id="menu_action_account_asset_asset_list_normal"
2548+ action="action_account_asset_asset_list_normal"/>
2549+
2550+
2551+
2552+
2553+</data>
2554+</openerp>
2555
2556=== added file 'account_asset/account_asset_wizard.xml.OTHER'
2557--- account_asset/account_asset_wizard.xml.OTHER 1970-01-01 00:00:00 +0000
2558+++ account_asset/account_asset_wizard.xml.OTHER 2011-07-07 11:22:45 +0000
2559@@ -0,0 +1,70 @@
2560+<?xml version="1.0"?>
2561+<openerp>
2562+ <data>
2563+
2564+ <menuitem id="menu_finance_periodical_assets" name="Assets Calculation" parent="account.menu_finance_periodical_processing"/>
2565+
2566+ <wizard
2567+ string="Compute assets"
2568+ model="account.asset.method"
2569+ name="account.asset.compute"
2570+ keyword="tree_but_action"
2571+ id="wizard_asset_compute"/>
2572+ <menuitem
2573+ parent="menu_finance_periodical_assets"
2574+ action="wizard_asset_compute"
2575+ type="wizard"
2576+ id="menu_wizard_asset_compute"/>
2577+
2578+
2579+ <wizard
2580+ string="Modify asset"
2581+ model="account.asset.method"
2582+ name="account.asset.modify"
2583+ id="wizard_asset_modify"
2584+ menu="False"/>
2585+ <wizard
2586+ string="Close asset"
2587+ model="account.asset.method"
2588+ name="account.asset.close"
2589+ id="wizard_asset_close"
2590+ menu="False"/>
2591+ <wizard
2592+ string="Resume asset"
2593+ model="account.asset.method"
2594+ name="account.asset.resume"
2595+ id="wizard_asset_resume"
2596+ menu="False"/>
2597+ <wizard
2598+ string="Change Localisation"
2599+ model="account.asset.asset"
2600+ name="account.asset.localisation"
2601+ id="wizard_asset_localisation"
2602+ menu="False"/>
2603+ <wizard
2604+ string="Revaluate"
2605+ model="account.asset.method"
2606+ name="account.asset.reval"
2607+ id="wizard_asset_reval"
2608+ menu="False"/>
2609+ <wizard
2610+ string="Abandon"
2611+ model="account.asset.method"
2612+ name="account.asset.abandon"
2613+ id="wizard_asset_abandon"
2614+ menu="False"/>
2615+ <wizard
2616+ string="Initial"
2617+ model="account.asset.method"
2618+ name="account.asset.initial"
2619+ id="wizard_asset_initial"
2620+ menu="False"/>
2621+ <wizard
2622+ string="Usage Lines"
2623+ model="account.asset.method"
2624+ name="account.asset.usage.createlines"
2625+ id="wizard_asset_usage_createlines"
2626+ menu="False"/>
2627+
2628+ </data>
2629+</openerp>
2630
2631=== added directory 'account_asset/i18n'
2632=== added file 'account_asset/i18n/account_asset.pot'
2633--- account_asset/i18n/account_asset.pot 1970-01-01 00:00:00 +0000
2634+++ account_asset/i18n/account_asset.pot 2011-07-07 11:22:45 +0000
2635@@ -0,0 +1,1381 @@
2636+# Translation of OpenERP Server.
2637+# This file contains the translation of the following modules:
2638+# * account_asset
2639+#
2640+msgid ""
2641+msgstr ""
2642+"Project-Id-Version: OpenERP Server 5.0.9\n"
2643+"Report-Msgid-Bugs-To: support@openerp.com\n"
2644+"POT-Creation-Date: 2010-05-27 15:57:40+0000\n"
2645+"PO-Revision-Date: 2010-05-27 15:57:40+0000\n"
2646+"Last-Translator: <>\n"
2647+"Language-Team: \n"
2648+"MIME-Version: 1.0\n"
2649+"Content-Type: text/plain; charset=UTF-8\n"
2650+"Content-Transfer-Encoding: \n"
2651+"Plural-Forms: \n"
2652+
2653+#. module: account_asset
2654+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
2655+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
2656+msgid "Open Assets"
2657+msgstr ""
2658+
2659+#. module: account_asset
2660+#: help:account.asset.usage.createlines,init,interval:0
2661+msgid "How many usage entries are you going to make per year?"
2662+msgstr ""
2663+
2664+#. module: account_asset
2665+#: field:account.asset.method,value_residual:0
2666+msgid "Residual Value"
2667+msgstr ""
2668+
2669+#. module: account_asset
2670+#: field:account.asset.method,account_expense_id:0
2671+#: field:account.asset.method.defaults,account_expense_id:0
2672+msgid "Depr. Expense Account"
2673+msgstr ""
2674+
2675+#. module: account_asset
2676+#: code:addons/account_asset/account_asset_invoice.py:0
2677+#, python-format
2678+msgid "You cannot assign Product \"%s\" to Asset Method \"%s\". This method is in Draft state or is inactive (sold or abandoned)."
2679+msgstr ""
2680+
2681+#. module: account_asset
2682+#: code:addons/account_asset/account_asset.py:0
2683+#, python-format
2684+msgid "Date must be in the period !"
2685+msgstr ""
2686+
2687+#. module: account_asset
2688+#: view:account.asset.method.defaults:0
2689+#: model:ir.actions.act_window,name:account_asset.action_account_asset_method_defaults_form
2690+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_method_defaults_form
2691+msgid "Asset Method Defaults"
2692+msgstr ""
2693+
2694+#. module: account_asset
2695+#: view:account.asset.asset:0
2696+#: field:account.asset.asset,name:0
2697+#: field:account.asset.history,asset_id:0
2698+#: field:account.asset.method,asset_id:0
2699+#: model:ir.model,name:account_asset.model_account_asset_asset
2700+msgid "Asset"
2701+msgstr ""
2702+
2703+#. module: account_asset
2704+#: constraint:ir.actions.act_window:0
2705+msgid "Invalid model name in the action definition."
2706+msgstr ""
2707+
2708+#. module: account_asset
2709+#: view:account.asset.asset:0
2710+#: field:account.asset.method,usage_ids:0
2711+#: field:account.asset.method.usage,usage:0
2712+msgid "Usage"
2713+msgstr ""
2714+
2715+#. module: account_asset
2716+#: help:account.asset.method,account_analytic_id:0
2717+#: help:account.asset.method,journal_analytic_id:0
2718+msgid "Not implemented yet."
2719+msgstr ""
2720+
2721+#. module: account_asset
2722+#: field:account.asset.method.defaults,account_abandon_id:0
2723+msgid "Abandonment Account"
2724+msgstr ""
2725+
2726+#. module: account_asset
2727+#: code:addons/account_asset/account_asset.py:0
2728+#, python-format
2729+msgid "\n Intervals per Year: "
2730+msgstr ""
2731+
2732+#. module: account_asset
2733+#: field:account.asset.method,journal_analytic_id:0
2734+#: field:account.asset.method.defaults,journal_analytic_id:0
2735+msgid "Analytic Journal"
2736+msgstr ""
2737+
2738+#. module: account_asset
2739+#: view:account.asset.history:0
2740+#: model:ir.model,name:account_asset.model_account_asset_history
2741+msgid "Asset history"
2742+msgstr ""
2743+
2744+#. module: account_asset
2745+#: wizard_field:account.asset.reval,init,expense_value:0
2746+msgid "Increasing Expense Value"
2747+msgstr ""
2748+
2749+#. module: account_asset
2750+#: help:account.asset.abandon,init,whole_asset:0
2751+msgid "Abandon all methods of this asset."
2752+msgstr ""
2753+
2754+#. module: account_asset
2755+#: help:account.asset.method,life:0
2756+msgid "Quantity of production which make the asset method used up. Used only in Units of Production computation method and cannot be zero in this case."
2757+msgstr ""
2758+
2759+#. module: account_asset
2760+#: view:account.asset.category:0
2761+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
2762+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
2763+msgid "Asset Categories"
2764+msgstr ""
2765+
2766+#. module: account_asset
2767+#: view:account.asset.asset:0
2768+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
2769+#: field:account.asset.method,entry_ids:0
2770+msgid "Entries"
2771+msgstr ""
2772+
2773+#. module: account_asset
2774+#: help:account.asset.initial,init,value:0
2775+msgid "Initial Base Value of method."
2776+msgstr ""
2777+
2778+#. module: account_asset
2779+#: wizard_view:account.asset.compute,asset_compute:0
2780+msgid "Generated entries"
2781+msgstr ""
2782+
2783+#. module: account_asset
2784+#: wizard_view:account.asset.compute,asset_compute:0
2785+#: wizard_view:account.asset.compute,init:0
2786+msgid "Asset Computation"
2787+msgstr ""
2788+
2789+#. module: account_asset
2790+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
2791+msgid "Modify asset"
2792+msgstr ""
2793+
2794+#. module: account_asset
2795+#: selection:account.asset.history,type:0
2796+msgid "Purchase"
2797+msgstr ""
2798+
2799+#. module: account_asset
2800+#: help:account.asset.method.defaults,asset_category:0
2801+msgid "Select the asset category for this set of defaults. If no selection defined defaults will concern to all methods of selected type."
2802+msgstr ""
2803+
2804+#. module: account_asset
2805+#: code:addons/account_asset/wizard/wizard_asset_initial.py:0
2806+#, python-format
2807+msgid "Inital values for asset: "
2808+msgstr ""
2809+
2810+#. module: account_asset
2811+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
2812+msgid "Open entries"
2813+msgstr ""
2814+
2815+#. module: account_asset
2816+#: view:account.asset.asset:0
2817+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
2818+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
2819+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
2820+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
2821+msgid "Assets"
2822+msgstr ""
2823+
2824+#. module: account_asset
2825+#: field:account.asset.method,account_actif_id:0
2826+#: field:account.asset.method.defaults,account_actif_id:0
2827+msgid "Depreciation Account"
2828+msgstr ""
2829+
2830+#. module: account_asset
2831+#: help:account.asset.method.defaults,method_type:0
2832+msgid "Select method type for this set of defaults."
2833+msgstr ""
2834+
2835+#. module: account_asset
2836+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
2837+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
2838+msgid "Draft Assets"
2839+msgstr ""
2840+
2841+#. module: account_asset
2842+#: wizard_view:account.asset.usage.createlines,init:0
2843+msgid "Creation of Usage Lines"
2844+msgstr ""
2845+
2846+#. module: account_asset
2847+#: wizard_view:account.asset.abandon,init:0
2848+#: wizard_field:account.asset.abandon,init,note:0
2849+#: wizard_view:account.asset.close,init:0
2850+#: wizard_field:account.asset.close,init,note:0
2851+#: view:account.asset.history:0
2852+#: wizard_view:account.asset.initial,init:0
2853+#: wizard_field:account.asset.initial,init,note:0
2854+#: wizard_view:account.asset.localisation,init:0
2855+#: wizard_field:account.asset.localisation,init,note:0
2856+#: wizard_view:account.asset.modify,init:0
2857+#: wizard_field:account.asset.modify,init,note:0
2858+#: wizard_view:account.asset.resume,init:0
2859+#: wizard_field:account.asset.resume,init,note:0
2860+#: wizard_view:account.asset.reval,init:0
2861+#: wizard_field:account.asset.reval,init,note:0
2862+msgid "Notes"
2863+msgstr ""
2864+
2865+#. module: account_asset
2866+#: code:addons/account_asset/account_asset.py:0
2867+#, python-format
2868+msgid "\n Number of Intervals: "
2869+msgstr ""
2870+
2871+#. module: account_asset
2872+#: view:account.asset.asset:0
2873+msgid "Clear Draft and Close"
2874+msgstr ""
2875+
2876+#. module: account_asset
2877+#: selection:account.asset.history,type:0
2878+msgid "Sale"
2879+msgstr ""
2880+
2881+#. module: account_asset
2882+#: help:account.asset.abandon,init,date:0
2883+#: help:account.asset.compute,init,date:0
2884+#: help:account.asset.reval,init,date:0
2885+msgid "Efective date for accounting move."
2886+msgstr ""
2887+
2888+#. module: account_asset
2889+#: code:addons/account_asset/account_asset.py:0
2890+#, python-format
2891+msgid "Parameters set to:"
2892+msgstr ""
2893+
2894+#. module: account_asset
2895+#: wizard_button:account.asset.close,init,asset_suppress:0
2896+msgid "Suppress Depreciation"
2897+msgstr ""
2898+
2899+#. module: account_asset
2900+#: selection:account.asset.method,method:0
2901+#: selection:account.asset.method.defaults,method:0
2902+msgid "Units of Production"
2903+msgstr ""
2904+
2905+#. module: account_asset
2906+#: view:account.asset.asset:0
2907+msgid "Other Information"
2908+msgstr ""
2909+
2910+#. module: account_asset
2911+#: wizard_button:account.asset.abandon,init,asset_abandon:0
2912+#: model:ir.actions.wizard,name:account_asset.wizard_asset_abandon
2913+msgid "Abandon"
2914+msgstr ""
2915+
2916+#. module: account_asset
2917+#: selection:account.asset.history,type:0
2918+msgid "Closing"
2919+msgstr ""
2920+
2921+#. module: account_asset
2922+#: code:addons/account_asset/account_asset.py:0
2923+#, python-format
2924+msgid "Warning !"
2925+msgstr ""
2926+
2927+#. module: account_asset
2928+#: model:ir.model,name:account_asset.model_account_asset_method_defaults
2929+msgid "Asset Method Delfaults"
2930+msgstr ""
2931+
2932+#. module: account_asset
2933+#: field:account.asset.method.defaults,method_progress_factor:0
2934+msgid "Progressive factor"
2935+msgstr ""
2936+
2937+#. module: account_asset
2938+#: field:account.asset.history,method_end:0
2939+#: field:account.asset.method,method_end:0
2940+msgid "Ending Date"
2941+msgstr ""
2942+
2943+#. module: account_asset
2944+#: code:addons/account_asset/account_asset.py:0
2945+#, python-format
2946+msgid "Error ! You can not create recursive categories."
2947+msgstr ""
2948+
2949+#. module: account_asset
2950+#: wizard_field:account.asset.reval,init,value:0
2951+msgid "Increasing Base Value"
2952+msgstr ""
2953+
2954+#. module: account_asset
2955+#: field:account.asset.method,account_analytic_id:0
2956+#: field:account.asset.method.defaults,account_analytic_id:0
2957+msgid "Analytic Account"
2958+msgstr ""
2959+
2960+#. module: account_asset
2961+#: wizard_button:account.asset.usage.createlines,init,asset_reval:0
2962+msgid "Create Lines"
2963+msgstr ""
2964+
2965+#. module: account_asset
2966+#: view:account.asset.asset:0
2967+msgid "Accounts"
2968+msgstr ""
2969+
2970+#. module: account_asset
2971+#: view:account.asset.asset:0
2972+msgid "Depreciation Methods"
2973+msgstr ""
2974+
2975+#. module: account_asset
2976+#: help:account.asset.method,account_residual_id:0
2977+msgid "Select account used for residual when asset is sold. You can change the account before sale operation."
2978+msgstr ""
2979+
2980+#. module: account_asset
2981+#: field:account.asset.method,life:0
2982+#: wizard_field:account.asset.modify,init,life:0
2983+msgid "Life Quantity"
2984+msgstr ""
2985+
2986+#. module: account_asset
2987+#: field:account.asset.asset,partner_id:0
2988+#: field:account.asset.history,partner_id:0
2989+msgid "Partner"
2990+msgstr ""
2991+
2992+#. module: account_asset
2993+#: help:account.asset.method.defaults,method_progress_factor:0
2994+msgid "Specify the factor of progression in depreciation. It is used in Declining-Balance method. When linear depreciation is 20% per year, and you want apply Double-Declining Balance you should choose Declining-Balance method and enter 0,40 (40%) as Progressive factor."
2995+msgstr ""
2996+
2997+#. module: account_asset
2998+#: selection:account.asset.history,type:0
2999+msgid "Transfer"
3000+msgstr ""
3001+
3002+#. module: account_asset
3003+#: code:addons/account_asset/account_asset.py:0
3004+#, python-format
3005+msgid "\n Progressive Factor: "
3006+msgstr ""
3007+
3008+#. module: account_asset
3009+#: help:account.move.line,asset_method_id:0
3010+msgid "Assign the asset as depreciation method if move line concerns the asset."
3011+msgstr ""
3012+
3013+#. module: account_asset
3014+#: model:ir.actions.wizard,name:account_asset.wizard_asset_resume
3015+msgid "Resume asset"
3016+msgstr ""
3017+
3018+#. module: account_asset
3019+#: wizard_field:account.asset.abandon,init,acc_abandon:0
3020+msgid "Abandon Account"
3021+msgstr ""
3022+
3023+#. module: account_asset
3024+#: view:account.asset.method.usage:0
3025+#: model:ir.actions.act_window,name:account_asset.action_account_asset_method_usage_periodical_entry
3026+#: model:ir.ui.menu,name:account_asset.menu_asset_method_usage
3027+msgid "Method Usage"
3028+msgstr ""
3029+
3030+#. module: account_asset
3031+#: help:account.asset.method.defaults,account_impairment_id:0
3032+msgid "Select account used for impairment amount. Used in revaluation."
3033+msgstr ""
3034+
3035+#. module: account_asset
3036+#: constraint:ir.ui.view:0
3037+msgid "Invalid XML for View Architecture!"
3038+msgstr ""
3039+
3040+#. module: account_asset
3041+#: wizard_button:account.asset.modify,init,asset_modify:0
3042+msgid "Modify Method"
3043+msgstr ""
3044+
3045+#. module: account_asset
3046+#: field:account.asset.method,method:0
3047+#: field:account.asset.method.defaults,method:0
3048+msgid "Computation Method"
3049+msgstr ""
3050+
3051+#. module: account_asset
3052+#: help:account.asset.method,method_salvage:0
3053+msgid "Value planned to be residual after full depreciation process"
3054+msgstr ""
3055+
3056+#. module: account_asset
3057+#: wizard_field:account.asset.initial,init,acc_impairment:0
3058+msgid "Asset Counter Account"
3059+msgstr ""
3060+
3061+#. module: account_asset
3062+#: code:addons/account_asset/account_asset.py:0
3063+#, python-format
3064+msgid "\n Life Quantity: "
3065+msgstr ""
3066+
3067+#. module: account_asset
3068+#: code:addons/account_asset/wizard/wizard_asset_reval.py:0
3069+#, python-format
3070+msgid "Asset revalued because: "
3071+msgstr ""
3072+
3073+#. module: account_asset
3074+#: help:account.asset.method.usage,period_id:0
3075+msgid "Select period which usage concerns."
3076+msgstr ""
3077+
3078+#. module: account_asset
3079+#: help:account.asset.abandon,init,period_id:0
3080+#: help:account.asset.compute,init,period_id:0
3081+#: help:account.asset.reval,init,period_id:0
3082+msgid "Calculated period and period for posting."
3083+msgstr ""
3084+
3085+#. module: account_asset
3086+#: help:account.asset.usage.createlines,init,fiscal_year:0
3087+msgid "Choose fiscal year for entries."
3088+msgstr ""
3089+
3090+#. module: account_asset
3091+#: help:account.asset.method.defaults,account_residual_id:0
3092+msgid "Select account used for sale residual."
3093+msgstr ""
3094+
3095+#. module: account_asset
3096+#: view:account.asset.method.usage:0
3097+msgid "Method usage"
3098+msgstr ""
3099+
3100+#. module: account_asset
3101+#: selection:account.asset.history,type:0
3102+msgid "Depr. Suppression"
3103+msgstr ""
3104+
3105+#. module: account_asset
3106+#: help:account.asset.abandon,init,acc_abandon:0
3107+msgid "Account for asset loss amount."
3108+msgstr ""
3109+
3110+#. module: account_asset
3111+#: field:account.asset.method,method_salvage:0
3112+#: wizard_field:account.asset.modify,init,method_salvage:0
3113+msgid "Salvage Value"
3114+msgstr ""
3115+
3116+#. module: account_asset
3117+#: model:ir.actions.wizard,name:account_asset.wizard_asset_usage_createlines
3118+msgid "Usage Lines"
3119+msgstr ""
3120+
3121+#. module: account_asset
3122+#: help:account.asset.initial,init,date:0
3123+msgid "Efective date for posting."
3124+msgstr ""
3125+
3126+#. module: account_asset
3127+#: code:addons/account_asset/wizard/wizard_asset_close.py:0
3128+#, python-format
3129+msgid "Suppressed because: "
3130+msgstr ""
3131+
3132+#. module: account_asset
3133+#: field:account.asset.history,invoice_id:0
3134+msgid "Invoice"
3135+msgstr ""
3136+
3137+#. module: account_asset
3138+#: help:account.asset.method.usage,usage:0
3139+msgid "Specify usage quantity in selected period."
3140+msgstr ""
3141+
3142+#. module: account_asset
3143+#: field:account.asset.method,method_delay:0
3144+#: field:account.asset.method.defaults,method_delay:0
3145+#: wizard_field:account.asset.modify,init,method_delay:0
3146+msgid "Number of Intervals"
3147+msgstr ""
3148+
3149+#. module: account_asset
3150+#: help:account.asset.initial,init,expense_value:0
3151+msgid "Initial Value of method expenses. There are sum of depreciations made before this system asset management."
3152+msgstr ""
3153+
3154+#. module: account_asset
3155+#: wizard_view:account.asset.close,init:0
3156+msgid "Method Suppression"
3157+msgstr ""
3158+
3159+#. module: account_asset
3160+#: view:account.asset.asset:0
3161+msgid "Asset Description"
3162+msgstr ""
3163+
3164+#. module: account_asset
3165+#: wizard_button:account.asset.compute,init,asset_compute:0
3166+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
3167+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
3168+msgid "Compute assets"
3169+msgstr ""
3170+
3171+#. module: account_asset
3172+#: help:account.asset.method,method_delay:0
3173+msgid "How many intervals this asset is to be calculated in its life. If asset was calculated in other system before specify Intervals Before too."
3174+msgstr ""
3175+
3176+#. module: account_asset
3177+#: help:account.asset.reval,init,value:0
3178+msgid "Value to be added to method base value. In Direct method it is increasing of book value. In Indirect method it is increasing of cost basis. Negative value means decreasing."
3179+msgstr ""
3180+
3181+#. module: account_asset
3182+#: view:account.asset.asset:0
3183+msgid "Change Parameters"
3184+msgstr ""
3185+
3186+#. module: account_asset
3187+#: field:account.asset.history,type:0
3188+msgid "Entry Type"
3189+msgstr ""
3190+
3191+#. module: account_asset
3192+#: view:account.asset.method:0
3193+msgid "Assets Methods"
3194+msgstr ""
3195+
3196+#. module: account_asset
3197+#: help:account.asset.method,account_asset_id:0
3198+#: help:account.asset.method.defaults,account_asset_id:0
3199+msgid "Select account used for cost basis of asset. It will be applied into invoice line when you select this asset in invoice line."
3200+msgstr ""
3201+
3202+#. module: account_asset
3203+#: code:addons/account_asset/wizard/wizard_asset_localisation.py:0
3204+#, python-format
3205+msgid "Asset transfered because: "
3206+msgstr ""
3207+
3208+#. module: account_asset
3209+#: selection:account.asset.history,type:0
3210+msgid "Settings Change"
3211+msgstr ""
3212+
3213+#. module: account_asset
3214+#: field:account.asset.category,parent_id:0
3215+msgid "Parent Category"
3216+msgstr ""
3217+
3218+#. module: account_asset
3219+#: field:account.asset.history,name:0
3220+msgid "History name"
3221+msgstr ""
3222+
3223+#. module: account_asset
3224+#: wizard_button:account.asset.reval,init,asset_reval:0
3225+msgid "Revalue"
3226+msgstr ""
3227+
3228+#. module: account_asset
3229+#: code:addons/account_asset/account_asset.py:0
3230+#, python-format
3231+msgid "This wizard works only when asset have just Draft and Closed methods !"
3232+msgstr ""
3233+
3234+#. module: account_asset
3235+#: view:account.asset.asset:0
3236+msgid "Create Usage Lines"
3237+msgstr ""
3238+
3239+#. module: account_asset
3240+#: wizard_field:account.asset.initial,init,value:0
3241+msgid "Base Value"
3242+msgstr ""
3243+
3244+#. module: account_asset
3245+#: wizard_field:account.asset.initial,init,intervals_before:0
3246+#: field:account.asset.method,intervals_before:0
3247+msgid "Intervals Before"
3248+msgstr ""
3249+
3250+#. module: account_asset
3251+#: help:account.asset.compute,init,category_id:0
3252+msgid "If empty all categories assets will be calculated. If you use hierarchical categories all children of selected category be calculated."
3253+msgstr ""
3254+
3255+#. module: account_asset
3256+#: wizard_button:account.asset.resume,init,asset_resume:0
3257+msgid "Resume Depreciation"
3258+msgstr ""
3259+
3260+#. module: account_asset
3261+#: view:account.asset.asset:0
3262+msgid "Suppress Method"
3263+msgstr ""
3264+
3265+#. module: account_asset
3266+#: view:account.asset.asset:0
3267+msgid "Depreciation Board"
3268+msgstr ""
3269+
3270+#. module: account_asset
3271+#: model:ir.actions.act_window,name:account_asset.asset_category_action
3272+#: model:ir.ui.menu,name:account_asset.menu_asset_category_action
3273+msgid "Assets Category Structure"
3274+msgstr ""
3275+
3276+#. module: account_asset
3277+#: help:account.asset.asset,localisation:0
3278+msgid "Set this field before asset coonfirming. Later on you will have to use Change Localisation button."
3279+msgstr ""
3280+
3281+#. module: account_asset
3282+#: model:ir.actions.wizard,name:account_asset.wizard_asset_reval
3283+msgid "Revaluate"
3284+msgstr ""
3285+
3286+#. module: account_asset
3287+#: help:account.asset.method,method_progress_factor:0
3288+msgid "Specify the factor of progression in depreciation. Used in Declining-Balance and Progressive method only. When linear depreciation is 20% per year, and you want apply Double-Declining Balance you should choose Declining-Balance method and enter 0,40 (40%) as Progressive factor."
3289+msgstr ""
3290+
3291+#. module: account_asset
3292+#: field:account.asset.method.type,name:0
3293+msgid "Asset Method Type Name"
3294+msgstr ""
3295+
3296+#. module: account_asset
3297+#: wizard_view:account.asset.reval,init:0
3298+msgid "Revaluation entry"
3299+msgstr ""
3300+
3301+#. module: account_asset
3302+#: help:account.asset.reval,init,acc_impairment:0
3303+msgid "Account for impairment loss amount."
3304+msgstr ""
3305+
3306+#. module: account_asset
3307+#: code:addons/account_asset/account_asset.py:0
3308+#, python-format
3309+msgid "You can dalete assets only in Draft state !"
3310+msgstr ""
3311+
3312+#. module: account_asset
3313+#: help:account.asset.reval,init,expense_value:0
3314+msgid "Value to be added to asset expenses. Used only in indirect method. In direct method ignored."
3315+msgstr ""
3316+
3317+#. module: account_asset
3318+#: help:account.asset.method.defaults,account_actif_id:0
3319+msgid "Select account used for depreciation amount."
3320+msgstr ""
3321+
3322+#. module: account_asset
3323+#: field:account.asset.method,date:0
3324+msgid "Date Created"
3325+msgstr ""
3326+
3327+#. module: account_asset
3328+#: code:addons/account_asset/account_asset.py:0
3329+#, python-format
3330+msgid "\n Intervals Before: "
3331+msgstr ""
3332+
3333+#. module: account_asset
3334+#: selection:account.asset.method,method:0
3335+#: selection:account.asset.method.defaults,method:0
3336+msgid "Sum of Years Digits"
3337+msgstr ""
3338+
3339+#. module: account_asset
3340+#: code:addons/account_asset/wizard/wizard_asset_resume.py:0
3341+#, python-format
3342+msgid "Resuming because: "
3343+msgstr ""
3344+
3345+#. module: account_asset
3346+#: model:ir.model,name:account_asset.model_account_asset_category
3347+msgid "Asset category"
3348+msgstr ""
3349+
3350+#. module: account_asset
3351+#: code:addons/account_asset/account_asset_invoice.py:0
3352+#, python-format
3353+msgid "\nPrice: "
3354+msgstr ""
3355+
3356+#. module: account_asset
3357+#: code:addons/account_asset/account_asset_invoice.py:0
3358+#, python-format
3359+msgid "You cannot assign Product \"%s\" to Asset Method \"%s\". This method is already depreciated or is inactive (sold or abandoned)."
3360+msgstr ""
3361+
3362+#. module: account_asset
3363+#: model:ir.actions.wizard,name:account_asset.wizard_asset_initial
3364+msgid "Initial"
3365+msgstr ""
3366+
3367+#. module: account_asset
3368+#: wizard_view:account.asset.initial,init:0
3369+msgid "Initial entry"
3370+msgstr ""
3371+
3372+#. module: account_asset
3373+#: field:account.asset.asset,amount_residual:0
3374+msgid "Residual"
3375+msgstr ""
3376+
3377+#. module: account_asset
3378+#: field:account.asset.asset,note:0
3379+#: field:account.asset.category,note:0
3380+#: field:account.asset.history,note:0
3381+#: field:account.asset.method.type,note:0
3382+msgid "Note"
3383+msgstr ""
3384+
3385+#. module: account_asset
3386+#: selection:account.asset.asset,state:0
3387+#: selection:account.asset.method,state:0
3388+msgid "Draft"
3389+msgstr ""
3390+
3391+#. module: account_asset
3392+#: help:account.asset.method,state:0
3393+msgid "Open - Ready for calculation.\n"
3394+"Suppressed - Not calculated.\n"
3395+"Depreciated - Depreciation finished but method exists (can be sold or abandoned).\n"
3396+"Closed - Asset method doesn't exist (sold or abandoned)."
3397+msgstr ""
3398+
3399+#. module: account_asset
3400+#: selection:account.asset.asset,state:0
3401+#: selection:account.asset.method,state:0
3402+msgid "Closed"
3403+msgstr ""
3404+
3405+#. module: account_asset
3406+#: help:account.asset.asset,state:0
3407+msgid "Normal - Asset contains active methods (opened, suppressed or depreciated).\n"
3408+"Closed - Asset doesn't exist. All methods are sold or abandoned."
3409+msgstr ""
3410+
3411+#. module: account_asset
3412+#: field:account.asset.history,asset_method_id:0
3413+#: field:account.asset.method.usage,asset_method_id:0
3414+msgid "Method"
3415+msgstr ""
3416+
3417+#. module: account_asset
3418+#: selection:account.asset.history,type:0
3419+msgid "Purchase Refund"
3420+msgstr ""
3421+
3422+#. module: account_asset
3423+#: selection:account.asset.asset,state:0
3424+msgid "Normal"
3425+msgstr ""
3426+
3427+#. module: account_asset
3428+#: selection:account.asset.history,type:0
3429+msgid "Initial Value"
3430+msgstr ""
3431+
3432+#. module: account_asset
3433+#: field:account.asset.asset,state:0
3434+msgid "Asset State"
3435+msgstr ""
3436+
3437+#. module: account_asset
3438+#: wizard_field:account.asset.localisation,init,localisation:0
3439+msgid "Enter New localisation"
3440+msgstr ""
3441+
3442+#. module: account_asset
3443+#: field:account.asset.asset,localisation:0
3444+msgid "Localisation"
3445+msgstr ""
3446+
3447+#. module: account_asset
3448+#: wizard_field:account.asset.abandon,init,whole_asset:0
3449+#: wizard_field:account.asset.close,init,whole_asset:0
3450+#: wizard_field:account.asset.resume,init,whole_asset:0
3451+msgid "All Methods"
3452+msgstr ""
3453+
3454+#. module: account_asset
3455+#: code:addons/account_asset/wizard/wizard_asset_modify.py:0
3456+#, python-format
3457+msgid "Modification of "
3458+msgstr ""
3459+
3460+#. module: account_asset
3461+#: view:account.asset.asset:0
3462+msgid "Resume Method"
3463+msgstr ""
3464+
3465+#. module: account_asset
3466+#: field:account.asset.asset,active:0
3467+msgid "Active"
3468+msgstr ""
3469+
3470+#. module: account_asset
3471+#: field:account.asset.category,child_ids:0
3472+msgid "Children Categories"
3473+msgstr ""
3474+
3475+#. module: account_asset
3476+#: code:addons/account_asset/account_asset_invoice.py:0
3477+#, python-format
3478+msgid "Product \"%s\" is assigned to Asset Method \"%s\". But this method has no Sale Residual Account to make asset moves."
3479+msgstr ""
3480+
3481+#. module: account_asset
3482+#: field:account.asset.history,user_id:0
3483+msgid "User"
3484+msgstr ""
3485+
3486+#. module: account_asset
3487+#: code:addons/account_asset/wizard/wizard_asset_usage_createlines.py:0
3488+#, python-format
3489+msgid "year %s !"
3490+msgstr ""
3491+
3492+#. module: account_asset
3493+#: view:account.asset.asset:0
3494+#: view:account.asset.history:0
3495+msgid "Asset History"
3496+msgstr ""
3497+
3498+#. module: account_asset
3499+#: field:account.invoice.line,asset_method_id:0
3500+msgid "Asset Method"
3501+msgstr ""
3502+
3503+#. module: account_asset
3504+#: view:account.asset.asset:0
3505+#: wizard_view:account.asset.initial,init:0
3506+msgid "Initial Values"
3507+msgstr ""
3508+
3509+#. module: account_asset
3510+#: field:account.asset.asset,method_ids:0
3511+msgid "Asset Method Name"
3512+msgstr ""
3513+
3514+#. module: account_asset
3515+#: model:ir.module.module,description:account_asset.module_meta_information
3516+msgid "Financial and accounting asset management.\n"
3517+" Allows to define\n"
3518+" * Asset category. \n"
3519+" * Assets.\n"
3520+" *Asset usage period and property.\n"
3521+" "
3522+msgstr ""
3523+
3524+#. module: account_asset
3525+#: code:addons/account_asset/account_asset.py:0
3526+#, python-format
3527+msgid "Cannot post in closed period !"
3528+msgstr ""
3529+
3530+#. module: account_asset
3531+#: selection:account.asset.history,type:0
3532+msgid "Summary"
3533+msgstr ""
3534+
3535+#. module: account_asset
3536+#: field:account.asset.method,account_asset_id:0
3537+#: field:account.asset.method.defaults,account_asset_id:0
3538+msgid "Asset Account"
3539+msgstr ""
3540+
3541+#. module: account_asset
3542+#: wizard_view:account.asset.initial,init:0
3543+msgid "Wizard for starting values of asset coming from production or investment. Use it also when you continue asset management from another system."
3544+msgstr ""
3545+
3546+#. module: account_asset
3547+#: field:account.asset.method,account_residual_id:0
3548+#: field:account.asset.method.defaults,account_residual_id:0
3549+msgid "Sale Residual Account"
3550+msgstr ""
3551+
3552+#. module: account_asset
3553+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
3554+msgid "Close asset"
3555+msgstr ""
3556+
3557+#. module: account_asset
3558+#: help:account.asset.method,period_id:0
3559+msgid "Select period indicating first interval."
3560+msgstr ""
3561+
3562+#. module: account_asset
3563+#: wizard_view:account.asset.modify,init:0
3564+msgid "Method Modyfying"
3565+msgstr ""
3566+
3567+#. module: account_asset
3568+#: field:account.asset.asset,history_ids:0
3569+msgid "History"
3570+msgstr ""
3571+
3572+#. module: account_asset
3573+#: help:account.asset.asset,partner_id:0
3574+msgid "If Date field is empty this field will be filled by first purchase."
3575+msgstr ""
3576+
3577+#. module: account_asset
3578+#: model:ir.model,name:account_asset.model_account_asset_method_usage
3579+msgid "Asset Method Usage"
3580+msgstr ""
3581+
3582+#. module: account_asset
3583+#: selection:account.asset.method,method:0
3584+#: selection:account.asset.method.defaults,method:0
3585+msgid "Declining-Balance"
3586+msgstr ""
3587+
3588+#. module: account_asset
3589+#: selection:account.asset.method,state:0
3590+msgid "Suppressed"
3591+msgstr ""
3592+
3593+#. module: account_asset
3594+#: wizard_view:account.asset.abandon,init:0
3595+#: selection:account.asset.history,type:0
3596+msgid "Abandonment"
3597+msgstr ""
3598+
3599+#. module: account_asset
3600+#: wizard_field:account.asset.abandon,init,period_id:0
3601+#: wizard_field:account.asset.compute,init,period_id:0
3602+#: wizard_field:account.asset.initial,init,period_id:0
3603+#: field:account.asset.method,period_id:0
3604+#: field:account.asset.method.usage,period_id:0
3605+#: wizard_field:account.asset.reval,init,period_id:0
3606+msgid "Period"
3607+msgstr ""
3608+
3609+#. module: account_asset
3610+#: help:account.asset.method,account_actif_id:0
3611+msgid "Select account used for depreciation amounts."
3612+msgstr ""
3613+
3614+#. module: account_asset
3615+#: field:account.asset.method,method_progress_factor:0
3616+#: wizard_field:account.asset.modify,init,method_progress_factor:0
3617+msgid "Progressive Factor"
3618+msgstr ""
3619+
3620+#. module: account_asset
3621+#: wizard_view:account.asset.modify,init:0
3622+msgid "Method parameters to modify"
3623+msgstr ""
3624+
3625+#. module: account_asset
3626+#: help:account.asset.initial,init,period_id:0
3627+msgid "Period for posting. Consider which period to use for this posting. It should be probably some additional period before current depreciation start."
3628+msgstr ""
3629+
3630+#. module: account_asset
3631+#: help:account.asset.usage.createlines,init,value:0
3632+msgid "Value of Unit of Production. This value has to be changed before asset calculation but could be some indication for entering later on."
3633+msgstr ""
3634+
3635+#. module: account_asset
3636+#: field:account.asset.asset,category_id:0
3637+#: view:account.asset.category:0
3638+#: field:account.asset.category,name:0
3639+#: wizard_field:account.asset.compute,init,category_id:0
3640+#: field:account.asset.method.defaults,asset_category:0
3641+msgid "Asset Category"
3642+msgstr ""
3643+
3644+#. module: account_asset
3645+#: code:addons/account_asset/account_asset.py:0
3646+#, python-format
3647+msgid "Changing of method parameters to:"
3648+msgstr ""
3649+
3650+#. module: account_asset
3651+#: wizard_button:account.asset.abandon,init,end:0
3652+#: wizard_button:account.asset.close,init,end:0
3653+#: wizard_button:account.asset.compute,init,end:0
3654+#: wizard_button:account.asset.initial,init,end:0
3655+#: wizard_button:account.asset.localisation,init,end:0
3656+#: wizard_button:account.asset.modify,init,end:0
3657+#: wizard_button:account.asset.resume,init,end:0
3658+#: wizard_button:account.asset.reval,init,end:0
3659+#: wizard_button:account.asset.usage.createlines,init,end:0
3660+msgid "Cancel"
3661+msgstr ""
3662+
3663+#. module: account_asset
3664+#: wizard_button:account.asset.compute,asset_compute,end:0
3665+msgid "Close"
3666+msgstr ""
3667+
3668+#. module: account_asset
3669+#: wizard_view:account.asset.localisation,init:0
3670+#: wizard_button:account.asset.localisation,init,asset_modify:0
3671+msgid "Set New Localisation"
3672+msgstr ""
3673+
3674+#. module: account_asset
3675+#: selection:account.asset.method,state:0
3676+msgid "Open"
3677+msgstr ""
3678+
3679+#. module: account_asset
3680+#: field:account.asset.asset,code:0
3681+msgid "Asset Code"
3682+msgstr ""
3683+
3684+#. module: account_asset
3685+#: help:account.asset.initial,init,intervals_before:0
3686+msgid "Number of intervals calculated already before asset is managed in this system."
3687+msgstr ""
3688+
3689+#. module: account_asset
3690+#: wizard_view:account.asset.localisation,init:0
3691+msgid "Localisation Changing"
3692+msgstr ""
3693+
3694+#. module: account_asset
3695+#: selection:account.asset.history,type:0
3696+msgid "Depr. Resuming"
3697+msgstr ""
3698+
3699+#. module: account_asset
3700+#: constraint:ir.model:0
3701+msgid "The Object name must start with x_ and not contain any special character !"
3702+msgstr ""
3703+
3704+#. module: account_asset
3705+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
3706+msgid "Asset management"
3707+msgstr ""
3708+
3709+#. module: account_asset
3710+#: help:account.asset.method.defaults,account_abandon_id:0
3711+msgid "Select account used for abandonment loss amount."
3712+msgstr ""
3713+
3714+#. module: account_asset
3715+#: wizard_view:account.asset.resume,init:0
3716+msgid "Method Resuming"
3717+msgstr ""
3718+
3719+#. module: account_asset
3720+#: code:addons/account_asset/wizard/wizard_asset_abandon.py:0
3721+#, python-format
3722+msgid "Asset abandoned because: "
3723+msgstr ""
3724+
3725+#. module: account_asset
3726+#: code:addons/account_asset/account_asset.py:0
3727+#, python-format
3728+msgid "\n Salvage Value: "
3729+msgstr ""
3730+
3731+#. module: account_asset
3732+#: wizard_view:account.asset.close,init:0
3733+#: wizard_view:account.asset.resume,init:0
3734+msgid "General information"
3735+msgstr ""
3736+
3737+#. module: account_asset
3738+#: code:addons/account_asset/account_asset_invoice.py:0
3739+#, python-format
3740+msgid "]\nInvoice date: "
3741+msgstr ""
3742+
3743+#. module: account_asset
3744+#: help:account.invoice.line,asset_method_id:0
3745+msgid "Select the asset depreciation method if you wish to assign the purchase invoice line to fixed asset. If method doesn't exists yet you will have to create it and probably the asset itself too. After selecting the asset method the invoice line account should change according to the asset method settings but please check it before creating the invoice."
3746+msgstr ""
3747+
3748+#. module: account_asset
3749+#: help:account.asset.compute,init,method_type_id:0
3750+msgid "If empty all method types will be calculated for assets."
3751+msgstr ""
3752+
3753+#. module: account_asset
3754+#: view:account.asset.method.type:0
3755+#: model:ir.actions.act_window,name:account_asset.action_account_asset_method_type_form
3756+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_method_type_form
3757+msgid "Asset Method Types"
3758+msgstr ""
3759+
3760+#. module: account_asset
3761+#: selection:account.asset.method,method:0
3762+#: selection:account.asset.method.defaults,method:0
3763+msgid "Progressive"
3764+msgstr ""
3765+
3766+#. module: account_asset
3767+#: field:account.asset.asset,sequence:0
3768+msgid "Seq."
3769+msgstr ""
3770+
3771+#. module: account_asset
3772+#: field:account.asset.method,state:0
3773+msgid "Method State"
3774+msgstr ""
3775+
3776+#. module: account_asset
3777+#: field:account.asset.method,name:0
3778+msgid "Method name"
3779+msgstr ""
3780+
3781+#. module: account_asset
3782+#: wizard_field:account.asset.abandon,init,name:0
3783+#: wizard_field:account.asset.close,init,name:0
3784+#: wizard_field:account.asset.initial,init,name:0
3785+#: wizard_field:account.asset.localisation,init,name:0
3786+#: wizard_field:account.asset.modify,init,name:0
3787+#: wizard_field:account.asset.resume,init,name:0
3788+#: wizard_field:account.asset.reval,init,name:0
3789+msgid "Description"
3790+msgstr ""
3791+
3792+#. module: account_asset
3793+#: model:ir.model,name:account_asset.model_account_asset_method
3794+msgid "Asset method"
3795+msgstr ""
3796+
3797+#. module: account_asset
3798+#: code:addons/account_asset/account_asset.py:0
3799+#, python-format
3800+msgid "You can dalete method only in Draft state !"
3801+msgstr ""
3802+
3803+#. module: account_asset
3804+#: field:account.asset.method,journal_id:0
3805+#: field:account.asset.method.defaults,journal_id:0
3806+msgid "Journal"
3807+msgstr ""
3808+
3809+#. module: account_asset
3810+#: field:account.asset.category,code:0
3811+msgid "Asset Category Code"
3812+msgstr ""
3813+
3814+#. module: account_asset
3815+#: field:account.move.line,asset_method_id:0
3816+msgid "Asset Depr. Method"
3817+msgstr ""
3818+
3819+#. module: account_asset
3820+#: field:account.asset.method,method_period:0
3821+#: field:account.asset.method.defaults,method_period:0
3822+#: wizard_field:account.asset.modify,init,method_period:0
3823+msgid "Intervals per Year"
3824+msgstr ""
3825+
3826+#. module: account_asset
3827+#: field:account.asset.method,method_type:0
3828+#: field:account.asset.method.defaults,method_type:0
3829+msgid "Method Type"
3830+msgstr ""
3831+
3832+#. module: account_asset
3833+#: code:addons/account_asset/wizard/wizard_asset_compute.py:0
3834+#, python-format
3835+msgid "Created moves"
3836+msgstr ""
3837+
3838+#. module: account_asset
3839+#: wizard_field:account.asset.usage.createlines,init,interval:0
3840+msgid "Entries per Year"
3841+msgstr ""
3842+
3843+#. module: account_asset
3844+#: view:account.asset.asset:0
3845+msgid "Revalue Method"
3846+msgstr ""
3847+
3848+#. module: account_asset
3849+#: field:account.asset.method.type,code:0
3850+msgid "Asset Method Type Code"
3851+msgstr ""
3852+
3853+#. module: account_asset
3854+#: help:account.asset.initial,init,acc_impairment:0
3855+msgid "Counter account for base value."
3856+msgstr ""
3857+
3858+#. module: account_asset
3859+#: field:account.asset.history,change_total:0
3860+msgid "Total Change"
3861+msgstr ""
3862+
3863+#. module: account_asset
3864+#: field:account.asset.method,value_total:0
3865+msgid "Gross Value"
3866+msgstr ""
3867+
3868+#. module: account_asset
3869+#: wizard_field:account.asset.initial,init,expense_value:0
3870+msgid "Expense Value"
3871+msgstr ""
3872+
3873+#. module: account_asset
3874+#: wizard_view:account.asset.initial,init:0
3875+msgid "But for purchased assets use invoice line assignment."
3876+msgstr ""
3877+
3878+#. module: account_asset
3879+#: code:addons/account_asset/account_asset.py:0
3880+#, python-format
3881+msgid "Error ! Number of intervals per year must be 1, 2, 3, 4, 6 or 12."
3882+msgstr ""
3883+
3884+#. module: account_asset
3885+#: wizard_field:account.asset.usage.createlines,init,fiscal_year:0
3886+msgid "Fiscal Year"
3887+msgstr ""
3888+
3889+#. module: account_asset
3890+#: selection:account.asset.method,state:0
3891+msgid "Depreciated"
3892+msgstr ""
3893+
3894+#. module: account_asset
3895+#: wizard_view:account.asset.abandon,init:0
3896+#: view:account.asset.asset:0
3897+msgid "Abandon Method"
3898+msgstr ""
3899+
3900+#. module: account_asset
3901+#: help:account.asset.method,intervals_before:0
3902+msgid "Number of intervals calculated before asset is managed in this system. Used with Initial Values wizard. If you start asset in this system keep zero."
3903+msgstr ""
3904+
3905+#. module: account_asset
3906+#: code:addons/account_asset/account_asset.py:0
3907+#, python-format
3908+msgid "Asset transfered to: "
3909+msgstr ""
3910+
3911+#. module: account_asset
3912+#: code:addons/account_asset/account_asset.py:0
3913+#: code:addons/account_asset/account_asset_invoice.py:0
3914+#: code:addons/account_asset/wizard/wizard_asset_usage_createlines.py:0
3915+#, python-format
3916+msgid "Error !"
3917+msgstr ""
3918+
3919+#. module: account_asset
3920+#: wizard_button:account.asset.initial,init,asset_reval:0
3921+msgid "Set Initials"
3922+msgstr ""
3923+
3924+#. module: account_asset
3925+#: field:account.asset.history,change_expense:0
3926+msgid "Expense Change"
3927+msgstr ""
3928+
3929+#. module: account_asset
3930+#: selection:account.asset.asset,state:0
3931+msgid "View"
3932+msgstr ""
3933+
3934+#. module: account_asset
3935+#: view:account.asset.asset:0
3936+msgid "General info"
3937+msgstr ""
3938+
3939+#. module: account_asset
3940+#: model:ir.ui.menu,name:account_asset.menu_finance_periodical_assets
3941+msgid "Assets Calculation"
3942+msgstr ""
3943+
3944+#. module: account_asset
3945+#: selection:account.asset.method,method:0
3946+#: selection:account.asset.method.defaults,method:0
3947+msgid "Straight-Line"
3948+msgstr ""
3949+
3950+#. module: account_asset
3951+#: view:account.asset.asset:0
3952+#: model:ir.actions.wizard,name:account_asset.wizard_asset_localisation
3953+msgid "Change Localisation"
3954+msgstr ""
3955+
3956+#. module: account_asset
3957+#: help:account.asset.method,account_expense_id:0
3958+#: help:account.asset.method.defaults,account_expense_id:0
3959+msgid "Select account used for depreciation expense (write-off). If you use direct method of depreciation this account should be the same as Asset Account."
3960+msgstr ""
3961+
3962+#. module: account_asset
3963+#: wizard_field:account.asset.abandon,init,date:0
3964+#: field:account.asset.asset,date:0
3965+#: wizard_field:account.asset.compute,init,date:0
3966+#: field:account.asset.history,date:0
3967+#: wizard_field:account.asset.initial,init,date:0
3968+#: wizard_field:account.asset.reval,init,date:0
3969+msgid "Date"
3970+msgstr ""
3971+
3972+#. module: account_asset
3973+#: field:account.asset.method.defaults,account_impairment_id:0
3974+#: wizard_field:account.asset.reval,init,acc_impairment:0
3975+msgid "Impairment Account"
3976+msgstr ""
3977+
3978+#. module: account_asset
3979+#: code:addons/account_asset/account_asset_invoice.py:0
3980+#, python-format
3981+msgid "Product name: "
3982+msgstr ""
3983+
3984+#. module: account_asset
3985+#: wizard_field:account.asset.compute,init,method_type_id:0
3986+#: view:account.asset.method.type:0
3987+#: model:ir.model,name:account_asset.model_account_asset_method_type
3988+msgid "Asset Method Type"
3989+msgstr ""
3990+
3991+#. module: account_asset
3992+#: help:account.asset.asset,date:0
3993+msgid "Set this date or leave it empty to allow system set the first purchase date."
3994+msgstr ""
3995+
3996+#. module: account_asset
3997+#: field:account.asset.asset,amount_total:0
3998+msgid "Total"
3999+msgstr ""
4000+
4001+#. module: account_asset
4002+#: wizard_field:account.asset.usage.createlines,init,value:0
4003+msgid "Entry Value"
4004+msgstr ""
4005+
4006+#. module: account_asset
4007+#: help:account.asset.method,method_period:0
4008+msgid "Specify the number of depreciations to be made in year. This number cannot be less then number of periods in year."
4009+msgstr ""
4010+
4011+#. module: account_asset
4012+#: selection:account.asset.history,type:0
4013+#: wizard_view:account.asset.reval,init:0
4014+msgid "Revaluation"
4015+msgstr ""
4016+
4017
4018=== added file 'account_asset/i18n/ca_ES.po'
4019--- account_asset/i18n/ca_ES.po 1970-01-01 00:00:00 +0000
4020+++ account_asset/i18n/ca_ES.po 2011-07-07 11:22:45 +0000
4021@@ -0,0 +1,537 @@
4022+# Translation of OpenERP Server.
4023+# This file contains the translation of the following modules:
4024+# * account_asset
4025+#
4026+# Albert Cervera i Areny <albert@nan-tic.com>, 2009.
4027+msgid ""
4028+msgstr ""
4029+"Project-Id-Version: OpenERP Server 5.0.1\n"
4030+"Report-Msgid-Bugs-To: support@openerp.com\n"
4031+"POT-Creation-Date: 2009-09-23 15:17:03+0000\n"
4032+"PO-Revision-Date: 2009-09-23 17:23+0200\n"
4033+"Last-Translator: Albert Cervera i Areny <albert@nan-tic.com>\n"
4034+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
4035+"MIME-Version: 1.0\n"
4036+"Content-Type: text/plain; charset=UTF-8\n"
4037+"Content-Transfer-Encoding: 8bit\n"
4038+"Plural-Forms: \n"
4039+"X-Generator: Lokalize 1.0\n"
4040+
4041+#. module: account_asset
4042+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
4043+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
4044+msgid "Open Assets"
4045+msgstr "Actius oberts"
4046+
4047+#. module: account_asset
4048+#: field:account.asset.property,method_end:0
4049+#: field:account.asset.property.history,method_end:0
4050+msgid "Ending date"
4051+msgstr "Data final"
4052+
4053+#. module: account_asset
4054+#: view:account.asset.asset:0
4055+msgid "Depreciation board"
4056+msgstr "Taula d'amortització"
4057+
4058+#. module: account_asset
4059+#: view:account.asset.asset:0
4060+#: field:account.asset.asset,name:0
4061+#: field:account.asset.board,asset_id:0
4062+#: field:account.asset.property,asset_id:0
4063+#: field:account.invoice.line,asset_id:0
4064+#: field:account.move.line,asset_id:0
4065+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
4066+#: model:ir.model,name:account_asset.model_account_asset_asset
4067+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
4068+msgid "Asset"
4069+msgstr "Actiu"
4070+
4071+#. module: account_asset
4072+#: constraint:ir.actions.act_window:0
4073+msgid "Invalid model name in the action definition."
4074+msgstr "Nom de model invàlid en la definició de l'acció."
4075+
4076+#. module: account_asset
4077+#: selection:account.asset.property,method:0
4078+msgid "Linear"
4079+msgstr "Lineal"
4080+
4081+#. module: account_asset
4082+#: view:account.asset.asset:0
4083+msgid "Change duration"
4084+msgstr "Canvi de durada"
4085+
4086+#. module: account_asset
4087+#: field:account.asset.asset,child_ids:0
4088+msgid "Childs asset"
4089+msgstr "Actius fills"
4090+
4091+#. module: account_asset
4092+#: field:account.asset.board,value_asset:0
4093+msgid "Asset Value"
4094+msgstr "Valor de l'actiu"
4095+
4096+#. module: account_asset
4097+#: wizard_field:account.asset.modify,init,name:0
4098+msgid "Reason"
4099+msgstr "Raó"
4100+
4101+#. module: account_asset
4102+#: view:account.asset.asset:0
4103+#: field:account.asset.asset,entry_ids:0
4104+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
4105+msgid "Entries"
4106+msgstr "Assentaments"
4107+
4108+#. module: account_asset
4109+#: wizard_view:account.asset.compute,asset_compute:0
4110+msgid "Generated entries"
4111+msgstr "Assentaments generats"
4112+
4113+#. module: account_asset
4114+#: wizard_field:account.asset.modify,init,method_delay:0
4115+#: field:account.asset.property,method_delay:0
4116+#: field:account.asset.property.history,method_delay:0
4117+msgid "Number of interval"
4118+msgstr "Número d'intervals"
4119+
4120+#. module: account_asset
4121+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
4122+msgid "Open entries"
4123+msgstr "Obre assentaments"
4124+
4125+#. module: account_asset
4126+#: view:account.asset.asset:0
4127+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
4128+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
4129+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
4130+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
4131+msgid "Assets"
4132+msgstr "Actius"
4133+
4134+#. module: account_asset
4135+#: selection:account.asset.property,method:0
4136+msgid "Progressive"
4137+msgstr "Progressiu"
4138+
4139+#. module: account_asset
4140+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
4141+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
4142+msgid "Draft Assets"
4143+msgstr "Actius en estat esborrany"
4144+
4145+#. module: account_asset
4146+#: wizard_view:account.asset.modify,init:0
4147+#: wizard_field:account.asset.modify,init,note:0
4148+#: view:account.asset.property.history:0
4149+msgid "Notes"
4150+msgstr "Notes"
4151+
4152+#. module: account_asset
4153+#: view:account.asset.asset:0
4154+msgid "Change history"
4155+msgstr "Canvi històric"
4156+
4157+#. module: account_asset
4158+#: view:account.asset.asset:0
4159+msgid "Depreciation entries"
4160+msgstr "Assentament de dotació a l'amortització "
4161+
4162+#. module: account_asset
4163+#: view:account.asset.asset:0
4164+msgid "Methods"
4165+msgstr "Mètodes"
4166+
4167+#. module: account_asset
4168+#: wizard_view:account.asset.modify,init:0
4169+msgid "Asset properties to modify"
4170+msgstr "Propietats de l'actiu a modificar"
4171+
4172+#. module: account_asset
4173+#: field:account.asset.asset,partner_id:0
4174+msgid "Partner"
4175+msgstr "Empresa"
4176+
4177+#. module: account_asset
4178+#: wizard_field:account.asset.modify,init,method_period:0
4179+#: field:account.asset.property,method_period:0
4180+#: field:account.asset.property.history,method_period:0
4181+msgid "Period per interval"
4182+msgstr "Període per interval"
4183+
4184+#. module: account_asset
4185+#: view:account.asset.asset:0
4186+msgid "Depreciation duration"
4187+msgstr "termini d'amortització"
4188+
4189+#. module: account_asset
4190+#: field:account.asset.property,account_analytic_id:0
4191+msgid "Analytic account"
4192+msgstr "Compte analític"
4193+
4194+#. module: account_asset
4195+#: field:account.asset.property,state:0
4196+msgid "State"
4197+msgstr "Estat"
4198+
4199+#. module: account_asset
4200+#: view:account.asset.asset:0
4201+msgid "Depreciation methods"
4202+msgstr "Mètodes d'amortització"
4203+
4204+#. module: account_asset
4205+#: view:account.asset.asset:0
4206+msgid "Other information"
4207+msgstr "Altra informació"
4208+
4209+#. module: account_asset
4210+#: field:account.asset.board,value_asset_cumul:0
4211+msgid "Cumul. value"
4212+msgstr "Valor acumulat"
4213+
4214+#. module: account_asset
4215+#: view:account.asset.property:0
4216+msgid "Assets methods"
4217+msgstr "Mètodes d'actius"
4218+
4219+#. module: account_asset
4220+#: constraint:ir.ui.view:0
4221+msgid "Invalid XML for View Architecture!"
4222+msgstr "XML invàlid per a la definició de la vista!"
4223+
4224+#. module: account_asset
4225+#: model:ir.model,name:account_asset.model_account_asset_property
4226+msgid "Asset property"
4227+msgstr "Propietat de l'actiu"
4228+
4229+#. module: account_asset
4230+#: wizard_view:account.asset.compute,asset_compute:0
4231+#: wizard_view:account.asset.compute,init:0
4232+#: wizard_button:account.asset.compute,init,asset_compute:0
4233+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
4234+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
4235+msgid "Compute assets"
4236+msgstr "Calcula els actius"
4237+
4238+#. module: account_asset
4239+#: wizard_view:account.asset.modify,init:0
4240+#: wizard_button:account.asset.modify,init,asset_modify:0
4241+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
4242+msgid "Modify asset"
4243+msgstr "Modifica l'actiu"
4244+
4245+#. module: account_asset
4246+#: view:account.asset.asset:0
4247+msgid "Confirm asset"
4248+msgstr "Confirma l'actiu"
4249+
4250+#. module: account_asset
4251+#: view:account.asset.property.history:0
4252+#: model:ir.model,name:account_asset.model_account_asset_property_history
4253+msgid "Asset history"
4254+msgstr "Històric de l'actiu"
4255+
4256+#. module: account_asset
4257+#: field:account.asset.property,date:0
4258+msgid "Date created"
4259+msgstr "Data de creació"
4260+
4261+#. module: account_asset
4262+#: model:ir.module.module,description:account_asset.module_meta_information
4263+msgid ""
4264+"Financial and accounting asset management.\n"
4265+" Allows to define\n"
4266+" * Asset category. \n"
4267+" * Assets.\n"
4268+" *Asset usage period and property.\n"
4269+" "
4270+msgstr ""
4271+"Gestió financera i comptable d'actius.\n"
4272+" Permet definir\n"
4273+" * Categories d'actiu. \n"
4274+" * Actius.\n"
4275+" * Període i propietats de l'actiu utilitzat. "
4276+
4277+#. module: account_asset
4278+#: field:account.asset.board,value_gross:0
4279+#: field:account.asset.property,value_total:0
4280+msgid "Gross value"
4281+msgstr "Valor brut"
4282+
4283+#. module: account_asset
4284+#: selection:account.asset.property,method_time:0
4285+msgid "Ending period"
4286+msgstr "Període final"
4287+
4288+#. module: account_asset
4289+#: field:account.asset.board,name:0
4290+msgid "Asset name"
4291+msgstr "Nom de l'actiu"
4292+
4293+#. module: account_asset
4294+#: view:account.asset.asset:0
4295+msgid "Accounts information"
4296+msgstr "Informació de comptes"
4297+
4298+#. module: account_asset
4299+#: field:account.asset.asset,note:0
4300+#: field:account.asset.category,note:0
4301+#: field:account.asset.property.history,note:0
4302+msgid "Note"
4303+msgstr "Nota"
4304+
4305+#. module: account_asset
4306+#: selection:account.asset.asset,state:0
4307+#: selection:account.asset.property,state:0
4308+msgid "Draft"
4309+msgstr "Esborrany"
4310+
4311+#. module: account_asset
4312+#: field:account.asset.property,type:0
4313+msgid "Depr. method type"
4314+msgstr "Tipus de mètode d'amortització"
4315+
4316+#. module: account_asset
4317+#: field:account.asset.property,account_asset_id:0
4318+msgid "Asset account"
4319+msgstr "Compte d'actiu"
4320+
4321+#. module: account_asset
4322+#: field:account.asset.property.history,asset_property_id:0
4323+msgid "Method"
4324+msgstr "Mètode"
4325+
4326+#. module: account_asset
4327+#: selection:account.asset.asset,state:0
4328+msgid "Normal"
4329+msgstr "Normal"
4330+
4331+#. module: account_asset
4332+#: field:account.asset.property,method_progress_factor:0
4333+msgid "Progressif factor"
4334+msgstr "Factor de progressió"
4335+
4336+#. module: account_asset
4337+#: field:account.asset.asset,localisation:0
4338+msgid "Localisation"
4339+msgstr "Localització"
4340+
4341+#. module: account_asset
4342+#: field:account.asset.property,method:0
4343+msgid "Computation method"
4344+msgstr "Mètode de càlcul"
4345+
4346+#. module: account_asset
4347+#: field:account.asset.property,method_time:0
4348+msgid "Time method"
4349+msgstr "Mètode de temps"
4350+
4351+#. module: account_asset
4352+#: field:account.asset.asset,active:0
4353+msgid "Active"
4354+msgstr "Actiu"
4355+
4356+#. module: account_asset
4357+#: field:account.asset.property.history,user_id:0
4358+msgid "User"
4359+msgstr "Usuari"
4360+
4361+#. module: account_asset
4362+#: field:account.asset.asset,property_ids:0
4363+msgid "Asset method name"
4364+msgstr "Nom del mètode d'actiu"
4365+
4366+#. module: account_asset
4367+#: field:account.asset.asset,date:0
4368+#: field:account.asset.property.history,date:0
4369+msgid "Date"
4370+msgstr "Data"
4371+
4372+#. module: account_asset
4373+#: field:account.asset.board,value_net:0
4374+msgid "Net value"
4375+msgstr "Valor net"
4376+
4377+#. module: account_asset
4378+#: wizard_view:account.asset.close,init:0
4379+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
4380+msgid "Close asset"
4381+msgstr "Tanca l'actiu"
4382+
4383+#. module: account_asset
4384+#: field:account.asset.property,history_ids:0
4385+msgid "History"
4386+msgstr "Història"
4387+
4388+#. module: account_asset
4389+#: field:account.asset.property,account_actif_id:0
4390+msgid "Depreciation account"
4391+msgstr "Compte d'amortització"
4392+
4393+#. module: account_asset
4394+#: field:account.asset.asset,period_id:0
4395+#: wizard_field:account.asset.compute,init,period_id:0
4396+msgid "Period"
4397+msgstr "Període"
4398+
4399+#. module: account_asset
4400+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
4401+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
4402+msgid "Asset Category"
4403+msgstr "Categoria d'actiu"
4404+
4405+#. module: account_asset
4406+#: wizard_button:account.asset.close,init,end:0
4407+#: wizard_button:account.asset.compute,init,end:0
4408+#: wizard_button:account.asset.modify,init,end:0
4409+msgid "Cancel"
4410+msgstr "Cancel·la"
4411+
4412+#. module: account_asset
4413+#: selection:account.asset.asset,state:0
4414+#: wizard_button:account.asset.compute,asset_compute,end:0
4415+#: selection:account.asset.property,state:0
4416+msgid "Close"
4417+msgstr "Tanca"
4418+
4419+#. module: account_asset
4420+#: selection:account.asset.property,state:0
4421+msgid "Open"
4422+msgstr "Obre"
4423+
4424+#. module: account_asset
4425+#: constraint:ir.model:0
4426+msgid ""
4427+"The Object name must start with x_ and not contain any special character !"
4428+msgstr ""
4429+"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
4430+"especial!"
4431+
4432+#. module: account_asset
4433+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
4434+msgid "Asset management"
4435+msgstr "Gestió de l'actiu"
4436+
4437+#. module: account_asset
4438+#: view:account.asset.board:0
4439+#: field:account.asset.property,board_ids:0
4440+#: model:ir.model,name:account_asset.model_account_asset_board
4441+msgid "Asset board"
4442+msgstr "Taulell d'actius"
4443+
4444+#. module: account_asset
4445+#: field:account.asset.asset,state:0
4446+msgid "Global state"
4447+msgstr "Estat global"
4448+
4449+#. module: account_asset
4450+#: selection:account.asset.property,method_time:0
4451+msgid "Delay"
4452+msgstr "Retarda"
4453+
4454+#. module: account_asset
4455+#: wizard_view:account.asset.close,init:0
4456+msgid "General information"
4457+msgstr "Informació general"
4458+
4459+#. module: account_asset
4460+#: field:account.asset.property,journal_analytic_id:0
4461+msgid "Analytic journal"
4462+msgstr "Diari analític"
4463+
4464+#. module: account_asset
4465+#: field:account.asset.property,name:0
4466+msgid "Method name"
4467+msgstr "Nom del mètode"
4468+
4469+#. module: account_asset
4470+#: field:account.asset.property,journal_id:0
4471+msgid "Journal"
4472+msgstr "Diari"
4473+
4474+#. module: account_asset
4475+#: field:account.asset.property.history,name:0
4476+msgid "History name"
4477+msgstr "Nom històric"
4478+
4479+#. module: account_asset
4480+#: view:account.asset.asset:0
4481+msgid "Close method"
4482+msgstr "Tanca el mètode"
4483+
4484+#. module: account_asset
4485+#: field:account.asset.property,entry_asset_ids:0
4486+msgid "Asset Entries"
4487+msgstr "Assentaments d'actiu"
4488+
4489+#. module: account_asset
4490+#: field:account.asset.asset,category_id:0
4491+#: view:account.asset.category:0
4492+#: field:account.asset.category,name:0
4493+#: model:ir.model,name:account_asset.model_account_asset_category
4494+msgid "Asset category"
4495+msgstr "Categoria d'actiu"
4496+
4497+#. module: account_asset
4498+#: view:account.asset.asset:0
4499+msgid "Depreciation"
4500+msgstr "Depreciació"
4501+
4502+#. module: account_asset
4503+#: field:account.asset.asset,code:0
4504+#: field:account.asset.category,code:0
4505+msgid "Asset code"
4506+msgstr "Codi d'actiu"
4507+
4508+#. module: account_asset
4509+#: field:account.asset.asset,value_total:0
4510+msgid "Total value"
4511+msgstr "Valor total"
4512+
4513+#. module: account_asset
4514+#: selection:account.asset.asset,state:0
4515+msgid "View"
4516+msgstr "Vista"
4517+
4518+#. module: account_asset
4519+#: view:account.asset.asset:0
4520+msgid "General info"
4521+msgstr "Informació general"
4522+
4523+#. module: account_asset
4524+#: field:account.asset.asset,sequence:0
4525+msgid "Sequence"
4526+msgstr "Seqüència"
4527+
4528+#. module: account_asset
4529+#: field:account.asset.property,value_residual:0
4530+msgid "Residual value"
4531+msgstr "Valor residual"
4532+
4533+#. module: account_asset
4534+#: wizard_button:account.asset.close,init,asset_close:0
4535+msgid "End of asset"
4536+msgstr "Final d'actiu"
4537+
4538+#. module: account_asset
4539+#: selection:account.asset.property,type:0
4540+msgid "Direct"
4541+msgstr "Directe"
4542+
4543+#. module: account_asset
4544+#: selection:account.asset.property,type:0
4545+msgid "Indirect"
4546+msgstr "Indirecte"
4547+
4548+#. module: account_asset
4549+#: field:account.asset.asset,parent_id:0
4550+msgid "Parent asset"
4551+msgstr "Família d'actiu"
4552+
4553+#. module: account_asset
4554+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
4555+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
4556+msgid "Asset Hierarchy"
4557+msgstr "Jerarquia d'actius"
4558+
4559
4560=== added file 'account_asset/i18n/de.po'
4561--- account_asset/i18n/de.po 1970-01-01 00:00:00 +0000
4562+++ account_asset/i18n/de.po 2011-07-07 11:22:45 +0000
4563@@ -0,0 +1,1460 @@
4564+# German translation for openobject-addons
4565+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
4566+# This file is distributed under the same license as the openobject-addons package.
4567+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
4568+#
4569+msgid ""
4570+msgstr ""
4571+"Project-Id-Version: openobject-addons\n"
4572+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4573+"POT-Creation-Date: 2010-05-27 15:57+0000\n"
4574+"PO-Revision-Date: 2010-06-04 09:31+0000\n"
4575+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
4576+"Language-Team: German <de@li.org>\n"
4577+"MIME-Version: 1.0\n"
4578+"Content-Type: text/plain; charset=UTF-8\n"
4579+"Content-Transfer-Encoding: 8bit\n"
4580+"X-Launchpad-Export-Date: 2010-06-10 03:44+0000\n"
4581+"X-Generator: Launchpad (build Unknown)\n"
4582+
4583+#. module: account_asset
4584+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
4585+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
4586+msgid "Open Assets"
4587+msgstr ""
4588+
4589+#. module: account_asset
4590+#: help:account.asset.usage.createlines,init,interval:0
4591+msgid "How many usage entries are you going to make per year?"
4592+msgstr ""
4593+
4594+#. module: account_asset
4595+#: field:account.asset.method,value_residual:0
4596+msgid "Residual Value"
4597+msgstr ""
4598+
4599+#. module: account_asset
4600+#: field:account.asset.method,account_expense_id:0
4601+#: field:account.asset.method.defaults,account_expense_id:0
4602+msgid "Depr. Expense Account"
4603+msgstr ""
4604+
4605+#. module: account_asset
4606+#: code:addons/account_asset/account_asset_invoice.py:0
4607+#, python-format
4608+msgid ""
4609+"You cannot assign Product \"%s\" to Asset Method \"%s\". This method is in "
4610+"Draft state or is inactive (sold or abandoned)."
4611+msgstr ""
4612+
4613+#. module: account_asset
4614+#: code:addons/account_asset/account_asset.py:0
4615+#, python-format
4616+msgid "Date must be in the period !"
4617+msgstr ""
4618+
4619+#. module: account_asset
4620+#: view:account.asset.method.defaults:0
4621+#: model:ir.actions.act_window,name:account_asset.action_account_asset_method_defaults_form
4622+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_method_defaults_form
4623+msgid "Asset Method Defaults"
4624+msgstr ""
4625+
4626+#. module: account_asset
4627+#: view:account.asset.asset:0
4628+#: field:account.asset.asset,name:0
4629+#: field:account.asset.history,asset_id:0
4630+#: field:account.asset.method,asset_id:0
4631+#: model:ir.model,name:account_asset.model_account_asset_asset
4632+msgid "Asset"
4633+msgstr ""
4634+
4635+#. module: account_asset
4636+#: constraint:ir.actions.act_window:0
4637+msgid "Invalid model name in the action definition."
4638+msgstr ""
4639+
4640+#. module: account_asset
4641+#: view:account.asset.asset:0
4642+#: field:account.asset.method,usage_ids:0
4643+#: field:account.asset.method.usage,usage:0
4644+msgid "Usage"
4645+msgstr ""
4646+
4647+#. module: account_asset
4648+#: help:account.asset.method,account_analytic_id:0
4649+#: help:account.asset.method,journal_analytic_id:0
4650+msgid "Not implemented yet."
4651+msgstr ""
4652+
4653+#. module: account_asset
4654+#: field:account.asset.method.defaults,account_abandon_id:0
4655+msgid "Abandonment Account"
4656+msgstr ""
4657+
4658+#. module: account_asset
4659+#: code:addons/account_asset/account_asset.py:0
4660+#, python-format
4661+msgid ""
4662+"\n"
4663+" Intervals per Year: "
4664+msgstr ""
4665+
4666+#. module: account_asset
4667+#: field:account.asset.method,journal_analytic_id:0
4668+#: field:account.asset.method.defaults,journal_analytic_id:0
4669+msgid "Analytic Journal"
4670+msgstr ""
4671+
4672+#. module: account_asset
4673+#: view:account.asset.history:0
4674+#: model:ir.model,name:account_asset.model_account_asset_history
4675+msgid "Asset history"
4676+msgstr ""
4677+
4678+#. module: account_asset
4679+#: wizard_field:account.asset.reval,init,expense_value:0
4680+msgid "Increasing Expense Value"
4681+msgstr ""
4682+
4683+#. module: account_asset
4684+#: help:account.asset.abandon,init,whole_asset:0
4685+msgid "Abandon all methods of this asset."
4686+msgstr ""
4687+
4688+#. module: account_asset
4689+#: help:account.asset.method,life:0
4690+msgid ""
4691+"Quantity of production which make the asset method used up. Used only in "
4692+"Units of Production computation method and cannot be zero in this case."
4693+msgstr ""
4694+
4695+#. module: account_asset
4696+#: view:account.asset.category:0
4697+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
4698+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
4699+msgid "Asset Categories"
4700+msgstr ""
4701+
4702+#. module: account_asset
4703+#: view:account.asset.asset:0
4704+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
4705+#: field:account.asset.method,entry_ids:0
4706+msgid "Entries"
4707+msgstr ""
4708+
4709+#. module: account_asset
4710+#: help:account.asset.initial,init,value:0
4711+msgid "Initial Base Value of method."
4712+msgstr ""
4713+
4714+#. module: account_asset
4715+#: wizard_view:account.asset.compute,asset_compute:0
4716+msgid "Generated entries"
4717+msgstr ""
4718+
4719+#. module: account_asset
4720+#: wizard_view:account.asset.compute,asset_compute:0
4721+#: wizard_view:account.asset.compute,init:0
4722+msgid "Asset Computation"
4723+msgstr ""
4724+
4725+#. module: account_asset
4726+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
4727+msgid "Modify asset"
4728+msgstr ""
4729+
4730+#. module: account_asset
4731+#: selection:account.asset.history,type:0
4732+msgid "Purchase"
4733+msgstr ""
4734+
4735+#. module: account_asset
4736+#: help:account.asset.method.defaults,asset_category:0
4737+msgid ""
4738+"Select the asset category for this set of defaults. If no selection defined "
4739+"defaults will concern to all methods of selected type."
4740+msgstr ""
4741+
4742+#. module: account_asset
4743+#: code:addons/account_asset/wizard/wizard_asset_initial.py:0
4744+#, python-format
4745+msgid "Inital values for asset: "
4746+msgstr ""
4747+
4748+#. module: account_asset
4749+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
4750+msgid "Open entries"
4751+msgstr ""
4752+
4753+#. module: account_asset
4754+#: view:account.asset.asset:0
4755+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
4756+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
4757+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
4758+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
4759+msgid "Assets"
4760+msgstr ""
4761+
4762+#. module: account_asset
4763+#: field:account.asset.method,account_actif_id:0
4764+#: field:account.asset.method.defaults,account_actif_id:0
4765+msgid "Depreciation Account"
4766+msgstr ""
4767+
4768+#. module: account_asset
4769+#: help:account.asset.method.defaults,method_type:0
4770+msgid "Select method type for this set of defaults."
4771+msgstr ""
4772+
4773+#. module: account_asset
4774+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
4775+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
4776+msgid "Draft Assets"
4777+msgstr ""
4778+
4779+#. module: account_asset
4780+#: wizard_view:account.asset.usage.createlines,init:0
4781+msgid "Creation of Usage Lines"
4782+msgstr ""
4783+
4784+#. module: account_asset
4785+#: wizard_view:account.asset.abandon,init:0
4786+#: wizard_field:account.asset.abandon,init,note:0
4787+#: wizard_view:account.asset.close,init:0
4788+#: wizard_field:account.asset.close,init,note:0
4789+#: view:account.asset.history:0
4790+#: wizard_view:account.asset.initial,init:0
4791+#: wizard_field:account.asset.initial,init,note:0
4792+#: wizard_view:account.asset.localisation,init:0
4793+#: wizard_field:account.asset.localisation,init,note:0
4794+#: wizard_view:account.asset.modify,init:0
4795+#: wizard_field:account.asset.modify,init,note:0
4796+#: wizard_view:account.asset.resume,init:0
4797+#: wizard_field:account.asset.resume,init,note:0
4798+#: wizard_view:account.asset.reval,init:0
4799+#: wizard_field:account.asset.reval,init,note:0
4800+msgid "Notes"
4801+msgstr ""
4802+
4803+#. module: account_asset
4804+#: code:addons/account_asset/account_asset.py:0
4805+#, python-format
4806+msgid ""
4807+"\n"
4808+" Number of Intervals: "
4809+msgstr ""
4810+
4811+#. module: account_asset
4812+#: view:account.asset.asset:0
4813+msgid "Clear Draft and Close"
4814+msgstr ""
4815+
4816+#. module: account_asset
4817+#: selection:account.asset.history,type:0
4818+msgid "Sale"
4819+msgstr ""
4820+
4821+#. module: account_asset
4822+#: help:account.asset.abandon,init,date:0
4823+#: help:account.asset.compute,init,date:0
4824+#: help:account.asset.reval,init,date:0
4825+msgid "Efective date for accounting move."
4826+msgstr ""
4827+
4828+#. module: account_asset
4829+#: code:addons/account_asset/account_asset.py:0
4830+#, python-format
4831+msgid "Parameters set to:"
4832+msgstr ""
4833+
4834+#. module: account_asset
4835+#: wizard_button:account.asset.close,init,asset_suppress:0
4836+msgid "Suppress Depreciation"
4837+msgstr ""
4838+
4839+#. module: account_asset
4840+#: selection:account.asset.method,method:0
4841+#: selection:account.asset.method.defaults,method:0
4842+msgid "Units of Production"
4843+msgstr ""
4844+
4845+#. module: account_asset
4846+#: view:account.asset.asset:0
4847+msgid "Other Information"
4848+msgstr ""
4849+
4850+#. module: account_asset
4851+#: wizard_button:account.asset.abandon,init,asset_abandon:0
4852+#: model:ir.actions.wizard,name:account_asset.wizard_asset_abandon
4853+msgid "Abandon"
4854+msgstr ""
4855+
4856+#. module: account_asset
4857+#: selection:account.asset.history,type:0
4858+msgid "Closing"
4859+msgstr ""
4860+
4861+#. module: account_asset
4862+#: code:addons/account_asset/account_asset.py:0
4863+#, python-format
4864+msgid "Warning !"
4865+msgstr ""
4866+
4867+#. module: account_asset
4868+#: model:ir.model,name:account_asset.model_account_asset_method_defaults
4869+msgid "Asset Method Delfaults"
4870+msgstr ""
4871+
4872+#. module: account_asset
4873+#: field:account.asset.method.defaults,method_progress_factor:0
4874+msgid "Progressive factor"
4875+msgstr ""
4876+
4877+#. module: account_asset
4878+#: field:account.asset.history,method_end:0
4879+#: field:account.asset.method,method_end:0
4880+msgid "Ending Date"
4881+msgstr ""
4882+
4883+#. module: account_asset
4884+#: code:addons/account_asset/account_asset.py:0
4885+#, python-format
4886+msgid "Error ! You can not create recursive categories."
4887+msgstr ""
4888+
4889+#. module: account_asset
4890+#: wizard_field:account.asset.reval,init,value:0
4891+msgid "Increasing Base Value"
4892+msgstr ""
4893+
4894+#. module: account_asset
4895+#: field:account.asset.method,account_analytic_id:0
4896+#: field:account.asset.method.defaults,account_analytic_id:0
4897+msgid "Analytic Account"
4898+msgstr ""
4899+
4900+#. module: account_asset
4901+#: wizard_button:account.asset.usage.createlines,init,asset_reval:0
4902+msgid "Create Lines"
4903+msgstr ""
4904+
4905+#. module: account_asset
4906+#: view:account.asset.asset:0
4907+msgid "Accounts"
4908+msgstr ""
4909+
4910+#. module: account_asset
4911+#: view:account.asset.asset:0
4912+msgid "Depreciation Methods"
4913+msgstr ""
4914+
4915+#. module: account_asset
4916+#: help:account.asset.method,account_residual_id:0
4917+msgid ""
4918+"Select account used for residual when asset is sold. You can change the "
4919+"account before sale operation."
4920+msgstr ""
4921+
4922+#. module: account_asset
4923+#: field:account.asset.method,life:0
4924+#: wizard_field:account.asset.modify,init,life:0
4925+msgid "Life Quantity"
4926+msgstr ""
4927+
4928+#. module: account_asset
4929+#: field:account.asset.asset,partner_id:0
4930+#: field:account.asset.history,partner_id:0
4931+msgid "Partner"
4932+msgstr ""
4933+
4934+#. module: account_asset
4935+#: help:account.asset.method.defaults,method_progress_factor:0
4936+msgid ""
4937+"Specify the factor of progression in depreciation. It is used in Declining-"
4938+"Balance method. When linear depreciation is 20% per year, and you want apply "
4939+"Double-Declining Balance you should choose Declining-Balance method and "
4940+"enter 0,40 (40%) as Progressive factor."
4941+msgstr ""
4942+
4943+#. module: account_asset
4944+#: selection:account.asset.history,type:0
4945+msgid "Transfer"
4946+msgstr ""
4947+
4948+#. module: account_asset
4949+#: code:addons/account_asset/account_asset.py:0
4950+#, python-format
4951+msgid ""
4952+"\n"
4953+" Progressive Factor: "
4954+msgstr ""
4955+
4956+#. module: account_asset
4957+#: help:account.move.line,asset_method_id:0
4958+msgid ""
4959+"Assign the asset as depreciation method if move line concerns the asset."
4960+msgstr ""
4961+
4962+#. module: account_asset
4963+#: model:ir.actions.wizard,name:account_asset.wizard_asset_resume
4964+msgid "Resume asset"
4965+msgstr ""
4966+
4967+#. module: account_asset
4968+#: wizard_field:account.asset.abandon,init,acc_abandon:0
4969+msgid "Abandon Account"
4970+msgstr ""
4971+
4972+#. module: account_asset
4973+#: view:account.asset.method.usage:0
4974+#: model:ir.actions.act_window,name:account_asset.action_account_asset_method_usage_periodical_entry
4975+#: model:ir.ui.menu,name:account_asset.menu_asset_method_usage
4976+msgid "Method Usage"
4977+msgstr ""
4978+
4979+#. module: account_asset
4980+#: help:account.asset.method.defaults,account_impairment_id:0
4981+msgid "Select account used for impairment amount. Used in revaluation."
4982+msgstr ""
4983+
4984+#. module: account_asset
4985+#: constraint:ir.ui.view:0
4986+msgid "Invalid XML for View Architecture!"
4987+msgstr ""
4988+
4989+#. module: account_asset
4990+#: wizard_button:account.asset.modify,init,asset_modify:0
4991+msgid "Modify Method"
4992+msgstr ""
4993+
4994+#. module: account_asset
4995+#: field:account.asset.method,method:0
4996+#: field:account.asset.method.defaults,method:0
4997+msgid "Computation Method"
4998+msgstr ""
4999+
5000+#. module: account_asset
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: