Merge lp:~openerp-community/openobject-addons/pniederlag into lp:openobject-addons
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Dony (Odoo) | Needs Resubmitting | ||
Review via email: mp+67170@code.launchpad.net |
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.
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!