Merge lp:~dr.dran/openobject-addons/extra-6.0 into lp:openobject-addons

Proposed by Franco Tampieri
Status: Rejected
Rejected by: qdp (OpenERP)
Proposed branch: lp:~dr.dran/openobject-addons/extra-6.0
Merge into: lp:openobject-addons
Diff against target: 1336957 lines (has conflicts)
Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Path conflict: <deleted> / labo_analysis/table_conversion_empdog_chiffre_lettre.csv
Path conflict: <deleted> / currency_rate_update
Path conflict: <deleted> / product_serial
Path conflict: <deleted> / product_variant_configurator/__openerp__.py
Path conflict: <deleted> / openerp_dia
Path conflict: <deleted> / sale_product_multistep_configurator/__openerp__.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/__init__.py
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/__init__.py
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.
Conflict adding file account_asset.  Moved existing file to account_asset.moved.
Contents conflict in account_asset/__init__.py
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
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.
Contents conflict in account_base/__init__.py
Contents conflict in account_base/__terp__.py
Contents conflict in account_base/partner.py
Conflict adding files to account_base/wizard.  Created directory.
Conflict because account_base/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_base/wizard/__init__.py
Contents conflict in account_base/wizard/account_setup.py
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/__init__.py
Contents conflict in account_bob_import/__terp__.py
Contents conflict in account_bob_import/account_bob_import_config.xml
Contents conflict in account_bob_import/bob_import_step_1.py
Contents conflict in account_bob_import/bob_import_step_2.py
Conflict adding files to account_budget_project.  Created directory.
Conflict because account_budget_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_budget_project/__init__.py
Contents conflict in account_budget_project/__terp__.py
Contents conflict in account_budget_project/account_budget_project.py
Conflict adding files to account_cash_discount.  Created directory.
Conflict because account_cash_discount is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_cash_discount/__init__.py
Contents conflict in account_cash_discount/__terp__.py
Contents conflict in account_cash_discount/account_cash_discount.py
Conflict adding file account_coda.  Moved existing file to account_coda.moved.
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/__init__.py
Contents conflict in account_invoice_analytic_required/__terp__.py
Contents conflict in account_invoice_analytic_required/account_invoice_analytic_required.py
Conflict adding files to account_invoice_india.  Created directory.
Conflict because account_invoice_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/__init__.py
Contents conflict in account_invoice_india/__openerp__.py
Contents conflict in account_invoice_india/account_invoice.py
Conflict adding files to account_invoice_india/report.  Created directory.
Conflict because account_invoice_india/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/report/__init__.py
Contents conflict in account_invoice_india/report/account_journal.py
Contents conflict in account_invoice_india/report/aged_trial_balance.py
Contents conflict in account_invoice_india/report/general_ledger.py
Contents conflict in account_invoice_india/report/invoice.py
Contents conflict in account_invoice_india/report/partner_balance.py
Contents conflict in account_invoice_india/report/report_third_party_ledger.py
Conflict adding files to account_invoice_india/wizard.  Created directory.
Conflict because account_invoice_india/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/wizard/__init__.py
Contents conflict in account_invoice_india/wizard/account_chart_wizard.py
Contents conflict in account_invoice_india/wizard/account_create.py
Contents conflict in account_invoice_india/wizard/wizard_aged_trial_balance.py
Contents conflict in account_invoice_india/wizard/wizard_journal_ledger.py
Contents conflict in account_invoice_india/wizard/wizard_partner_balance_report.py
Contents conflict in account_invoice_india/wizard/wizard_third_party_ledger.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/__init__.py
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.
Contents conflict in account_invoice_payment_term/__init__.py
Contents conflict in account_invoice_payment_term/__terp__.py
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/__init__.py
Contents conflict in account_invoice_payment_term/report/invoice.py
Conflict adding files to account_journal_visibility.  Created directory.
Conflict because account_journal_visibility is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_journal_visibility/__init__.py
Contents conflict in account_journal_visibility/__terp__.py
Contents conflict in account_journal_visibility/account_journal.py
Conflict adding files to account_l10nbe_domiciliation.  Created directory.
Conflict because account_l10nbe_domiciliation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_l10nbe_domiciliation/__init__.py
Contents conflict in account_l10nbe_domiciliation/__terp__.py
Contents conflict in account_l10nbe_domiciliation/l10nbe_domiciliation.py
Contents conflict in account_l10nbe_domiciliation/l10nbe_domiciliation_view.xml
Conflict adding files to account_payment_export.  Created directory.
Conflict because account_payment_export is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_export/__init__.py
Contents conflict in account_payment_export/__terp__.py
Contents conflict in account_payment_export/payment_export.py
Conflict adding files to account_payment_export/wizard.  Created directory.
Conflict because account_payment_export/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_export/wizard/__init__.py
Contents conflict in account_payment_export/wizard/export_wizard.py
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/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/payment.py
Contents conflict in account_payment_extension/payment_view.xml
Conflict adding files to account_payment_extension/security.  Created directory.
Conflict because account_payment_extension/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/security/ir.model.access.csv
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/__terp__.py
Contents conflict in account_regularization/account.py
Conflict adding files to account_regularization/i18n.  Created directory.
Conflict because account_regularization/i18n is not versioned, but has versioned children.  Versioned directory.
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/account_regularization.py
Conflict adding files to account_reports_india.  Created directory.
Conflict because account_reports_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/__init__.py
Contents conflict in account_reports_india/__terp__.py
Conflict adding files to account_reports_india/report.  Created directory.
Conflict because account_reports_india/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/report/__init__.py
Contents conflict in account_reports_india/report/report_balance_sheet.py
Contents conflict in account_reports_india/report/report_balance_sheet_horizontal.py
Contents conflict in account_reports_india/report/report_pl_account.py
Contents conflict in account_reports_india/report/report_pl_horizontal.py
Contents conflict in account_reports_india/report/report_trial_balance.py
Contents conflict in account_reports_india/report/rml_parse.py
Conflict adding files to account_reports_india/wizard.  Created directory.
Conflict because account_reports_india/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/wizard/__init__.py
Contents conflict in account_reports_india/wizard/wizard_balance_sheet.py
Contents conflict in account_reports_india/wizard/wizard_pl_report.py
Contents conflict in account_reports_india/wizard/wizard_trial_balance_sheet.py
Conflict adding files to account_simulation.  Created directory.
Conflict because account_simulation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_simulation/__init__.py
Contents conflict in account_simulation/__terp__.py
Contents conflict in account_simulation/account_simulation.py
Contents conflict in account_simulation/account_simulation_view.xml
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/__init__.py
Contents conflict in account_simulation/wizard/wizard_account_chart.py
Conflict adding files to actions_server_mako_email.  Created directory.
Conflict because actions_server_mako_email is not versioned, but has versioned children.  Versioned directory.
Contents conflict in actions_server_mako_email/__init__.py
Contents conflict in actions_server_mako_email/__terp__.py
Contents conflict in actions_server_mako_email/asme.py
Conflict adding files to airport.  Created directory.
Conflict because airport is not versioned, but has versioned children.  Versioned directory.
Contents conflict in airport/__init__.py
Contents conflict in airport/__terp__.py
Contents conflict in airport/custom.py
Conflict adding files to analytic_partners.  Created directory.
Conflict because analytic_partners is not versioned, but has versioned children.  Versioned directory.
Contents conflict in analytic_partners/__init__.py
Contents conflict in analytic_partners/__terp__.py
Contents conflict in analytic_partners/analytic_partners.py
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/__init__.py
Contents conflict in analytic_partners/report/analytic_partners_report.py
Conflict adding files to asterisk.  Created directory.
Conflict because asterisk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/__init__.py
Contents conflict in asterisk/__openerp__.py
Contents conflict in asterisk/asterisk.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/rpc.py
Contents conflict in asterisk/script/simple_write.py
Contents conflict in asterisk/script/tiny_socket.py
Conflict adding files to asterisk/wizard.  Created directory.
Conflict because asterisk/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/wizard/__init__.py
Contents conflict in asterisk/wizard/partner_get.py
Conflict adding files to base_contact_city.  Created directory.
Conflict because base_contact_city is not versioned, but has versioned children.  Versioned directory.
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/__init__.py
Contents conflict in base_contact_team/base_contact_team.py
Contents conflict in base_contact_team/base_contact_team_view.xml
Conflict adding files to base_create_menu.  Created directory.
Conflict because base_create_menu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_create_menu/__init__.py
Contents conflict in base_create_menu/__terp__.py
Conflict adding files to base_create_menu/i18n.  Created directory.
Conflict because base_create_menu/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to base_create_menu/wizard.  Created directory.
Conflict because base_create_menu/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_create_menu/wizard/__init__.py
Contents conflict in base_create_menu/wizard/menu_wizard.py
Conflict: can't delete base_crypt.moved because it is not empty.  Not deleting.
Conflict adding file base_crypt.  Moved existing file to base_crypt.moved.
Conflict because base_crypt.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_crypt.moved/__init__.py
Contents conflict in base_crypt.moved/__openerp__.py
Contents conflict in base_crypt.moved/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/__init__.py
Contents conflict in base_language/__terp__.py
Contents conflict in base_language/base_language.py
Contents conflict in base_language/base_language_data.xml
Conflict adding file base_module_doc_rst.  Moved existing file to base_module_doc_rst.moved.
Conflict adding files to base_module_merge.  Created directory.
Conflict because base_module_merge is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_merge/__init__.py
Contents conflict in base_module_merge/__terp__.py
Conflict adding files to base_module_merge/wizard.  Created directory.
Conflict because base_module_merge/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_merge/wizard/__init__.py
Contents conflict in base_module_merge/wizard/base_module_merge.py
Conflict adding files to base_module_recorder.  Created directory.
Conflict because base_module_recorder is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_recorder/__init__.py
Contents conflict in base_module_recorder/__terp__.py
Conflict adding files to base_module_recorder/wizard.  Created directory.
Conflict because base_module_recorder/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_recorder/wizard/__init__.py
Contents conflict in base_module_recorder/wizard/base_module_recorder.py
Conflict adding files to base_partner_gender.  Created directory.
Conflict because base_partner_gender is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_gender/__init__.py
Contents conflict in base_partner_gender/__terp__.py
Contents conflict in base_partner_gender/base_partner_gender.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/__init__.py
Contents conflict in base_partner_relation/__terp__.py
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/__init__.py
Contents conflict in base_partner_sequence/__terp__.py
Contents conflict in base_partner_sequence/partner_sequence.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/__init__.py
Contents conflict in base_partner_surname/__openerp__.py
Contents conflict in base_partner_surname/partner.py
Contents conflict in base_partner_surname/partner_view.xml
Conflict adding files to base_report_model.  Created directory.
Conflict because base_report_model is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_report_model/__init__.py
Contents conflict in base_report_model/__terp__.py
Contents conflict in base_report_model/base_report_model.py
Conflict adding files to base_translation.  Created directory.
Conflict because base_translation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/__init__.py
Contents conflict in base_translation/__terp__.py
Conflict adding files to base_translation/scripts.  Created directory.
Conflict because base_translation/scripts is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/scripts/config.py
Contents conflict in base_translation/scripts/translation_server.py
Contents conflict in base_translation/translation.py
Conflict adding files to base_translation/wizard.  Created directory.
Conflict because base_translation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/wizard/__init__.py
Contents conflict in base_translation/wizard/config.py
Contents conflict in base_translation/wizard/wizard_download_file_for_contrib.py
Contents conflict in base_translation/wizard/wizard_download_file_for_publish.py
Contents conflict in base_translation/wizard/wizard_publish_new_version.py
Contents conflict in base_translation/wizard/wizard_review_proposed_contributions.py
Contents conflict in base_translation/wizard/wizard_upload_contribution.py
Conflict adding files to base_url_menu.  Created directory.
Conflict because base_url_menu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_url_menu/__init__.py
Contents conflict in base_url_menu/__terp__.py
Contents conflict in base_url_menu/base_url_menu.py
Conflict adding files to base_url_menu/wizard.  Created directory.
Conflict because base_url_menu/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_url_menu/wizard/__init__.py
Contents conflict in base_url_menu/wizard/base_url_menu_wizard.py
Conflict adding files to base_vat_unique.  Created directory.
Conflict because base_vat_unique is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_vat_unique/__init__.py
Contents conflict in base_vat_unique/base_vat_unique.py
Conflict adding files to base_vat_unique/i18n.  Created directory.
Conflict because base_vat_unique/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to board_dm.  Created directory.
Conflict because board_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_dm/__init__.py
Contents conflict in board_dm/__terp__.py
Conflict adding files to board_frontdesk.  Created directory.
Conflict because board_frontdesk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_frontdesk/__init__.py
Contents conflict in board_frontdesk/__terp__.py
Contents conflict in board_frontdesk/board_frontdesk_view.xml
Conflict adding files to board_project_portal.  Created directory.
Conflict because board_project_portal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_project_portal/__init__.py
Contents conflict in board_project_portal/__terp__.py
Contents conflict in board_project_portal/board_project_portal.py
Contents conflict in board_project_portal/bug_form.xml
Conflict adding files to board_reservation.  Created directory.
Conflict because board_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_reservation/__init__.py
Contents conflict in board_reservation/__terp__.py
Contents conflict in board_reservation/board_reservation_view.xml
Conflict adding files to board_restaurant.  Created directory.
Conflict because board_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_restaurant/__init__.py
Contents conflict in board_restaurant/__terp__.py
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/__init__.py
Contents conflict in board_service/__terp__.py
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/__init__.py
Contents conflict in bookstore/__openerp__.py
Contents conflict in bookstore/account.py
Contents conflict in bookstore/book_data.xml
Contents conflict in bookstore/bookstore.py
Contents conflict in bookstore/bookstore_data.xml
Contents conflict in bookstore/bookstore_view.xml
Conflict adding files to bookstore/i18n.  Created directory.
Conflict because bookstore/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/invoice.py
Contents conflict in bookstore/partner.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/__init__.py
Contents conflict in bookstore/report/invoice.py
Contents conflict in bookstore/report/invoice.rml
Contents conflict in bookstore/report/purchase_order.py
Contents conflict in bookstore/report/purchase_order.rml
Contents conflict in bookstore/report/quotation.py
Contents conflict in bookstore/report/quotation.rml
Contents conflict in bookstore/report/sales_order.py
Contents conflict in bookstore/report/sales_order.rml
Contents conflict in bookstore/report_intrastat.py
Contents conflict in bookstore/sale.py
Conflict adding files to c2c_analytic_wizard.  Created directory.
Conflict because c2c_analytic_wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/__init__.py
Contents conflict in c2c_analytic_wizard/__terp__.py
Conflict adding files to c2c_analytic_wizard/i18n.  Created directory.
Conflict because c2c_analytic_wizard/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/indicator_account_detail.py
Conflict adding files to c2c_analytic_wizard/report.  Created directory.
Conflict because c2c_analytic_wizard/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/report/__init__.py
Contents conflict in c2c_analytic_wizard/report/c2c_helper.py
Contents conflict in c2c_analytic_wizard/report/indicator_account_detail.py
Conflict adding files to c2c_analytic_wizard/wizard.  Created directory.
Conflict because c2c_analytic_wizard/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/wizard/__init__.py
Contents conflict in c2c_analytic_wizard/wizard/associate_analytic_line_from.py
Contents conflict in c2c_analytic_wizard/wizard/associate_analytic_line_toinvoice.py
Contents conflict in c2c_analytic_wizard/wizard/blank_invoice.py
Contents conflict in c2c_analytic_wizard/wizard/dissociate_aal_from_invoice.py
Contents conflict in c2c_analytic_wizard/wizard/indicator_account_detail.py
Contents conflict in c2c_analytic_wizard/wizard/invoice_create.py
Contents conflict in c2c_analytic_wizard/wizard/open_specified_analytic_line.py
Contents conflict in c2c_analytic_wizard/wizard/open_specified_invoices.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.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/__init__.py
Contents conflict in c2c_budget/report/budget_by_period.py
Contents conflict in c2c_budget/report/budget_consolidation.py
Contents conflict in c2c_budget/report/budget_vs_reality.py
Contents conflict in c2c_budget/report/compare_versions.py
Contents conflict in c2c_budget/report/helper.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/__init__.py
Contents conflict in c2c_budget/wizard/advanced_search.py
Contents conflict in c2c_budget/wizard/budget_by_period.py
Contents conflict in c2c_budget/wizard/budget_consolidation.py
Contents conflict in c2c_budget/wizard/budget_vs_reality.py
Contents conflict in c2c_budget/wizard/budgetlines_from_aa.py
Contents conflict in c2c_budget/wizard/compare_versions.py
Contents conflict in c2c_budget/wizard/validate_budget_structure.py
Conflict adding files to c2c_invoice_report.  Created directory.
Conflict because c2c_invoice_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/__init__.py
Contents conflict in c2c_invoice_report/__terp__.py
Conflict adding files to c2c_invoice_report/i18n.  Created directory.
Conflict because c2c_invoice_report/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to c2c_invoice_report/report.  Created directory.
Conflict because c2c_invoice_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/report/__init__.py
Contents conflict in c2c_invoice_report/report/invoice.py
Conflict adding files to c2c_invoice_report/view.  Created directory.
Conflict because c2c_invoice_report/view is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/view/__init__.py
Contents conflict in c2c_invoice_report/view/invoice.py
Conflict adding files to c2c_project_activities.  Created directory.
Conflict because c2c_project_activities is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_project_activities/__init__.py
Contents conflict in c2c_project_activities/__terp__.py
Contents conflict in c2c_project_activities/c2c_project_activities.py
Conflict adding files to c2c_project_activities/i18n.  Created directory.
Conflict because c2c_project_activities/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_project_activities/i18n/fr_FR.po
Conflict adding files to c2c_refresh_so_lines.  Created directory.
Conflict because c2c_refresh_so_lines is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_refresh_so_lines/__terp__.py
Conflict adding files to c2c_refresh_so_lines/i18n.  Created directory.
Conflict because c2c_refresh_so_lines/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_refresh_so_lines/sale.py
Conflict adding files to c2c_reporting_tools.  Created directory.
Conflict because c2c_reporting_tools is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/__init__.py
Contents conflict in c2c_reporting_tools/__terp__.py
Contents conflict in c2c_reporting_tools/c2c_helper.py
Contents conflict in c2c_reporting_tools/c2c_osv_debugger.py
Conflict adding files to c2c_reporting_tools/core.  Created directory.
Conflict because c2c_reporting_tools/core is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/core/__init__.py
Contents conflict in c2c_reporting_tools/core/table_elements.py
Conflict adding files to c2c_reporting_tools/demo.  Created directory.
Conflict because c2c_reporting_tools/demo is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/demo/__init__.py
Contents conflict in c2c_reporting_tools/demo/demo.py
Contents conflict in c2c_reporting_tools/demo/hello_world.py
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/__init__.py
Contents conflict in c2c_reporting_tools/flowables/color_legend.py
Contents conflict in c2c_reporting_tools/flowables/key_value_table.py
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/__init__.py
Contents conflict in c2c_reporting_tools/reports/standard_report.py
Conflict adding files to c2c_reporting_tools/templates.  Created directory.
Conflict because c2c_reporting_tools/templates is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/templates/__init__.py
Contents conflict in c2c_reporting_tools/templates/standard_template.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 c2c_timesheet_reports.  Created directory.
Conflict because c2c_timesheet_reports is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/__init__.py
Contents conflict in c2c_timesheet_reports/__terp__.py
Contents conflict in c2c_timesheet_reports/hr_employee.py
Conflict adding files to c2c_timesheet_reports/i18n.  Created directory.
Conflict because c2c_timesheet_reports/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/reminder.py
Conflict adding files to c2c_timesheet_reports/report.  Created directory.
Conflict because c2c_timesheet_reports/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/report/__init__.py
Contents conflict in c2c_timesheet_reports/report/timesheet_status.py
Conflict adding files to c2c_timesheet_reports/wizard.  Created directory.
Conflict because c2c_timesheet_reports/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/wizard/__init__.py
Contents conflict in c2c_timesheet_reports/wizard/reminder_config.py
Contents conflict in c2c_timesheet_reports/wizard/timesheet_status.py
Conflict adding file caldav.  Moved existing file to caldav.moved.
Conflict adding files to carrier_picking.  Created directory.
Conflict because carrier_picking is not versioned, but has versioned children.  Versioned directory.
Contents conflict in carrier_picking/__init__.py
Conflict adding files to carrier_picking/i18n.  Created directory.
Conflict because carrier_picking/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in carrier_picking/i18n/carrier_picking.pot
Contents conflict in carrier_picking/partner.py
Contents conflict in carrier_picking/partner_view.xml
Contents conflict in carrier_picking/stock.py
Contents conflict in carrier_picking/stock_view.xml
Conflict adding files to cci_account.  Created directory.
Conflict because cci_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/__init__.py
Contents conflict in cci_account/__terp__.py
Contents conflict in cci_account/cci_account.py
Contents conflict in cci_account/cci_account_report.xml
Contents conflict in cci_account/cci_account_view.xml
Contents conflict in cci_account/cci_account_wizard.xml
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/__init__.py
Contents conflict in cci_account/report/aged_trial_balance.py
Contents conflict in cci_account/report/cci_draft_invoice_info.py
Contents conflict in cci_account/report/cci_vcs_report.py
Contents conflict in cci_account/report/partner_balance.py
Contents conflict in cci_account/report/partner_balance.rml
Contents conflict in cci_account/report/report_account_invoice_layout.py
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/special_message_invoice.sxw
Contents conflict in cci_account/report/third_party_ledger.py
Conflict adding files to cci_account/wizard.  Created directory.
Conflict because cci_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/wizard/__init__.py
Contents conflict in cci_account/wizard/cci_switched_debit_credit.py
Contents conflict in cci_account/wizard/cci_use_model.py
Contents conflict in cci_account/wizard/cci_wizard_aged_trial_balance.py
Contents conflict in cci_account/wizard/cci_wizard_partner_balance_report.py
Contents conflict in cci_account/wizard/cci_wizard_third_party_ledger.py
Contents conflict in cci_account/wizard/cci_wizard_vcs.py
Contents conflict in cci_account/wizard/invoice_special_message.py
Conflict adding files to cci_audittrail.  Created directory.
Conflict because cci_audittrail is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_audittrail/__init__.py
Contents conflict in cci_audittrail/__terp__.py
Contents conflict in cci_audittrail/audittrail.py
Conflict adding files to cci_base_contact.  Created directory.
Conflict because cci_base_contact is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_base_contact/__init__.py
Contents conflict in cci_base_contact/__terp__.py
Contents conflict in cci_base_contact/cci_base_contact.py
Contents conflict in cci_base_contact/cci_base_contact_view.xml
Conflict adding files to cci_country.  Created directory.
Conflict because cci_country is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_country/__init__.py
Contents conflict in cci_country/__terp__.py
Contents conflict in cci_country/cci_country.py
Conflict adding files to cci_crm.  Created directory.
Conflict because cci_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_crm/__init__.py
Contents conflict in cci_crm/__terp__.py
Contents conflict in cci_crm/cci_crm.py
Contents conflict in cci_crm/cci_crm_data.xml
Contents conflict in cci_crm/cci_crm_view.xml
Conflict adding files to cci_crm_profile.  Created directory.
Conflict because cci_crm_profile is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_crm_profile/__init__.py
Contents conflict in cci_crm_profile/__terp__.py
Contents conflict in cci_crm_profile/cci_crm_profile.py
Contents conflict in cci_crm_profile/cci_crm_profile_view.xml
Conflict adding files to cci_data_csv.  Created directory.
Conflict because cci_data_csv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_data_csv/__init__.py
Contents conflict in cci_data_csv/__terp__.py
Conflict adding files to cci_event.  Created directory.
Conflict because cci_event is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_event/__init__.py
Contents conflict in cci_event/__terp__.py
Contents conflict in cci_event/cci_event.py
Contents conflict in cci_event/cci_event_view.xml
Contents conflict in cci_event/cci_event_wizard.xml
Conflict adding files to cci_event/wizard.  Created directory.
Conflict because cci_event/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_event/wizard/__init__.py
Contents conflict in cci_event/wizard/event_copy.py
Contents conflict in cci_event/wizard/registration_missing_checks.py
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/__init__.py
Contents conflict in cci_membership/__terp__.py
Contents conflict in cci_membership/cci_membership.py
Contents conflict in cci_membership/cci_membership_view.xml
Contents conflict in cci_membership/cci_membership_wizard.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/__init__.py
Contents conflict in cci_membership/report/report_members_total_sold.py
Conflict adding files to cci_membership/wizard.  Created directory.
Conflict because cci_membership/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/wizard/__init__.py
Contents conflict in cci_membership/wizard/members_total_sold.py
Contents conflict in cci_membership/wizard/show_partners.py
Conflict adding files to cci_mission.  Created directory.
Conflict because cci_mission is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/__init__.py
Contents conflict in cci_mission/__terp__.py
Contents conflict in cci_mission/cci_mission.py
Contents conflict in cci_mission/cci_mission_report.xml
Contents conflict in cci_mission/cci_mission_view.xml
Contents conflict in cci_mission/cci_mission_wizard.xml
Contents conflict in cci_mission/cci_mission_workflow.xml
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/__init__.py
Contents conflict in cci_mission/report/report_print_carnet.py
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/__init__.py
Contents conflict in cci_mission/wizard/cci_encode_cash.py
Contents conflict in cci_mission/wizard/create_invoice.py
Contents conflict in cci_mission/wizard/create_invoice_carnet.py
Contents conflict in cci_mission/wizard/create_invoice_embassy.py
Contents conflict in cci_mission/wizard/make_invoice_group.py
Contents conflict in cci_mission/wizard/wizard_create_embassy_folder.py
Contents conflict in cci_mission/wizard/wizard_federation_certificates_sending.py
Contents conflict in cci_mission/wizard/wizard_federation_sending.py
Contents conflict in cci_mission/wizard/wizard_print_carnet.py
Contents conflict in cci_mission/wizard/wizard_simulation_carnet.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/__init__.py
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
Contents conflict in cci_partner/cci_partner_wizard.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/__init__.py
Contents conflict in cci_partner/report/report_count_invoices.py
Conflict adding files to cci_partner/security.  Created directory.
Conflict because cci_partner/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/security/ir.model.access.csv
Conflict adding files to cci_partner/wizard.  Created directory.
Conflict because cci_partner/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/wizard/__init__.py
Contents conflict in cci_partner/wizard/cci_partner_event_history.py
Contents conflict in cci_partner/wizard/cci_wizard_sms.py
Contents conflict in cci_partner/wizard/cci_wizard_spam.py
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/__init__.py
Contents conflict in cci_purchase/__terp__.py
Contents conflict in cci_purchase/cci_purchase.py
Contents conflict in cci_purchase/cci_purchase_view.xml
Contents conflict in cci_purchase/cci_purchase_workflow.xml
Conflict adding files to cci_sales.  Created directory.
Conflict because cci_sales is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_sales/__init__.py
Contents conflict in cci_sales/__terp__.py
Contents conflict in cci_sales/cci_sales.py
Contents conflict in cci_sales/cci_sales_view.xml
Conflict adding files to cci_security.  Created directory.
Conflict because cci_security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_security/__terp__.py
Contents conflict in cci_security/import.py
Conflict adding files to cci_timesheet.  Created directory.
Conflict because cci_timesheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_timesheet/__init__.py
Contents conflict in cci_timesheet/__terp__.py
Contents conflict in cci_timesheet/cci_timesheet.py
Contents conflict in cci_timesheet/cci_timesheet_view.xml
Conflict adding files to cci_timesheet/wizard.  Created directory.
Conflict because cci_timesheet/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_timesheet/wizard/__init__.py
Contents conflict in cci_timesheet/wizard/create_timesheet_line.py
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/__init__.py
Contents conflict in cci_translation/__terp__.py
Contents conflict in cci_translation/cci_translation.py
Contents conflict in cci_translation/cci_translation_view.xml
Contents conflict in cci_translation/cci_translation_wizard.xml
Conflict adding files to cci_translation/wizard.  Created directory.
Conflict because cci_translation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_translation/wizard/__init__.py
Contents conflict in cci_translation/wizard/make_invoice.py
Conflict adding files to chemical.  Created directory.
Conflict because chemical is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to chemical/product.  Created directory.
Conflict because chemical/product is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chemical/product/product_view_chem.xml
Contents conflict in chemical/product/risque_securite_danger.py
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/__init__.py
Contents conflict in chricar_partner_parent_companies/__terp__.py
Conflict adding files to chricar_partner_parent_companies/i18n.  Created directory.
Conflict because chricar_partner_parent_companies/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to chricar_product_gtin.  Created directory.
Conflict because chricar_product_gtin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_product_gtin/__init__.py
Contents conflict in chricar_product_gtin/chricar_product_gtin.py
Conflict adding files to chricar_product_gtin/i18n.  Created directory.
Conflict because chricar_product_gtin/i18n is not versioned, but has versioned children.  Versioned directory.
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/__init__.py
Contents conflict in chricar_product_image/__terp__.py
Contents conflict in chricar_product_image/chricar_product_image.py
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/city.py
Contents conflict in city/city_view.xml
Conflict adding files to city/i18n.  Created directory.
Conflict because city/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to commission.  Created directory.
Conflict because commission is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/__init__.py
Contents conflict in commission/__terp__.py
Contents conflict in commission/commission.py
Contents conflict in commission/commission_sequence.xml
Contents conflict in commission/commission_view.xml
Contents conflict in commission/partner.py
Contents conflict in commission/partner_view.xml
Contents conflict in commission/pricelist.py
Contents conflict in commission/pricelist_view.xml
Conflict adding files to commission/report.  Created directory.
Conflict because commission/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/report/__init__.py
Contents conflict in commission/report/saleagent_info.py
Contents conflict in commission/saleagent.py
Contents conflict in commission/saleagent_demo.xml
Contents conflict in commission/saleagent_sequence.xml
Contents conflict in commission/saleagent_view.xml
Conflict adding files to commission/security.  Created directory.
Conflict because commission/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/security/ir.model.access.csv
Conflict adding files to commission/wizard.  Created directory.
Conflict because commission/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/wizard/__init__.py
Contents conflict in commission/wizard/all_commission.py
Contents conflict in commission/wizard/saleagent_info_wizard.py
Contents conflict in commission/wizard/wizard_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/i18n.  Created directory.
Conflict because comparison/i18n is not versioned, but has versioned children.  Versioned directory.
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
Conflict adding files to comparison/website/erpComparator/erpcomparator/config.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/config is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/config/__init__.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/planet_comparison.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet-cache.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/__init__.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/atomstyler.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/cache.py
Conflict adding files to comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging.  Created directory.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging/handlers.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/feedparser.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/htmltmpl.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/sanitize.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/timeoutsocket.py
Conflict adding files to crm_bayes.  Created directory.
Conflict because crm_bayes is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_bayes/__init__.py
Contents conflict in crm_bayes/__terp__.py
Contents conflict in crm_bayes/crm_bayes.py
Contents conflict in crm_bayes/crm_bayes_demo.xml
Contents conflict in crm_bayes/crm_bayes_view.xml
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/controllers.py
Contents conflict in crm_livechat/crm-lc/livechat/debug.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
Contents conflict in crm_livechat/crm-lc/livechat/xmlstream.py
Contents conflict in crm_livechat/crm_livechat.py
Conflict adding files to crm_telemarketing.  Created directory.
Conflict because crm_telemarketing is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/__init__.py
Contents conflict in crm_telemarketing/__terp__.py
Contents conflict in crm_telemarketing/crm_telemarketing.py
Conflict adding files to crm_telemarketing/i18n.  Created directory.
Conflict because crm_telemarketing/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to crm_telemarketing/report.  Created directory.
Conflict because crm_telemarketing/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/report/__init__.py
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/__init__.py
Contents conflict in crm_telemarketing/wizard/create_call_list.py
Contents conflict in crm_telemarketing/wizard/direct_poll.py
Contents conflict in crm_telemarketing/wizard/meeting_planify.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/__init__.py
Contents conflict in currency_rate/__terp__.py
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/__init__.py
Contents conflict in currency_rate/wizard/currency_rate.py
Conflict adding files to currency_rate_update.  Created directory.
Conflict because currency_rate_update is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate_update/__init__.py
Contents conflict in currency_rate_update/company.py
Contents conflict in currency_rate_update/company_view.xml
Contents conflict in currency_rate_update/currency_rate_update.py
Contents conflict in currency_rate_update/currency_rate_update.xml
Conflict adding files to currency_rate_update/security.  Created directory.
Conflict because currency_rate_update/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate_update/security/security.xml
Conflict adding files to demo_setup.  Created directory.
Conflict because demo_setup is not versioned, but has versioned children.  Versioned directory.
Contents conflict in demo_setup/__init__.py
Contents conflict in demo_setup/__terp__.py
Conflict adding files to demo_setup/i18n.  Created directory.
Conflict because demo_setup/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to discount_campaign.  Created directory.
Conflict because discount_campaign is not versioned, but has versioned children.  Versioned directory.
Contents conflict in discount_campaign/__init__.py
Contents conflict in discount_campaign/__terp__.py
Contents conflict in discount_campaign/discount_campaign.py
Contents conflict in discount_campaign/discount_campaign_view.xml
Conflict adding files to discount_campaign/security.  Created directory.
Conflict because discount_campaign/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in discount_campaign/security/ir.model.access.csv
Conflict adding files to dm.  Created directory.
Conflict because dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/__init__.py
Contents conflict in dm/__terp__.py
Contents conflict in dm/dm_campaign.py
Contents conflict in dm/dm_campaign_view.xml
Contents conflict in dm/dm_data.xml
Contents conflict in dm/dm_demo.xml
Contents conflict in dm/dm_document.py
Contents conflict in dm/dm_document_view.xml
Contents conflict in dm/dm_engine.py
Contents conflict in dm/dm_engine_view.xml
Contents conflict in dm/dm_inherit.py
Contents conflict in dm/dm_inherit_view.xml
Contents conflict in dm/dm_offer.py
Contents conflict in dm/dm_offer_step.py
Contents conflict in dm/dm_offer_step_view.xml
Contents conflict in dm/dm_offer_view.xml
Contents conflict in dm/dm_report.xml
Contents conflict in dm/dm_report_design.py
Contents conflict in dm/dm_wizard.xml
Contents conflict in dm/dm_workflow.xml
Conflict adding files to dm/i18n.  Created directory.
Conflict because dm/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/i18n/fr_FR.po
Conflict adding files to dm/plugin.  Created directory.
Conflict because dm/plugin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/plugin/__init__.py
Contents conflict in dm/plugin/current_time.py
Contents conflict in dm/plugin/customer_function.py
Contents conflict in dm/plugin/dynamic_text.py
Contents conflict in dm/plugin/php_url.py
Conflict adding files to dm/report.  Created directory.
Conflict because dm/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/report/__init__.py
Contents conflict in dm/report/dm_campaign.rml
Contents conflict in dm/report/dm_campaign_report.py
Contents conflict in dm/report/dm_document_report.py
Contents conflict in dm/report/dm_ir_action_report.py
Contents conflict in dm/report/dm_offer.rml
Contents conflict in dm/report/dm_offer.sxw
Contents conflict in dm/report/dm_offer_report.py
Contents conflict in dm/report/dm_print_offer_graph.py
Contents conflict in dm/report/pkg_insert_doc09_report.rml
Contents conflict in dm/report/pkg_insert_doc09_report.sxw
Conflict adding files to dm/security.  Created directory.
Conflict because dm/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/security/dm_security.xml
Contents conflict in dm/security/ir.model.access.csv
Conflict adding files to dm/wizard.  Created directory.
Conflict because dm/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/wizard/__init__.py
Contents conflict in dm/wizard/dm_address_after_sale_action.py
Contents conflict in dm/wizard/dm_all_document_report.py
Contents conflict in dm/wizard/dm_campaign_copy.py
Contents conflict in dm/wizard/dm_document_report.py
Contents conflict in dm/wizard/dm_offer_document.py
Contents conflict in dm/wizard/dm_partner_address_segments.py
Contents conflict in dm/wizard/dm_proposition_copy.py
Contents conflict in dm/wizard/dm_so_after_sale_action.py
Contents conflict in dm/wizard/dm_workitem_wizard.py
Conflict adding files to dm_after_sale.  Created directory.
Conflict because dm_after_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_after_sale/__init__.py
Contents conflict in dm_after_sale/__terp__.py
Contents conflict in dm_after_sale/dm_after_sale.py
Contents conflict in dm_after_sale/dm_after_sale_view.xml
Conflict adding files to dm_after_sale/security.  Created directory.
Conflict because dm_after_sale/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_after_sale/security/ir.model.access.csv
Conflict adding files to dm_base_contact.  Created directory.
Conflict because dm_base_contact is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_base_contact/__init__.py
Contents conflict in dm_base_contact/__terp__.py
Conflict adding files to dm_campaign_group.  Created directory.
Conflict because dm_campaign_group is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_campaign_group/__init__.py
Contents conflict in dm_campaign_group/__terp__.py
Contents conflict in dm_campaign_group/dm_campaign_group.py
Contents conflict in dm_campaign_group/dm_campaign_group_view.xml
Conflict adding files to dm_campaign_group/i18n.  Created directory.
Conflict because dm_campaign_group/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dm_campaign_group/wizard.  Created directory.
Conflict because dm_campaign_group/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_campaign_group/wizard/__init__.py
Contents conflict in dm_campaign_group/wizard/dm_campaign_group.py
Conflict adding files to dm_delivery.  Created directory.
Conflict because dm_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_delivery/__init__.py
Contents conflict in dm_delivery/__terp__.py
Contents conflict in dm_delivery/dm_delivery.py
Contents conflict in dm_delivery/dm_delivery_data.xml
Conflict adding files to dm_document.  Created directory.
Conflict because dm_document is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_document/__init__.py
Contents conflict in dm_document/__terp__.py
Conflict adding files to dm_emailvision.  Created directory.
Conflict because dm_emailvision is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_emailvision/__init__.py
Contents conflict in dm_emailvision/__terp__.py
Contents conflict in dm_emailvision/dm_emailvision_api.py
Contents conflict in dm_emailvision/dm_emailvision_data.xml
Contents conflict in dm_emailvision/dm_emailvision_view.xml
Conflict adding files to dm_extract.  Created directory.
Conflict because dm_extract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_extract/__init__.py
Contents conflict in dm_extract/__terp__.py
Contents conflict in dm_extract/dm_extract.py
Contents conflict in dm_extract/dm_extract_data.xml
Contents conflict in dm_extract/dm_extract_view.xml
Conflict adding files to dm_extract_sale.  Created directory.
Conflict because dm_extract_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_extract_sale/__init__.py
Contents conflict in dm_extract_sale/__terp__.py
Contents conflict in dm_extract_sale/dm_extract_sale.py
Contents conflict in dm_extract_sale/dm_extract_sale_view.xml
Conflict adding files to dm_lead.  Created directory.
Conflict because dm_lead is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_lead/__init__.py
Contents conflict in dm_lead/__terp__.py
Contents conflict in dm_lead/dm_lead.py
Contents conflict in dm_lead/dm_lead_data.xml
Contents conflict in dm_lead/dm_lead_view.xml
Conflict adding files to dm_partner_address.  Created directory.
Conflict because dm_partner_address is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_partner_address/__init__.py
Contents conflict in dm_partner_address/__terp__.py
Contents conflict in dm_partner_address/dm_partner_address.py
Contents conflict in dm_partner_address/dm_partner_address_view.xml
Conflict adding files to dm_payment_rules.  Created directory.
Conflict because dm_payment_rules is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dm_price_progression.  Created directory.
Conflict because dm_price_progression is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_price_progression/__init__.py
Contents conflict in dm_price_progression/__terp__.py
Contents conflict in dm_price_progression/dm_price_progression.py
Contents conflict in dm_price_progression/dm_price_progression_view.xml
Conflict adding files to dm_price_progression/i18n.  Created directory.
Conflict because dm_price_progression/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dm_price_progression/wizard.  Created directory.
Conflict because dm_price_progression/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_price_progression/wizard/__init__.py
Contents conflict in dm_price_progression/wizard/dm_proposition_products.py
Conflict adding files to dm_purchase.  Created directory.
Conflict because dm_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase/__init__.py
Contents conflict in dm_purchase/__terp__.py
Contents conflict in dm_purchase/dm_purchase.py
Contents conflict in dm_purchase/dm_purchase_view.xml
Conflict adding files to dm_purchase_advanced.  Created directory.
Conflict because dm_purchase_advanced is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase_advanced/__init__.py
Contents conflict in dm_purchase_advanced/__terp__.py
Contents conflict in dm_purchase_advanced/dm_purchase_advanced.py
Contents conflict in dm_purchase_advanced/dm_purchase_advanced_view.xml
Conflict adding files to dm_purchase_advanced/security.  Created directory.
Conflict because dm_purchase_advanced/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase_advanced/security/ir.model.access.csv
Conflict adding files to dm_retro_planning.  Created directory.
Conflict because dm_retro_planning is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/__init__.py
Contents conflict in dm_retro_planning/__terp__.py
Contents conflict in dm_retro_planning/dm_retro_planning.py
Contents conflict in dm_retro_planning/dm_retro_planning_view.xml
Conflict adding files to dm_retro_planning/security.  Created directory.
Conflict because dm_retro_planning/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/security/ir.model.access.csv
Conflict adding files to dm_retro_planning/wizard.  Created directory.
Conflict because dm_retro_planning/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/wizard/__init__.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_group_project.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_group_tasks.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_project.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_tasks.py
Conflict adding files to dm_sale.  Created directory.
Conflict because dm_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_sale/__init__.py
Contents conflict in dm_sale/__terp__.py
Contents conflict in dm_sale/dm_sale.py
Contents conflict in dm_sale/dm_sale_data.xml
Contents conflict in dm_sale/dm_sale_demo.xml
Contents conflict in dm_sale/dm_sale_view.xml
Conflict adding files to dm_simulator.  Created directory.
Conflict because dm_simulator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_simulator/__init__.py
Contents conflict in dm_simulator/__terp__.py
Contents conflict in dm_simulator/dm_simulator.py
Contents conflict in dm_simulator/dm_simulator_demo.xml
Contents conflict in dm_simulator/dm_simulator_view.xml
Conflict adding files to dm_website.  Created directory.
Conflict because dm_website is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_website/__init__.py
Contents conflict in dm_website/__terp__.py
Contents conflict in dm_website/dm_website.py
Contents conflict in dm_website/dm_website_data.xml
Contents conflict in dm_website/dm_website_demo.xml
Contents conflict in dm_website/dm_website_view.xml
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/__init__.py
Contents conflict in document_extension/__terp__.py
Contents conflict in document_extension/document.py
Conflict adding files to document_lock.  Created directory.
Conflict because document_lock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_lock/__init__.py
Contents conflict in document_lock/__terp__.py
Contents conflict in document_lock/document_lock.py
Conflict adding files to document_no_contentindex.  Created directory.
Conflict because document_no_contentindex is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_no_contentindex/__init__.py
Contents conflict in document_no_contentindex/__terp__.py
Contents conflict in document_no_contentindex/document_no_contentindex.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/__init__.py
Contents conflict in document_rule/__terp__.py
Contents conflict in document_rule/document_rule.py
Conflict adding files to document_sftp.  Created directory.
Conflict because document_sftp is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_sftp/__init__.py
Contents conflict in document_sftp/__terp__.py
Contents conflict in document_sftp/document.py
Conflict adding files to document_sftp/sftp_server.  Created directory.
Conflict because document_sftp/sftp_server is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_sftp/sftp_server/SFTPServer.py
Contents conflict in document_sftp/sftp_server/SFTPServerInterface.py
Contents conflict in document_sftp/sftp_server/Server.py
Contents conflict in document_sftp/sftp_server/__init__.py
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/__init__.py
Contents conflict in document_webdav_old/__terp__.py
Contents conflict in document_webdav_old/document.py
Conflict adding files to document_webdav_old/webdav.  Created directory.
Conflict because document_webdav_old/webdav is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to document_webdav_old/webdav/DAV.  Created directory.
Conflict because document_webdav_old/webdav/DAV is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_webdav_old/webdav/DAV/WebDAVServer.py
Contents conflict in document_webdav_old/webdav/__init__.py
Contents conflict in document_webdav_old/webdav/cache.py
Contents conflict in document_webdav_old/webdav/content_index.py
Contents conflict in document_webdav_old/webdav/dav_auth.py
Contents conflict in document_webdav_old/webdav/dav_fs.py
Contents conflict in document_webdav_old/webdav/odt2txt.py
Contents conflict in document_webdav_old/webdav/webdav_server.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/__init__.py
Contents conflict in ecommerce/catalog/catalog.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/__init__.py
Contents conflict in ecommerce/partner/partner.py
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/__init__.py
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 edi.  Created directory.
Conflict because edi is not versioned, but has versioned children.  Versioned directory.
Conflict adding file edi.  Moved existing file to edi.moved.
Contents conflict in edi/__init__.py
Contents conflict in edi/__terp__.py
Contents conflict in edi/edi.py
Contents conflict in edi/partner.py
Contents conflict in edi/sale_cust_price.py
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/__init__.py
Contents conflict in edi/wizard/edi_exchange.py
Contents conflict in edi/wizard/wizard_edi_export.py
Contents conflict in edi/wizard/wizard_edi_import.py
Conflict adding files to electronic_report_intrastat.  Created directory.
Conflict because electronic_report_intrastat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in electronic_report_intrastat/__init__.py
Contents conflict in electronic_report_intrastat/__terp__.py
Contents conflict in electronic_report_intrastat/report_intrastat.py
Conflict adding files to electronic_report_intrastat/wizard.  Created directory.
Conflict because electronic_report_intrastat/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in electronic_report_intrastat/wizard/__init__.py
Contents conflict in electronic_report_intrastat/wizard/wizard_intrastat_export.py
Conflict adding files to email_account.  Created directory.
Conflict because email_account is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to email_account/i18n.  Created directory.
Conflict because email_account/i18n is not versioned, but has versioned children.  Versioned directory.
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/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.
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/email_sale.pot
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/wizard_send_email.py
Conflict adding files to esale_ez.  Created directory.
Conflict because esale_ez is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_ez/__init__.py
Contents conflict in esale_ez/__terp__.py
Contents conflict in esale_ez/esale.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/esale_oscom.py
Contents conflict in esale_osc/esale_oscom_product.py
Conflict adding files to esale_osc/i18n.  Created directory.
Conflict because esale_osc/i18n is not versioned, but has versioned children.  Versioned directory.
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/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_update_select_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/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.
Contents conflict in etl/lib/demo/category_test.py
Contents conflict in etl/lib/demo/facebook_openerp.py
Contents conflict in etl/lib/demo/gcalendar_openerp.py
Contents conflict in etl/lib/demo/gdoc_test.py
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.
Contents conflict in etl/lib/demo/join.py
Contents conflict in etl/lib/demo/m2m_into_oo.py
Contents conflict in etl/lib/demo/map.py
Contents conflict in etl/lib/demo/openerp_facebook.py
Conflict adding files to etl/lib/demo/salesforce_crm.  Created directory.
Conflict because etl/lib/demo/salesforce_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/salesforce_crm/beatbox.py
Contents conflict in etl/lib/demo/salesforce_crm/demo.py
Contents conflict in etl/lib/demo/salesforce_crm/export.py
Contents conflict in etl/lib/demo/salesforce_crm/soql2atom.py
Contents conflict in etl/lib/demo/salesforce_crm/xmltramp.py
Contents conflict in etl/lib/demo/subjob.py
Contents conflict in etl/lib/demo/subjob2.py
Contents conflict in etl/lib/demo/sugercrm_openerp.py
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/test4.py
Contents conflict in etl/lib/demo/test5.py
Contents conflict in etl/lib/demo/test_server.py
Contents conflict in etl/lib/demo/test_unique.py
Contents conflict in etl/lib/demo/test_valid.py
Contents conflict in etl/lib/demo/vcard_openobject.py
Contents conflict in etl/lib/demo/vcard_read.py
Conflict adding files to etl/lib/demo/xml_test.  Created directory.
Conflict because etl/lib/demo/xml_test is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/xml_test/dicttoxml.py
Contents conflict in etl/lib/demo/xml_test/xmltodict.py
Contents conflict in etl/lib/demo/xmlrpc_in_block_example.py
Contents conflict in etl/lib/demo/xmlrpc_in_example.py
Contents conflict in etl/lib/demo/xmlrpc_out_block_example.py
Contents conflict in etl/lib/demo/xmlrpc_out_example.py
Contents conflict in etl/lib/demo/xmlrpcserver_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.
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/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
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
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/openobject_out.py
Contents conflict in etl/lib/etl/component/output/openobject_out_write.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_exist.py
Contents conflict in etl/lib/etl/component/transform/logger.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/openobject_connector.py
Contents conflict in etl/lib/etl/connector/sql_connector.py
Contents conflict in etl/lib/etl/job.py
Contents conflict in etl/lib/etl/logger.py
Contents conflict in etl/lib/etl/transition.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/etl_interface.py
Contents conflict in etl_interface/etl_interface_demo.xml
Conflict adding files to event_certificate.  Created directory.
Conflict because event_certificate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in event_certificate/__init__.py
Contents conflict in event_certificate/__openerp__.py
Contents conflict in event_certificate/event_certificate.py
Conflict adding files to event_certificate/report.  Created directory.
Conflict because event_certificate/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in event_certificate/report/__init__.py
Contents conflict in event_certificate/report/report_certificate.py
Contents conflict in event_certificate/report/rml_parse.py
Conflict adding files to fashion.  Created directory.
Conflict because fashion is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fashion/__init__.py
Contents conflict in fashion/__terp__.py
Contents conflict in fashion/custom.py
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/__init__.py
Contents conflict in fashion/wizard/fashion_help_wizard.py
Conflict adding files to flagey.  Created directory.
Conflict because flagey is not versioned, but has versioned children.  Versioned directory.
Contents conflict in flagey/__init__.py
Contents conflict in flagey/__terp__.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/__init__.py
Contents conflict in fleet_maintenance/__openerp__.py
Contents conflict in fleet_maintenance/crm.py
Contents conflict in fleet_maintenance/crm_sequence.xml
Contents conflict in fleet_maintenance/crm_view.xml
Contents conflict in fleet_maintenance/invoice.py
Contents conflict in fleet_maintenance/partner.py
Contents conflict in fleet_maintenance/product.py
Contents conflict in fleet_maintenance/sale.py
Contents conflict in fleet_maintenance/stock.py
Contents conflict in fleet_maintenance/stock_view.xml
Conflict adding files to game_scenario.  Created directory.
Conflict because game_scenario is not versioned, but has versioned children.  Versioned directory.
Contents conflict in game_scenario/__init__.py
Contents conflict in game_scenario/__terp__.py
Contents conflict in game_scenario/game_scenario.py
Conflict adding files to gnucash.  Created directory.
Conflict because gnucash is not versioned, but has versioned children.  Versioned directory.
Contents conflict in gnucash/gnccontent.py
Contents conflict in gnucash/gnucash_wizard.py
Conflict adding files to google_blogger.  Created directory.
Conflict because google_blogger is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_blogger/__init__.py
Contents conflict in google_blogger/__terp__.py
Contents conflict in google_blogger/google_blogger.py
Conflict adding files to google_blogger/wizard.  Created directory.
Conflict because google_blogger/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_blogger/wizard/__init__.py
Contents conflict in google_blogger/wizard/create_blog_tasks.py
Conflict adding files to google_calendar.  Created directory.
Conflict because google_calendar is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_calendar/__init__.py
Contents conflict in google_calendar/__terp__.py
Contents conflict in google_calendar/google_calendar.py
Contents conflict in google_calendar/google_calendar_view.xml
Contents conflict in google_calendar/google_calendar_wizard.xml
Conflict adding files to google_calendar/wizard.  Created directory.
Conflict because google_calendar/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_calendar/wizard/__init__.py
Contents conflict in google_calendar/wizard/synchronize_events.py
Conflict adding files to google_earth.  Created directory.
Conflict because google_earth is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/__init__.py
Contents conflict in google_earth/__terp__.py
Conflict adding files to google_earth/document.  Created directory.
Conflict because google_earth/document is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/google_earth.py
Conflict adding files to google_earth/wizard.  Created directory.
Conflict because google_earth/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/wizard/__init__.py
Contents conflict in google_earth/wizard/google_map_layer.py
Contents conflict in google_earth/wizard/google_map_open.py
Contents conflict in google_earth/wizard/google_map_turnover.py
Contents conflict in google_earth/wizard/google_route.py
Contents conflict in google_earth/wizard/goolge_network_link.py
Conflict adding files to google_translate.  Created directory.
Conflict because google_translate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_translate/__init__.py
Contents conflict in google_translate/google_translate.py
Conflict adding files to google_translate/wizard.  Created directory.
Conflict because google_translate/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_translate/wizard/__init__.py
Contents conflict in google_translate/wizard/term_translate.py
Conflict adding files to health.  Created directory.
Conflict because health is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/__terp__.py
Contents conflict in health/health.py
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/mouvementsemestriel.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/hotel.py
Contents conflict in hotel/hotel_view.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
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/hotel_housekeeping.py
Contents conflict in hotel_housekeeping/hotel_housekeeping_view.xml
Contents conflict in hotel_housekeeping/hotel_housekeeping_wizard.xml
Conflict adding files to hotel_housekeeping/report.  Created directory.
Conflict because hotel_housekeeping/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/report/__init__.py
Contents conflict in hotel_housekeeping/report/housekeeping_report.py
Conflict adding files to hotel_housekeeping/wizard.  Created directory.
Conflict because hotel_housekeeping/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/wizard/__init__.py
Contents conflict in hotel_housekeeping/wizard/housekeeping_wizard.py
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/__init__.py
Contents conflict in hotel_reservation/__terp__.py
Contents conflict in hotel_reservation/hotel_reservation.py
Contents conflict in hotel_reservation/hotel_reservation_view.xml
Contents conflict in hotel_reservation/hotel_reservation_wizard.xml
Conflict adding files to hotel_reservation/report.  Created directory.
Conflict because hotel_reservation/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/report/__init__.py
Contents conflict in hotel_reservation/report/hotel_reservation_report.py
Conflict adding files to hotel_reservation/wizard.  Created directory.
Conflict because hotel_reservation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/wizard/__init__.py
Contents conflict in hotel_reservation/wizard/hotel_reservation_wizard.py
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_view.xml
Contents conflict in hotel_restaurant/hotel_restaurant_wizard.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/hotel_restaurant_report.py
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/__init__.py
Contents conflict in hr_contract_available/__terp__.py
Contents conflict in hr_contract_available/hr_contract_available.py
Contents conflict in hr_contract_available/hr_contract_available_view.xml
Conflict adding files to hr_contract_available/security.  Created directory.
Conflict because hr_contract_available/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_available/security/ir.model.access.csv
Conflict adding files to hr_contract_timesheet.  Created directory.
Conflict because hr_contract_timesheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_timesheet/__init__.py
Contents conflict in hr_contract_timesheet/__terp__.py
Contents conflict in hr_contract_timesheet/hr_contract_timesheet.py
Conflict adding file hr_evaluation.  Moved existing file to hr_evaluation.moved.
Conflict adding files to hr_holidays_cci.  Created directory.
Conflict because hr_holidays_cci is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/__init__.py
Contents conflict in hr_holidays_cci/__terp__.py
Conflict adding files to hr_holidays_cci/report.  Created directory.
Conflict because hr_holidays_cci/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/report/__init__.py
Contents conflict in hr_holidays_cci/report/holidays_summary_report.py
Conflict adding files to hr_holidays_cci/wizard.  Created directory.
Conflict because hr_holidays_cci/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/wizard/__init__.py
Contents conflict in hr_holidays_cci/wizard/holidays_summary.py
Conflict adding files to hr_holidays_evaluation.  Created directory.
Conflict because hr_holidays_evaluation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_evaluation/__init__.py
Contents conflict in hr_holidays_evaluation/__terp__.py
Contents conflict in hr_holidays_evaluation/hr_holidays_evaluation.py
Contents conflict in hr_holidays_evaluation/hr_holidays_evaluation_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/__init__.py
Contents conflict in hr_holidays_request/__openerp__.py
Contents conflict in hr_holidays_request/hr_holidays_request.py
Contents conflict in hr_holidays_request/hr_holidays_request_view.xml
Contents conflict in hr_holidays_request/hr_workflow.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/__init__.py
Contents conflict in hr_holidays_request/report/hr_holiday_report.py
Contents conflict in hr_holidays_request/report/hr_holiday_report_form.py
Conflict adding files to hr_holidays_request/security.  Created directory.
Conflict because hr_holidays_request/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/security/ir.model.access.csv
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/__init__.py
Contents conflict in hr_holidays_request/wizard/hr_holiday.py
Conflict adding file hr_payroll.  Moved existing file to hr_payroll.moved.
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/__init__.py
Contents conflict in hr_performance/__terp__.py
Contents conflict in hr_performance/hr_performance.py
Contents conflict in hr_performance/hr_performance_view.xml
Contents conflict in hr_performance/hr_performance_workflow.xml
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/__init__.py
Contents conflict in hr_performance/report/hr_performance_report.py
Conflict adding files to hr_performance/security.  Created directory.
Conflict because hr_performance/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/security/ir.model.access.csv
Conflict adding files to hr_skill.  Created directory.
Conflict because hr_skill is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/__init__.py
Contents conflict in hr_skill/__openerp__.py
Contents conflict in hr_skill/hr_skill.py
Contents conflict in hr_skill/hrskill.py
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/__init__.py
Contents conflict in hr_skill/report/employeereport.py
Contents conflict in hr_skill/report/langreport.py
Contents conflict in hr_skill/report/skillreport.py
Conflict adding files to hr_skill/security.  Created directory.
Conflict because hr_skill/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/security/ir.model.access.csv
Conflict adding files to hr_skill/wizard.  Created directory.
Conflict because hr_skill/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/wizard/__init__.py
Contents conflict in hr_skill/wizard/datewise.py
Contents conflict in hr_skill/wizard/lang_wiz.py
Contents conflict in hr_skill/wizard/skill.py
Conflict adding files to hr_timesheet_ical.  Created directory.
Conflict because hr_timesheet_ical is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_timesheet_ical/__init__.py
Contents conflict in hr_timesheet_ical/__terp__.py
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.
Conflict adding files to huissier/barcode.  Created directory.
Conflict because huissier/barcode is not versioned, but has versioned children.  Versioned directory.
Contents conflict in huissier/barcode/code128.py
Contents conflict in huissier/barcode/common.py
Contents conflict in huissier/barcode/test.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/__init__.py
Contents conflict in import_export/__terp__.py
Contents conflict in import_export/partner.py
Contents conflict in import_export/product.py
Contents conflict in import_export/purchase.py
Contents conflict in import_export/sale.py
Conflict adding files to invoice_multi_currency.  Created directory.
Conflict because invoice_multi_currency is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_multi_currency/__init__.py
Contents conflict in invoice_multi_currency/__terp__.py
Contents conflict in invoice_multi_currency/invoice.py
Conflict adding files to invoice_multi_currency/wizard.  Created directory.
Conflict because invoice_multi_currency/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_multi_currency/wizard/__init__.py
Contents conflict in invoice_multi_currency/wizard/wizard_change_currency.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/__init__.py
Contents conflict in invoice_sequence/__terp__.py
Contents conflict in invoice_sequence/invoice.py
Conflict adding files to l10n_ca-qc.  Created directory.
Conflict because l10n_ca-qc is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ca-qc/__init__.py
Contents conflict in l10n_ca-qc/__terp__.py
Contents conflict in l10n_ca-qc/account_pc_canada.xml
Conflict adding files to l10n_ch_vat_brut.  Created directory.
Conflict because l10n_ch_vat_brut is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_brut/__init__.py
Contents conflict in l10n_ch_vat_brut/__terp__.py
Conflict adding files to l10n_ch_vat_forfait.  Created directory.
Conflict because l10n_ch_vat_forfait is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_forfait/__init__.py
Contents conflict in l10n_ch_vat_forfait/__terp__.py
Conflict adding files to l10n_ch_vat_net.  Created directory.
Conflict because l10n_ch_vat_net is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_net/__init__.py
Contents conflict in l10n_ch_vat_net/__terp__.py
Conflict adding files to l10n_chart_at.  Created directory.
Conflict because l10n_chart_at is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_at/__init__.py
Contents conflict in l10n_chart_at/__terp__.py
Conflict adding files to l10n_chart_au.  Created directory.
Conflict because l10n_chart_au is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_au/__init__.py
Contents conflict in l10n_chart_au/__terp__.py
Conflict adding files to l10n_chart_be_frnl.  Created directory.
Conflict because l10n_chart_be_frnl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_be_frnl/__init__.py
Contents conflict in l10n_chart_be_frnl/__terp__.py
Conflict adding files to l10n_chart_br.  Created directory.
Conflict because l10n_chart_br is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_br/__init__.py
Contents conflict in l10n_chart_br/__terp__.py
Conflict adding files to l10n_chart_ca_en.  Created directory.
Conflict because l10n_chart_ca_en is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ca_en/__init__.py
Contents conflict in l10n_chart_ca_en/__terp__.py
Conflict adding files to l10n_chart_ca_fr.  Created directory.
Conflict because l10n_chart_ca_fr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ca_fr/__init__.py
Contents conflict in l10n_chart_ca_fr/__terp__.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/__init__.py
Contents conflict in l10n_chart_ch_german/__terp__.py
Conflict adding files to l10n_chart_cn.  Created directory.
Conflict because l10n_chart_cn is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cn/__init__.py
Contents conflict in l10n_chart_cn/__terp__.py
Conflict adding files to l10n_chart_cn_traditional.  Created directory.
Conflict because l10n_chart_cn_traditional is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cn_traditional/__init__.py
Contents conflict in l10n_chart_cn_traditional/__terp__.py
Conflict adding files to l10n_chart_co.  Created directory.
Conflict because l10n_chart_co is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_co/__init__.py
Contents conflict in l10n_chart_co/__terp__.py
Conflict adding files to l10n_chart_cz.  Created directory.
Conflict because l10n_chart_cz is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cz/__init__.py
Contents conflict in l10n_chart_cz/__terp__.py
Conflict adding files to l10n_chart_da.  Created directory.
Conflict because l10n_chart_da is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_da/__init__.py
Contents conflict in l10n_chart_da/__terp__.py
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/__init__.py
Contents conflict in l10n_chart_de_skr03/__terp__.py
Conflict adding files to l10n_chart_hu.  Created directory.
Conflict because l10n_chart_hu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_hu/__init__.py
Contents conflict in l10n_chart_hu/__terp__.py
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_it.  Created directory.
Conflict because l10n_chart_it is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_it/__init__.py
Contents conflict in l10n_chart_it/__terp__.py
Conflict adding files to l10n_chart_it_cc2424.  Created directory.
Conflict because l10n_chart_it_cc2424 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_it_cc2424/__init__.py
Contents conflict in l10n_chart_it_cc2424/__terp__.py
Conflict adding files to l10n_chart_lv.  Created directory.
Conflict because l10n_chart_lv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_lv/__init__.py
Contents conflict in l10n_chart_lv/__terp__.py
Conflict adding files to l10n_chart_nl.  Created directory.
Conflict because l10n_chart_nl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_nl/__init__.py
Contents conflict in l10n_chart_nl/__terp__.py
Conflict adding files to l10n_chart_nl_standard.  Created directory.
Conflict because l10n_chart_nl_standard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_nl_standard/__init__.py
Contents conflict in l10n_chart_nl_standard/__terp__.py
Conflict adding files to l10n_chart_no.  Created directory.
Conflict because l10n_chart_no is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_no/__init__.py
Contents conflict in l10n_chart_no/__terp__.py
Conflict adding files to l10n_chart_pa.  Created directory.
Conflict because l10n_chart_pa is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_pa/__init__.py
Contents conflict in l10n_chart_pa/__terp__.py
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/__init__.py
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_chart_se.  Created directory.
Conflict because l10n_chart_se is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se/__init__.py
Contents conflict in l10n_chart_se/__terp__.py
Conflict adding files to l10n_chart_se_church.  Created directory.
Conflict because l10n_chart_se_church is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se_church/__init__.py
Contents conflict in l10n_chart_se_church/__terp__.py
Conflict adding files to l10n_chart_se_food.  Created directory.
Conflict because l10n_chart_se_food is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se_food/__init__.py
Contents conflict in l10n_chart_se_food/__terp__.py
Conflict adding files to l10n_chart_uk.  Created directory.
Conflict because l10n_chart_uk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_uk/__init__.py
Conflict adding files to l10n_chart_us_general.  Created directory.
Conflict because l10n_chart_us_general is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_general/__init__.py
Contents conflict in l10n_chart_us_general/__terp__.py
Contents conflict in l10n_chart_us_general/account_chart.xml
Contents conflict in l10n_chart_us_general/account_tax.xml
Contents conflict in l10n_chart_us_general/account_tax_code.xml
Conflict adding files to l10n_chart_us_manufacturing.  Created directory.
Conflict because l10n_chart_us_manufacturing is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_manufacturing/__init__.py
Contents conflict in l10n_chart_us_manufacturing/account_chart.xml
Contents conflict in l10n_chart_us_manufacturing/account_tax.xml
Contents conflict in l10n_chart_us_manufacturing/account_tax_code.xml
Contents conflict in l10n_chart_us_manufacturing/l10n_us_wizard.xml
Conflict adding files to l10n_chart_us_service.  Created directory.
Conflict because l10n_chart_us_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_service/__init__.py
Contents conflict in l10n_chart_us_service/__terp__.py
Contents conflict in l10n_chart_us_service/account_chart.xml
Contents conflict in l10n_chart_us_service/account_tax.xml
Contents conflict in l10n_chart_us_service/account_tax_code.xml
Contents conflict in l10n_chart_us_service/l10n_us_wizard.xml
Conflict adding files to l10n_chart_us_ucoa.  Created directory.
Conflict because l10n_chart_us_ucoa is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_ucoa/__init__.py
Contents conflict in l10n_chart_us_ucoa/__terp__.py
Contents conflict in l10n_chart_us_ucoa/account_chart.xml
Contents conflict in l10n_chart_us_ucoa/account_tax.xml
Contents conflict in l10n_chart_us_ucoa/account_tax_code.xml
Conflict adding files to l10n_chart_us_ucoa_ez.  Created directory.
Conflict because l10n_chart_us_ucoa_ez is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_ucoa_ez/__init__.py
Contents conflict in l10n_chart_us_ucoa_ez/__terp__.py
Contents conflict in l10n_chart_us_ucoa_ez/account_chart.xml
Contents conflict in l10n_chart_us_ucoa_ez/account_tax.xml
Contents conflict in l10n_chart_us_ucoa_ez/account_tax_code.xml
Conflict adding files to l10n_chart_ve.  Created directory.
Conflict because l10n_chart_ve is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ve/__init__.py
Contents conflict in l10n_chart_ve/__terp__.py
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.
Conflict adding files to l10n_fr_account_generation/i18n.  Created directory.
Conflict because l10n_fr_account_generation/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_fr_account_generation/partner.py
Conflict adding files to l10n_fr_export.  Created directory.
Conflict because l10n_fr_export is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to l10n_fr_export/i18n.  Created directory.
Conflict because l10n_fr_export/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to l10n_fr_pcg.  Created directory.
Conflict because l10n_fr_pcg is not versioned, but has versioned children.  Versioned directory.
Conflict adding file l10n_fr_rib.  Moved existing file to l10n_fr_rib.moved.
Conflict adding files to l10n_fr_tva_franchise.  Created directory.
Conflict because l10n_fr_tva_franchise is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to l10n_fr_tva_reel.  Created directory.
Conflict because l10n_fr_tva_reel is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to l10n_ma.  Created directory.
Conflict because l10n_ma is not versioned, but has versioned children.  Versioned directory.
Conflict adding file l10n_ma.  Moved existing file to l10n_ma.moved.
Contents conflict in l10n_ma/__init__.py
Contents conflict in l10n_ma/__terp__.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/tax_configure_wiz.py
Conflict adding files to label.  Created directory.
Conflict because label is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/__openerp__.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/partner_wizard.xml
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/report_partner_labels.py
Contents conflict in label/report_label_data.xml
Contents conflict in label/report_label_view.xml
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/wizard_partner_labels.py
Conflict adding files to labo_analysis.  Created directory.
Conflict because labo_analysis is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/__terp__.py
Contents conflict in labo_analysis/labo_analysis.py
Conflict adding files to labo_analysis/report.  Created directory.
Conflict because labo_analysis/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/report/__init__.py
Contents conflict in labo_analysis/report/invoice.py
Contents conflict in labo_analysis/report/labo_request_report.py
Contents conflict in labo_analysis/report/report_dna.py
Contents conflict in labo_analysis/report/report_followsheet_of_sample.py
Contents conflict in labo_analysis/report/report_scid_2007_0276.py
Contents conflict in labo_analysis/report/report_scrapie_2007.py
Contents conflict in labo_analysis/report/report_setup.py
Contents conflict in labo_analysis/report/report_stress_2007_0649.py
Conflict adding files to labo_analysis/wizard.  Created directory.
Conflict because labo_analysis/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/wizard/__init__.py
Contents conflict in labo_analysis/wizard/wizard_allsetting.py
Contents conflict in labo_analysis/wizard/wizard_analysiis_import_xls.py
Contents conflict in labo_analysis/wizard/wizard_import_resdog.py
Contents conflict in labo_analysis/wizard/wizard_repeat_line.py
Contents conflict in labo_analysis/wizard/wizard_setup.py
Conflict adding files to labo_stock.  Created directory.
Conflict because labo_stock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/__terp__.py
Conflict adding files to labo_stock/report.  Created directory.
Conflict because labo_stock/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/report/__init__.py
Contents conflict in labo_stock/report/report_composition_mix.py
Conflict adding files to labo_stock/wizard.  Created directory.
Conflict because labo_stock/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/wizard/wizard_invoice_article.py
Conflict adding files to library.  Created directory.
Conflict because library is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/__init__.py
Contents conflict in library/__openerp__.py
Contents conflict in library/account.py
Conflict adding files to library/i18n.  Created directory.
Conflict because library/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/i18n/fr_FR.po
Contents conflict in library/library.py
Contents conflict in library/library_data.xml
Contents conflict in library/library_editor_supplier.py
Contents conflict in library/library_view.xml
Contents conflict in library/library_wizard.xml
Contents conflict in library/mrp.py
Contents conflict in library/product.py
Contents conflict in library/purchase.py
Contents conflict in library/sale.py
Contents conflict in library/stock.py
Conflict adding files to library/wizard.  Created directory.
Conflict because library/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/wizard/__init__.py
Contents conflict in library/wizard/wizard_update_prices.py
Conflict adding files to loan.  Created directory.
Conflict because loan is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/__init__.py
Contents conflict in loan/__terp__.py
Contents conflict in loan/cheque.py
Contents conflict in loan/cheque_workflow.xml
Contents conflict in loan/installment.py
Contents conflict in loan/loan.py
Contents conflict in loan/loan_proof.py
Contents conflict in loan/loan_view.xml
Contents conflict in loan/loan_wizard.xml
Contents conflict in loan/loan_workflow.xml
Contents conflict in loan/loantype.py
Contents conflict in loan/loantype_view.xml
Conflict adding files to loan/report.  Created directory.
Conflict because loan/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/report/__init__.py
Contents conflict in loan/report/loan_details.py
Contents conflict in loan/report/loan_paper.py
Contents conflict in loan/report/partner_loan.py
Conflict adding files to loan/wizard.  Created directory.
Conflict because loan/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/wizard/__init__.py
Contents conflict in loan/wizard/wizard_cheque_state_process.py
Contents conflict in loan/wizard/wizard_create_account.py
Contents conflict in loan/wizard/wizard_partner_loan_report.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/__init__.py
Contents conflict in lunch/__terp__.py
Contents conflict in lunch/lunch.py
Conflict adding files to lunch/report.  Created directory.
Conflict because lunch/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in lunch/report/__init__.py
Contents conflict in lunch/report/order.py
Conflict adding files to lunch/wizard.  Created directory.
Conflict because lunch/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in lunch/wizard/__init__.py
Contents conflict in lunch/wizard/cancel.py
Contents conflict in lunch/wizard/confirm.py
Contents conflict in lunch/wizard/reset_box.py
Conflict adding files to magento_openerp_synchro.  Created directory.
Conflict because magento_openerp_synchro is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to magento_openerp_synchro/i18n.  Created directory.
Conflict because magento_openerp_synchro/i18n 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/__init__.py
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/__terp__.py
Contents conflict in maintenance_editor/maintenance_editor.py
Contents conflict in maintenance_editor/maintenance_editor_view.xml
Contents conflict in maintenance_editor/maintenance_report.xml
Conflict adding files to maintenance_editor/report.  Created directory.
Conflict because maintenance_editor/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in maintenance_editor/report/__init__.py
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.
Contents conflict in marketing/__init__.py
Contents conflict in marketing/__terp__.py
Conflict adding files to marketing/campaign.  Created directory.
Conflict because marketing/campaign is not versioned, but has versioned children.  Versioned directory.
Contents conflict in marketing/campaign/__init__.py
Contents conflict in marketing/campaign/campaign.py
Conflict adding files to marketing/campaign/wizard.  Created directory.
Conflict because marketing/campaign/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in marketing/campaign/wizard/__init__.py
Contents conflict in marketing/campaign/wizard/wizard_campaign_email.py
Contents conflict in marketing/campaign/wizard/wizard_campaign_partner_add.py
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/__init__.py
Contents conflict in md_hr_contract/__terp__.py
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_course.  Created directory.
Conflict because md_hr_course is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_course/__init__.py
Contents conflict in md_hr_course/__terp__.py
Contents conflict in md_hr_course/md_hr_course.py
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/__init__.py
Contents conflict in md_hr_employee/__terp__.py
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
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/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_report.py
Conflict adding files to merge_picking.  Created directory.
Conflict because merge_picking is not versioned, but has versioned children.  Versioned directory.
Contents conflict in merge_picking/__init__.py
Contents conflict in merge_picking/__terp__.py
Conflict adding files to merge_picking/wizard.  Created directory.
Conflict because merge_picking/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in merge_picking/wizard/__init__.py
Contents conflict in merge_picking/wizard/merge_picking.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/configurator_wizard.py
Conflict adding files to mrp_bom_customization/i18n.  Created directory.
Conflict because mrp_bom_customization/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_bom_customization/stock.py
Conflict adding files to mrp_production_report.  Created directory.
Conflict because mrp_production_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_production_report/__init__.py
Contents conflict in mrp_production_report/__terp__.py
Contents conflict in mrp_production_report/mrp.py
Conflict adding files to mrp_production_report/report.  Created directory.
Conflict because mrp_production_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_production_report/report/__init__.py
Contents conflict in mrp_production_report/report/order.py
Conflict adding files to mrp_state.  Created directory.
Conflict because mrp_state is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_state/__init__.py
Contents conflict in mrp_state/__terp__.py
Contents conflict in mrp_state/mrp.py
Conflict adding files to multi_company.  Created directory.
Conflict because multi_company is not versioned, but has versioned children.  Versioned directory.
Conflict adding file multi_company.  Moved existing file to multi_company.moved.
Contents conflict in multi_company/__init__.py
Contents conflict in multi_company/__terp__.py
Conflict adding files to multi_company/i18n.  Created directory.
Conflict because multi_company/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company/i18n/pt_BR.po
Contents conflict in multi_company/i18n/zh_CN.po
Contents conflict in multi_company/i18n/zh_TW.po
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
Conflict adding files to multi_company_account/i18n.  Created directory.
Conflict because multi_company_account/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/i18n/pt_BR.po
Contents conflict in multi_company_account/i18n/zh_CN.po
Contents conflict in multi_company_account/i18n/zh_TW.po
Contents conflict in multi_company_account/multi_company_account.py
Conflict adding files to multi_company_account/wizard.  Created directory.
Conflict because multi_company_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/wizard/__init__.py
Contents conflict in multi_company_account/wizard/company_header_footer_setup.py
Contents conflict in multi_company_account/wizard/wizard_journal.py
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/__init__.py
Contents conflict in multi_company_currency/__terp__.py
Contents conflict in multi_company_currency/multi_currency.py
Conflict adding files to multi_company_hr_timesheet_sheet.  Created directory.
Conflict because multi_company_hr_timesheet_sheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_hr_timesheet_sheet/__init__.py
Contents conflict in multi_company_hr_timesheet_sheet/__terp__.py
Contents conflict in multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
Conflict adding files to multi_company_product.  Created directory.
Conflict because multi_company_product is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_product/__init__.py
Contents conflict in multi_company_product/__terp__.py
Contents conflict in multi_company_product/product.py
Conflict adding files to multi_company_project.  Created directory.
Conflict because multi_company_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_project/__init__.py
Contents conflict in multi_company_project/__terp__.py
Contents conflict in multi_company_project/multi_company_project.py
Conflict adding files to multi_company_sequence.  Created directory.
Conflict because multi_company_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_sequence/__init__.py
Contents conflict in multi_company_sequence/__terp__.py
Contents conflict in multi_company_sequence/multi_company_sequence.py
Conflict adding files to multi_company_stock.  Created directory.
Conflict because multi_company_stock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_stock/__init__.py
Contents conflict in multi_company_stock/__terp__.py
Contents conflict in multi_company_stock/multi_company_stock.py
Conflict adding files to multilogin_portal.  Created directory.
Conflict because multilogin_portal is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to network.  Created directory.
Conflict because network is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/__init__.py
Conflict adding files to network/i18n.  Created directory.
Conflict because network/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/i18n/network.pot
Contents conflict in network/network.py
Contents conflict in network/network_demo.xml
Contents conflict in network/network_report.xml
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
Contents conflict in network/security/network_security.xml
Conflict adding files to network_extension.  Created directory.
Conflict because network_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/__init__.py
Conflict adding files to network_extension/i18n.  Created directory.
Conflict because network_extension/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/i18n/network_extension.pot
Contents conflict in network_extension/network.py
Contents conflict in network_extension/network_protocol_data.xml
Contents conflict in network_extension/network_view.xml
Conflict adding files to network_extension/security.  Created directory.
Conflict because network_extension/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/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/cube.  Created directory.
Conflict because olap/cube is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/level.py
Contents conflict in olap/cube/warehouse.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/__init__.py
Contents conflict in olap_crm/__terp__.py
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/__init__.py
Contents conflict in olap_extract/__terp__.py
Contents conflict in olap_extract/wizard_olap_extract.py
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/__init__.py
Contents conflict in olap_sale/__terp__.py
Conflict adding files to openerp_dia.  Created directory.
Conflict because openerp_dia is not versioned, but has versioned children.  Versioned directory.
Contents conflict in openerp_dia/codegen_openerp.py
Conflict adding files to partner_informations.  Created directory.
Conflict because partner_informations is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_informations/__init__.py
Contents conflict in partner_informations/__terp__.py
Conflict adding files to partner_informations/i18n.  Created directory.
Conflict because partner_informations/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_informations/partner_informations.py
Conflict adding files to partner_layout.  Created directory.
Conflict because partner_layout is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_layout/__init__.py
Contents conflict in partner_layout/__terp__.py
Contents conflict in partner_layout/partner_layout.py
Conflict adding files to partner_ldap.  Created directory.
Conflict because partner_ldap is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_ldap/__init__.py
Contents conflict in partner_ldap/__terp__.py
Contents conflict in partner_ldap/partner.py
Conflict adding files to partner_ldap/wizard.  Created directory.
Conflict because partner_ldap/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_ldap/wizard/__init__.py
Contents conflict in partner_ldap/wizard/synchronize.py
Conflict adding files to partner_nace.  Created directory.
Conflict because partner_nace is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_nace/__init__.py
Contents conflict in partner_nace/__terp__.py
Conflict adding files to partner_nace/i18n.  Created directory.
Conflict because partner_nace/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to partner_spam.  Created directory.
Conflict because partner_spam is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to partner_spam/i18n.  Created directory.
Conflict because partner_spam/i18n is not versioned, but has versioned children.  Versioned directory.
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/wizard_spam.py
Conflict adding files to personal_base.  Created directory.
Conflict because personal_base is not versioned, but has versioned children.  Versioned directory.
Contents conflict in personal_base/account.py
Contents conflict in personal_base/personal_base.csv
Conflict adding file point_of_sale.  Moved existing file to point_of_sale.moved.
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/__init__.py
Contents conflict in portal/__terp__.py
Conflict adding files to portal/i18n.  Created directory.
Conflict because portal/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal/i18n/pt_BR.po
Contents conflict in portal/i18n/zh_CN.po
Contents conflict in portal/i18n/zh_TW.po
Contents conflict in portal/portal.py
Contents conflict in portal/portal_view.xml
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/__init__.py
Contents conflict in portal/wizard/create_menu.py
Contents conflict in portal/wizard/create_user.py
Conflict adding files to portal_account.  Created directory.
Conflict because portal_account is not versioned, but has versioned children.  Versioned directory.
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/__init__.py
Contents conflict in portal_analytic/portal_analytic_view.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_project.  Created directory.
Conflict because portal_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_project/__terp__.py
Contents conflict in portal_project/portal_project.py
Contents conflict in portal_project/portal_project_data.xml
Contents conflict in portal_project/portal_project_view.xml
Conflict adding files to portal_project/wizard.  Created directory.
Conflict because portal_project/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_project/wizard/wizard_check_section.py
Conflict adding files to portal_sale.  Created directory.
Conflict because portal_sale is not versioned, but has versioned children.  Versioned directory.
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/__init__.py
Contents conflict in portal_service/scrum.py
Conflict adding files to portal_service/wizard.  Created directory.
Conflict because portal_service/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_service/wizard/__init__.py
Contents conflict in portal_service/wizard/case_get_open.py
Conflict adding files to portal_training.  Created directory.
Conflict because portal_training is not versioned, but has versioned children.  Versioned directory.
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/__init__.py
Contents conflict in product_catalog_report/__openerp__.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/__init__.py
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_catalog_report/wizard.  Created directory.
Conflict because product_catalog_report/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/wizard/__init__.py
Contents conflict in product_catalog_report/wizard/wizard_product_catalog.py
Conflict adding files to product_electronic.  Created directory.
Conflict because product_electronic is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_electronic/__init__.py
Contents conflict in product_electronic/__terp__.py
Contents conflict in product_electronic/product_electronic.py
Contents conflict in product_electronic/product_electronic_view.xml
Conflict adding files to product_electronic/security.  Created directory.
Conflict because product_electronic/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_electronic/security/ir.model.access.csv
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/__init__.py
Contents conflict in product_expiry/__terp__.py
Contents conflict in product_expiry/product_expiry.py
Contents conflict in product_expiry/product_expiry_demo.xml
Contents conflict in product_expiry/product_expiry_view.xml
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/__openerp__.py
Conflict adding files to product_extended/i18n.  Created directory.
Conflict because product_extended/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/mrp_view.xml
Contents conflict in product_extended/product_extended.py
Contents conflict in product_extended/product_extended_view.xml
Conflict adding files to product_extended/wizard.  Created directory.
Conflict because product_extended/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/wizard/wizard_price.py
Conflict adding files to product_gtin.  Created directory.
Conflict because product_gtin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_gtin/__terp__.py
Conflict adding files to product_index.  Created directory.
Conflict because product_index is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_index/__init__.py
Contents conflict in product_index/__terp__.py
Contents conflict in product_index/product_index.py
Conflict adding files to product_listprice_upgrade.  Created directory.
Conflict because product_listprice_upgrade is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_listprice_upgrade/__init__.py
Contents conflict in product_listprice_upgrade/__terp__.py
Contents conflict in product_listprice_upgrade/product_wizard.xml
Conflict adding files to product_listprice_upgrade/wizard.  Created directory.
Conflict because product_listprice_upgrade/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_listprice_upgrade/wizard/__init__.py
Contents conflict in product_listprice_upgrade/wizard/wizard_product_listprice.py
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/__init__.py
Contents conflict in product_lot_foundry/__terp__.py
Contents conflict in product_lot_foundry/product_lot_foundry.py
Contents conflict in product_lot_foundry/purchase_auto.py
Conflict adding files to product_m2mcategories.  Created directory.
Conflict because product_m2mcategories is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_m2mcategories/product.py
Contents conflict in product_m2mcategories/product_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
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/__init__.py
Contents conflict in product_search_reference/__terp__.py
Contents conflict in product_search_reference/product.py
Conflict adding files to product_serial.  Created directory.
Conflict because product_serial is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_serial/__init__.py
Contents conflict in product_serial/__openerp__.py
Contents conflict in product_serial/product.py
Contents conflict in product_serial/product_view.xml
Contents conflict in product_serial/stock.py
Contents conflict in product_serial/stock_view.xml
Conflict adding files to product_series.  Created directory.
Conflict because product_series is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to product_size.  Created directory.
Conflict because product_size is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_size/__init__.py
Contents conflict in product_size/__terp__.py
Contents conflict in product_size/product_size.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/configurator_view.xml
Contents conflict in product_variant_configurator/configurator_wizard.py
Conflict adding files to product_variant_configurator/i18n.  Created directory.
Conflict because product_variant_configurator/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_configurator/product.py
Contents conflict in product_variant_configurator/sale.py
Contents conflict in product_variant_configurator/sale_view.xml
Conflict adding files to product_variant_configurator/security.  Created directory.
Conflict because product_variant_configurator/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_configurator/security/ir.model.access.csv
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/demo_data.xml
Conflict adding files to product_variant_multi/i18n.  Created directory.
Conflict because product_variant_multi/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/i18n/product_variant_multi.pot
Contents conflict in product_variant_multi/product_variant.py
Contents conflict in product_variant_multi/product_view.xml
Conflict adding files to product_variant_multi/security.  Created directory.
Conflict because product_variant_multi/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/security/ir.model.access.csv
Conflict adding file product_visible_discount.  Moved existing file to product_visible_discount.moved.
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/__init__.py
Contents conflict in productivity_analysis/__terp__.py
Contents conflict in productivity_analysis/productivity_analysis.py
Conflict adding files to productivity_analysis/report.  Created directory.
Conflict because productivity_analysis/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/report/__init__.py
Contents conflict in productivity_analysis/report/productivity_analysis.py
Conflict adding files to productivity_analysis/wizard.  Created directory.
Conflict because productivity_analysis/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/wizard/__init__.py
Contents conflict in productivity_analysis/wizard/wizard_pa_report.py
Conflict adding files to profile_account_india.  Created directory.
Conflict because profile_account_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_account_india/__init__.py
Contents conflict in profile_account_india/__terp__.py
Conflict adding files to profile_ampco.  Created directory.
Conflict because profile_ampco is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_ampco/__init__.py
Contents conflict in profile_ampco/__terp__.py
Conflict adding files to profile_bi.  Created directory.
Conflict because profile_bi is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_bi/__init__.py
Contents conflict in profile_bi/__terp__.py
Conflict adding files to profile_bookstore.  Created directory.
Conflict because profile_bookstore is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_bookstore/__init__.py
Contents conflict in profile_bookstore/__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/__terp__.py
Contents conflict in profile_business_game/profile_game_config.xml
Contents conflict in profile_business_game/profile_game_data.xml
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/__init__.py
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 profile_hotel.  Created directory.
Conflict because profile_hotel is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to profile_training.  Created directory.
Conflict because profile_training is not versioned, but has versioned children.  Versioned directory.
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/proforma.py
Conflict adding files to project_contact.  Created directory.
Conflict because project_contact is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to project_crm.  Created directory.
Conflict because project_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_crm/__terp__.py
Contents conflict in project_crm/project_crm.py
Conflict adding files to project_event.  Created directory.
Conflict because project_event is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_event/project_event.py
Conflict adding files to project_idea.  Created directory.
Conflict because project_idea is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_idea/__terp__.py
Conflict adding files to project_timesheet_contract.  Created directory.
Conflict because project_timesheet_contract is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to project_timesheet_contract/hr.  Created directory.
Conflict because project_timesheet_contract/hr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_timesheet_contract/hr/hr_employee.py
Conflict adding files to purchase_approve.  Created directory.
Conflict because purchase_approve is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_approve/__init__.py
Contents conflict in purchase_approve/__terp__.py
Conflict adding files to purchase_confirm.  Created directory.
Conflict because purchase_confirm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_confirm/__init__.py
Contents conflict in purchase_confirm/__terp__.py
Conflict adding files to purchase_confirm/wizard.  Created directory.
Conflict because purchase_confirm/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_confirm/wizard/__init__.py
Contents conflict in purchase_confirm/wizard/po_confirm.py
Conflict adding files to purchase_delivery.  Created directory.
Conflict because purchase_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_delivery/__init__.py
Contents conflict in purchase_delivery/__terp__.py
Contents conflict in purchase_delivery/delivery.py
Contents conflict in purchase_delivery/purchase.py
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/__init__.py
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/__init__.py
Contents conflict in purchase_discount/__terp__.py
Contents conflict in purchase_discount/purchase_discount.py
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/__init__.py
Contents conflict in purchase_discount/report/order.py
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/__init__.py
Contents conflict in purchase_journal/__terp__.py
Contents conflict in purchase_journal/purchase_journal.py
Contents conflict in purchase_journal/purchase_journal_inherit.py
Contents conflict in purchase_journal/purchase_journal_report.py
Conflict adding files to purchase_number.  Created directory.
Conflict because purchase_number is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to purchase_tax_include.  Created directory.
Conflict because purchase_tax_include is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_tax_include/__init__.py
Contents conflict in purchase_tax_include/purchase_tax_incl.py
Contents conflict in purchase_tax_include/purchase_tax_incl.xml
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/__init__.py
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
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/radiotv.pot
Contents conflict in radiotv/radiotv.py
Contents conflict in radiotv/radiotv_view.xml
Contents conflict in radiotv/radiotv_wizard.xml
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_compact_report.rml
Contents conflict in radiotv/report/broadcast_compact_report.sxw
Contents conflict in radiotv/report/broadcast_compact_report_v2.rml
Contents conflict in radiotv/report/broadcast_declaration_report.py
Contents conflict in radiotv/report/broadcast_declaration_report.rml
Contents conflict in radiotv/report/broadcast_declaration_report.sxw
Contents conflict in radiotv/report/broadcast_report.py
Contents conflict in radiotv/report/broadcast_report.rml
Contents conflict in radiotv/report/broadcast_report.sxw
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_analytic2.  Created directory.
Conflict because report_analytic2 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic2/__terp__.py
Contents conflict in report_analytic2/account_analytic_analysis_view.xml
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/__init__.py
Contents conflict in report_analytic_planning_delegate/__terp__.py
Contents conflict in report_analytic_planning_delegate/report_analytic_planning.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/__init__.py
Contents conflict in report_analytic_planning_long_term/__terp__.py
Contents conflict in report_analytic_planning_long_term/report_analytic_planning_long_term.py
Contents conflict in report_analytic_planning_long_term/report_analytic_planning_long_term_view.xml
Conflict adding files to report_auction.  Created directory.
Conflict because report_auction is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_auction/__init__.py
Contents conflict in report_auction/__terp__.py
Contents conflict in report_auction/report_auction.py
Conflict adding files to report_dm.  Created directory.
Conflict because report_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_dm/__terp__.py
Conflict adding files to report_hotel_reservation.  Created directory.
Conflict because report_hotel_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_hotel_reservation/__terp__.py
Contents conflict in report_hotel_reservation/report_hotel_reservation_view.xml
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/report_hotel_restaurant_view.xml
Conflict adding files to report_timesheet_user.  Created directory.
Conflict because report_timesheet_user is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_timesheet_user/__init__.py
Contents conflict in report_timesheet_user/__terp__.py
Contents conflict in report_timesheet_user/report_timesheet_user.py
Conflict adding files to sale_advertising.  Created directory.
Conflict because sale_advertising is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_advertising/__init__.py
Contents conflict in sale_advertising/__terp__.py
Contents conflict in sale_advertising/sale_advertising.py
Contents conflict in sale_advertising/sale_advertising_demo.xml
Contents conflict in sale_advertising/sale_advertising_view.xml
Conflict adding files to sale_advertising/security.  Created directory.
Conflict because sale_advertising/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_advertising/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.
Contents conflict in sale_category/__init__.py
Contents conflict in sale_category/__terp__.py
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/__init__.py
Contents conflict in sale_category/report/sale_category_report.py
Contents conflict in sale_category/sale.py
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/__init__.py
Contents conflict in sale_delivery/sale_delivery.py
Conflict adding files to sale_delivery/security.  Created directory.
Conflict because sale_delivery/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_delivery/security/ir.model.access.csv
Conflict adding files to sale_expected_invoice_date.  Created directory.
Conflict because sale_expected_invoice_date is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_expected_invoice_date/__init__.py
Contents conflict in sale_expected_invoice_date/__terp__.py
Contents conflict in sale_expected_invoice_date/sale_expected_invoice_date.py
Conflict adding files to sale_forecast.  Created directory.
Conflict because sale_forecast is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/__init__.py
Contents conflict in sale_forecast/__openerp__.py
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/__init__.py
Contents conflict in sale_forecast/report/sale_forecast_salesman.py
Contents conflict in sale_forecast/report/sale_forecasts_report.py
Contents conflict in sale_forecast/sale_forecast.py
Contents conflict in sale_forecast/sale_forecast_view.xml
Conflict adding files to sale_forecast/security.  Created directory.
Conflict because sale_forecast/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/security/ir.model.access.csv
Conflict adding files to sale_forecast/wizard.  Created directory.
Conflict because sale_forecast/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/wizard/__init__.py
Contents conflict in sale_forecast/wizard/sale_forecast_wizard.py
Conflict adding files to sale_intercompany.  Created directory.
Conflict because sale_intercompany is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to sale_intercompany/wizard.  Created directory.
Conflict because sale_intercompany/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_intercompany/wizard/makesale.py
Conflict adding files to sale_intercompany_auto.  Created directory.
Conflict because sale_intercompany_auto is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_intercompany_auto/__init__.py
Contents conflict in sale_intercompany_auto/__terp__.py
Contents conflict in sale_intercompany_auto/sale_interco.py
Conflict adding file sale_layout.  Moved existing file to sale_layout.moved.
Conflict adding files to sale_margin.  Created directory.
Conflict because sale_margin is not versioned, but has versioned children.  Versioned directory.
Conflict adding file sale_margin.  Moved existing file to sale_margin.moved.
Contents conflict in sale_margin/__init__.py
Contents conflict in sale_margin/__terp__.py
Contents conflict in sale_margin/invoice_margin.py
Contents conflict in sale_margin/report_margin.py
Contents conflict in sale_margin/sale_margin.py
Conflict adding files to sale_margin_delivery.  Created directory.
Conflict because sale_margin_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_margin_delivery/__init__.py
Contents conflict in sale_margin_delivery/__terp__.py
Contents conflict in sale_margin_delivery/sale_margin_delivery.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/__init__.py
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/__init__.py
Contents conflict in sale_numbers/report/sale_order.py
Contents conflict in sale_numbers/sale_order.py
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
Conflict adding files to sale_payment/i18n.  Created directory.
Conflict because sale_payment/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_payment/sale_payment.py
Contents conflict in sale_payment/sale_payment_view.xml
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
Conflict adding files to sale_product_multistep_configurator/i18n.  Created directory.
Conflict because sale_product_multistep_configurator/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_product_multistep_configurator/sale.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_product_multistep_configurator/security.  Created directory.
Conflict because sale_product_multistep_configurator/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_product_multistep_configurator/security/ir.model.access.csv
Conflict adding files to sale_rebate.  Created directory.
Conflict because sale_rebate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_rebate/__init__.py
Contents conflict in sale_rebate/__terp__.py
Contents conflict in sale_rebate/sale.py
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/__init__.py
Contents conflict in sale_supplier_direct_delivery/mrp.py
Contents conflict in sale_supplier_direct_delivery/partner.py
Contents conflict in sale_supplier_direct_delivery/product.py
Contents conflict in sale_supplier_direct_delivery/product_view.xml
Contents conflict in sale_supplier_direct_delivery/purchase.py
Conflict adding files to sale_supplier_direct_delivery/report.  Created directory.
Conflict because sale_supplier_direct_delivery/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_supplier_direct_delivery/report/__init__.py
Contents conflict in sale_supplier_direct_delivery/report/supplier_report.py
Contents conflict in sale_supplier_direct_delivery/sale.py
Contents conflict in sale_supplier_direct_delivery/stock.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/__init__.py
Contents conflict in sale_tax_include/__terp__.py
Conflict adding files to sale_tax_include/i18n.  Created directory.
Conflict because sale_tax_include/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_tax_include/sale_tax_incl.py
Contents conflict in sale_tax_include/sale_tax_incl.xml
Conflict adding files to sale_wo_prices.  Created directory.
Conflict because sale_wo_prices is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to sale_wo_production.  Created directory.
Conflict because sale_wo_production is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_wo_production/__init__.py
Contents conflict in sale_wo_production/__terp__.py
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/__init__.py
Contents conflict in sales_purchase_seq/__terp__.py
Contents conflict in sales_purchase_seq/sales_purchase_seq.py
Conflict adding files to sales_server_action.  Created directory.
Conflict because sales_server_action is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sales_server_action/__init__.py
Contents conflict in sales_server_action/__terp__.py
Conflict adding files to sandwich.  Created directory.
Conflict because sandwich is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/__init__.py
Contents conflict in sandwich/__terp__.py
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/__init__.py
Contents conflict in sandwich/report/sandwich_report.py
Contents conflict in sandwich/sandwich.py
Conflict adding files to sandwich/wizard.  Created directory.
Conflict because sandwich/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/wizard/__init__.py
Contents conflict in sandwich/wizard/order_create.py
Contents conflict in sandwich/wizard/sandwich_wizard.py
Conflict adding files to scripts.  Created directory.
Conflict because scripts is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to scripts/tinyerp_demo.  Created directory.
Conflict because scripts/tinyerp_demo is not versioned, but has versioned children.  Versioned directory.
Contents conflict in scripts/tinyerp_demo/create_demo_db.py
Conflict adding files to segmentation.  Created directory.
Conflict because segmentation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in segmentation/__init__.py
Contents conflict in segmentation/__terp__.py
Contents conflict in segmentation/segmentation.py
Conflict adding files to segmentation/wizard.  Created directory.
Conflict because segmentation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in segmentation/wizard/__init__.py
Contents conflict in segmentation/wizard/open_partner.py
Conflict adding files to stock_location_pull.  Created directory.
Conflict because stock_location_pull is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/__init__.py
Contents conflict in stock_location_pull/__terp__.py
Conflict adding files to stock_location_pull/i18n.  Created directory.
Conflict because stock_location_pull/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/i18n/es_AR.po
Contents conflict in stock_location_pull/i18n/nl_BE.po
Contents conflict in stock_location_pull/i18n/pt_BR.po
Contents conflict in stock_location_pull/i18n/zh_CN.po
Contents conflict in stock_location_pull/i18n/zh_TW.po
Contents conflict in stock_location_pull/mrp_pull.py
Contents conflict in stock_location_pull/mrp_pull_workflow.xml
Conflict adding files to stock_location_pull/security.  Created directory.
Conflict because stock_location_pull/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/security/ir.model.access.csv
Contents conflict in stock_location_pull/stock.py
Contents conflict in stock_location_pull/stock_view.xml
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/__init__.py
Contents conflict in stock_planning/__terp__.py
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 test_44.  Created directory.
Conflict because test_44 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in test_44/__init__.py
Contents conflict in test_44/__terp__.py
Contents conflict in test_44/test.py
Conflict adding files to test_server.  Created directory.
Conflict because test_server is not versioned, but has versioned children.  Versioned directory.
Contents conflict in test_server/__terp__.py
Conflict adding files to tiny_purchase.  Created directory.
Conflict because tiny_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tiny_purchase/__init__.py
Contents conflict in tiny_purchase/__terp__.py
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/__init__.py
Contents conflict in tiny_purchase/report/tiny_purchase_order_report.py
Contents conflict in tiny_purchase/tiny_purchase.py
Conflict adding files to travel.  Created directory.
Conflict because travel is not versioned, but has versioned children.  Versioned directory.
Contents conflict in travel/__init__.py
Contents conflict in travel/__terp__.py
Contents conflict in travel/custom.py
Conflict adding files to user_ctg.  Created directory.
Conflict because user_ctg is not versioned, but has versioned children.  Versioned directory.
Contents conflict in user_ctg/__init__.py
Contents conflict in user_ctg/__terp__.py
Contents conflict in user_ctg/lp_server.py
Contents conflict in user_ctg/user_ctg.py
Contents conflict in user_ctg/user_ctg_data.xml
Contents conflict in user_ctg/user_ctg_view.xml
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/__init__.py
Contents conflict in users_ldap/__terp__.py
Contents conflict in users_ldap/users_ldap.py
Conflict adding files to virustotal.  Created directory.
Conflict because virustotal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in virustotal/__init__.py
Contents conflict in virustotal/__terp__.py
Contents conflict in virustotal/attachment.py
Conflict adding files to webmail.  Created directory.
Conflict because webmail is not versioned, but has versioned children.  Versioned directory.
Contents conflict in webmail/webmail.py
Conflict adding files to wizard_access_rules.  Created directory.
Conflict because wizard_access_rules is not versioned, but has versioned children.  Versioned directory.
Contents conflict in wizard_access_rules/__init__.py
Contents conflict in wizard_access_rules/__terp__.py
Contents conflict in wizard_access_rules/wizard_acl.py
Contents conflict in wizard_access_rules/wizard_acl_view.xml
Conflict adding files to zarafa.  Created directory.
Conflict because zarafa is not versioned, but has versioned children.  Versioned directory.
To merge this branch: bzr merge lp:~dr.dran/openobject-addons/extra-6.0
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+104973@code.launchpad.net

Description of the change

ADD two important FIX for the nan_product_pack module:
1- Fix a problem when one or more subproduct of the pack is service, that cause a divide by zero operation when calculate the stock quantity of the pack product.
2- Fix a problem when the partner has a different fiscal position than the default, and when process the pack, the subproduct didn't set the correct vat

To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote :

Hello Franco Tampieri,

Unfortunately, your branch appears to be too conflicting to be used. The reason is probably because you're proposing a branch rebased on stable rather than trunk.

If you want your feature(s)/fix(es) to be reviewed, i strongly suggest that you create new branches (one per feature) with enough explanation (or bug report) so that anyone can understand what's inside without having to go through the diff. On the other hand, make sure your branches aren't conflicting and that the diff you're proposing is as short as possible. Otherwise it's just too messy for us to review ;-)

Let me close this merge proposal for now, feel free to reopen it or to recreate new ones whenever you fulfill above requirements.

Thanks for your understanding,
Quentin

Unmerged revisions

5792. By Franco Tampieri

[ADD] Create file Authors.txt
[FIX] Fix a bug on the function that calculate the pack stock quantity when a product is a service.
[FIX] Correct a bug that didn't set the right tax to the subproduct when the partner have a different fiscal position than the default one.

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

account_balance_reporting: Fix bug introduced in previous commit. Applied the wrong patch.

5790. By Raimon Esteve (www.zikzakmedia.com)

[ADD] Document Directory. Use Default Parent Model relation object and not Document

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

account_balance_reporting: Fix usage of debit() and credit() options.

5788. By Launchpad Translations on behalf of openerp-commiter

Launchpad automatic translations update.

5787. By Launchpad Translations on behalf of openerp-commiter

Launchpad automatic translations update.

5786. By Raimon Esteve (www.zikzakmedia.com)

[IMP] product_special_price: Default Type Special Price

5785. By Raimon Esteve (www.zikzakmedia.com)

[IMP] product_special_price: Special Price value (product value or price list)

5784. By Launchpad Translations on behalf of openerp-commiter

Launchpad automatic translations update.

5783. By Alexis de Lattre

Better layout of move line form view when combined with product_hardware_revision module.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2012-05-07 20:14:26 +0000
@@ -0,0 +1,3 @@
1*.bzr
2.pydevproject
3.settings
04
=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added directory 'account_analytic_package'
=== added file 'account_analytic_package/__init__.py.OTHER'
--- account_analytic_package/__init__.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_analytic_package/__init__.py.OTHER 2012-05-07 20:14:26 +0000
@@ -0,0 +1,23 @@
1##############################################################################
2#
3# OpenERP, Open Source Management Solution
4# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20
21import account_analytic_package
22# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
23
024
=== added file 'account_analytic_package/__terp__.py.OTHER'
--- account_analytic_package/__terp__.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_analytic_package/__terp__.py.OTHER 2012-05-07 20:14:26 +0000
@@ -0,0 +1,42 @@
1##############################################################################
2#
3# OpenERP, Open Source Management Solution
4# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20
21{
22 "name" : "Account Analytic Package - To configure Analytic Account for product packages",
23 "description": """The Module allows to configure analytic account for product packages.
24 Views for total and monthly product packages weight, Amount analysis.""",
25 "version" : "1.0",
26 "author" : "Tiny",
27 "category" : "Generic Modules/Accounting",
28 "module": "",
29 "website": "http://www.openerp.com",
30 "depends" : ["account","product","crm"],
31 "init_xml" : [],
32 "update_xml" : [
33 "security/ir.model.access.csv",
34 "account_analytic_package_view.xml"
35 ],
36 "demo_xml" : [],
37 "active": False,
38 "installable": True,
39
40}
41# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
42
043
=== added file 'account_analytic_package/account_analytic_package.py.OTHER'
--- account_analytic_package/account_analytic_package.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_analytic_package/account_analytic_package.py.OTHER 2012-05-07 20:14:26 +0000
@@ -0,0 +1,160 @@
1##############################################################################
2#
3# OpenERP, Open Source Management Solution
4# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20
21import operator
22from osv import osv, fields
23
24
25class account_analytic_account(osv.osv):
26 _inherit = "account.analytic.account"
27 _columns = {
28 'package_ok': fields.boolean('Used in Package'),
29 }
30account_analytic_account()
31
32
33class product_product(osv.osv):
34 _inherit = "product.product"
35 _columns = {
36 'package_weight': fields.float('Package Weight', digits=(16,2)),
37 }
38 _defaults = {
39 'package_weight': lambda *args: 0.0
40 }
41product_product()
42
43class crm_case_section(osv.osv):
44 _inherit = "crm.case.section"
45 _columns = {
46 'package_product_id': fields.many2one('product.product', 'Package Product'),
47 'analytic_account_id': fields.many2one('account.analytic.account', 'Main Analytic Account'),
48 'analytic_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
49 }
50crm_case_section()
51
52class crm_case(osv.osv):
53 _inherit = "crm.case"
54 def case_open(self, cr, uid, ids, *args):
55 res = super(crm_case, self).case_open(cr, uid, ids, *args)
56 for case in self.browse(cr,uid, ids):
57 section = case.section_id
58 if section.package_product_id and section.analytic_account_id and section.analytic_journal_id:
59 partner = self.pool.get('res.users').browse(cr, uid, uid).address_id.partner_id.id
60 aids = self.pool.get('account.analytic.account').search(cr, uid, [('partner_id','=',partner),('state','in',('open','draft','pending')),('parent_id','child_of',[section.analytic_account_id.id])])
61 if not aids:
62 raise osv.except_osv('You can not open this case !', 'No valid analytic account defined for your user.\nPlease contact the administrator.')
63 self.pool.get('account.analytic.line').create(cr, uid, {
64 'name': case.name,
65 'amount': 0.0,
66 'unit_amount': 1,
67 'product_uom_id': section.package_product_id.uom_id.id,
68 'product_id': section.package_product_id.id,
69 'account_id': aids[0],
70 'general_account_id': section.package_product_id.property_account_income.id or section.package_product_id.categ_id.property_account_income_categ.id,
71 'journal_id': section.analytic_journal_id.id,
72 'user_id': uid,
73 'ref': 'CASE'+str(case.id)
74 })
75 return res
76crm_case()
77
78
79class account_analytic_line_package(osv.osv):
80 _name = "account.analytic.line.package"
81 _auto = False
82 _order = 'date desc'
83 def init(self, cr):
84 cr.execute("""
85 CREATE OR REPLACE VIEW account_analytic_line_package AS (
86 select
87 l.id,
88 l.name,
89 l.date,
90 a.partner_id,
91 a.id as account_id,
92 l.product_id,
93 p.package_weight as unit_weight,
94 p.package_weight*l.unit_amount as total_weight,
95 l.unit_amount
96 from
97 account_analytic_line l
98 left join
99 account_analytic_account a on (l.account_id=a.id)
100 left join
101 product_product p on (p.id=l.product_id)
102 where
103 l.product_id is not null and
104 p.package_weight<>0 and
105 a.package_ok
106 )
107 """)
108 _columns = {
109 'name': fields.char('Name', size=128, readonly=True, select=1),
110 'date': fields.date('Date', readonly=True, select=1),
111 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
112 'account_id': fields.many2one('account.analytic.account', 'Account', readonly=True),
113 'product_id': fields.many2one('product.product', 'Product', select=2, readonly=True),
114 'unit_amount': fields.float('Quantity', readonly=True),
115 'unit_weight': fields.float('Unit Weight', readonly=True),
116 'total_weight': fields.float('Total Weight', readonly=True),
117 }
118account_analytic_line_package()
119
120class account_analytic_line_package_month(osv.osv):
121 _name = "account.analytic.line.package.month"
122 _auto = False
123 def init(self, cr):
124 cr.execute("""
125 CREATE OR REPLACE VIEW account_analytic_line_package_month AS (
126 select
127 min(l.id) as id,
128 to_char(l.date, 'YYYY-MM-01') as name,
129 a.partner_id,
130 l.product_id,
131 sum(p.package_weight*l.unit_amount) as total_weight,
132 sum(case when p.package_weight>0 then p.package_weight*l.unit_amount else 0 end) as total_activity,
133 sum(case when p.package_weight<0 then -p.package_weight*l.unit_amount else 0 end) as total_service
134 from
135 account_analytic_line l
136 left join
137 account_analytic_account a on (l.account_id=a.id)
138 left join
139 product_product p on (p.id=l.product_id)
140 where
141 l.product_id is not null and
142 p.package_weight<>0 and
143 a.package_ok
144 group by
145 l.product_id,
146 a.partner_id,
147 to_char(l.date, 'YYYY-MM-01')
148 )
149 """)
150 _columns ={
151 'name': fields.date('Date', readonly=True, select=1),
152 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
153 'product_id': fields.many2one('product.product', 'Product', select=2, readonly=True),
154 'total_weight': fields.float('Total Weight', readonly=True),
155 'total_activity': fields.float('Total Activity', readonly=True),
156 'total_service': fields.float('Total Service', readonly=True),
157 }
158account_analytic_line_package_month()
159# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
160
0161
=== added directory 'account_analytic_package/i18n'
=== added file 'account_analytic_package/i18n/account_analytic_package.pot'
--- account_analytic_package/i18n/account_analytic_package.pot 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/account_analytic_package.pot 2012-05-07 20:14:26 +0000
@@ -0,0 +1,220 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_package
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.6\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:16:03+0000\n"
10"PO-Revision-Date: 2009-11-24 12:16:03+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_analytic_package
19#: constraint:ir.model:0
20msgid "The Object name must start with x_ and not contain any special character !"
21msgstr ""
22
23#. module: account_analytic_package
24#: view:account.analytic.line.package.month:0
25msgid "Signed Units"
26msgstr ""
27
28#. module: account_analytic_package
29#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
30msgid "account.analytic.line.package"
31msgstr ""
32
33#. module: account_analytic_package
34#: constraint:ir.ui.view:0
35msgid "Invalid XML for View Architecture!"
36msgstr ""
37
38#. module: account_analytic_package
39#: view:account.analytic.account:0
40#: view:crm.case.section:0
41#: field:product.product,package_weight:0
42msgid "Package Weight"
43msgstr ""
44
45#. module: account_analytic_package
46#: view:account.analytic.line.package:0
47#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
48#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
49msgid "Service & Activity Units"
50msgstr ""
51
52#. module: account_analytic_package
53#: constraint:ir.actions.act_window:0
54msgid "Invalid model name in the action definition."
55msgstr ""
56
57#. module: account_analytic_package
58#: view:account.analytic.line.package:0
59msgid "Units"
60msgstr ""
61
62#. module: account_analytic_package
63#: view:product.product:0
64msgid "<0 if it's a service unit"
65msgstr ""
66
67#. module: account_analytic_package
68#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
69msgid "Service & Activity Units (no partner and account)"
70msgstr ""
71
72#. module: account_analytic_package
73#: field:account.analytic.line.package,product_id:0
74#: field:account.analytic.line.package.month,product_id:0
75msgid "Product"
76msgstr ""
77
78#. module: account_analytic_package
79#: field:crm.case.section,analytic_journal_id:0
80msgid "Analytic Journal"
81msgstr ""
82
83#. module: account_analytic_package
84#: view:account.analytic.line.package.month:0
85#: view:crm.case.section:0
86#: view:product.product:0
87msgid "Analytic Package"
88msgstr ""
89
90#. module: account_analytic_package
91#: view:product.product:0
92msgid "Zero if not part of a package"
93msgstr ""
94
95#. module: account_analytic_package
96#: field:account.analytic.line.package.month,total_service:0
97msgid "Total Service"
98msgstr ""
99
100#. module: account_analytic_package
101#: field:account.analytic.line.package,unit_weight:0
102msgid "Unit Weight"
103msgstr ""
104
105#. module: account_analytic_package
106#: view:product.product:0
107msgid "Package Units"
108msgstr ""
109
110#. module: account_analytic_package
111#: field:account.analytic.line.package,date:0
112#: field:account.analytic.line.package.month,name:0
113msgid "Date"
114msgstr ""
115
116#. module: account_analytic_package
117#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
118msgid "Packages"
119msgstr ""
120
121#. module: account_analytic_package
122#: view:account.analytic.line.package.month:0
123#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
124#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
125msgid "Service Units"
126msgstr ""
127
128#. module: account_analytic_package
129#: field:account.analytic.line.package,total_weight:0
130#: field:account.analytic.line.package.month,total_weight:0
131msgid "Total Weight"
132msgstr ""
133
134#. module: account_analytic_package
135#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
136#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
137#: view:product.product:0
138msgid "Products Units"
139msgstr ""
140
141#. module: account_analytic_package
142#: model:ir.module.module,description:account_analytic_package.module_meta_information
143msgid "The Module allows to configure analytic account for product packages.\n"
144" Views for total and monthly product packages weight, Amount analysis."
145msgstr ""
146
147#. module: account_analytic_package
148#: field:account.analytic.line.package,account_id:0
149msgid "Account"
150msgstr ""
151
152#. module: account_analytic_package
153#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
154msgid "account_analytic_package"
155msgstr ""
156
157#. module: account_analytic_package
158#: field:account.analytic.line.package,name:0
159msgid "Name"
160msgstr ""
161
162#. module: account_analytic_package
163#: view:account.analytic.line.package.month:0
164#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
165#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
166msgid "Activity Units"
167msgstr ""
168
169#. module: account_analytic_package
170#: view:crm.case.section:0
171msgid "The parent account of all package account"
172msgstr ""
173
174#. module: account_analytic_package
175#: field:crm.case.section,package_product_id:0
176msgid "Package Product"
177msgstr ""
178
179#. module: account_analytic_package
180#: view:product.product:0
181msgid ">0 if it's a activity unit"
182msgstr ""
183
184#. module: account_analytic_package
185#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
186#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
187msgid "Monthly Services & Activity Units"
188msgstr ""
189
190#. module: account_analytic_package
191#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
192msgid "account.analytic.line.package.month"
193msgstr ""
194
195#. module: account_analytic_package
196#: field:account.analytic.line.package,unit_amount:0
197msgid "Quantity"
198msgstr ""
199
200#. module: account_analytic_package
201#: field:crm.case.section,analytic_account_id:0
202msgid "Main Analytic Account"
203msgstr ""
204
205#. module: account_analytic_package
206#: field:account.analytic.account,package_ok:0
207msgid "Used in Package"
208msgstr ""
209
210#. module: account_analytic_package
211#: field:account.analytic.line.package,partner_id:0
212#: field:account.analytic.line.package.month,partner_id:0
213msgid "Partner"
214msgstr ""
215
216#. module: account_analytic_package
217#: field:account.analytic.line.package.month,total_activity:0
218msgid "Total Activity"
219msgstr ""
220
0221
=== added file 'account_analytic_package/i18n/ar.po'
--- account_analytic_package/i18n/ar.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/ar.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,225 @@
1# Arabic translation for openobject-addons
2# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2012-01-23 14:33+0000\n"
12"Last-Translator: kifcaliph <Unknown>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr "اسم الكائن يجب أن يبدأ بـ \"_x\" ولا يحتوي على رموز خاصة !"
25
26#. module: account_analytic_package
27#: view:account.analytic.line.package.month:0
28msgid "Signed Units"
29msgstr "وحدات موقعة"
30
31#. module: account_analytic_package
32#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
33msgid "account.analytic.line.package"
34msgstr "account.analytic.line.package"
35
36#. module: account_analytic_package
37#: constraint:ir.ui.view:0
38msgid "Invalid XML for View Architecture!"
39msgstr "هناك خطأ في بيانات الـ XML للعرض!"
40
41#. module: account_analytic_package
42#: view:account.analytic.account:0
43#: view:crm.case.section:0
44#: field:product.product,package_weight:0
45msgid "Package Weight"
46msgstr "وزن الحزمة"
47
48#. module: account_analytic_package
49#: view:account.analytic.line.package:0
50#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
51#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
52msgid "Service & Activity Units"
53msgstr "وحدات الخدمة و النشاط"
54
55#. module: account_analytic_package
56#: constraint:ir.actions.act_window:0
57msgid "Invalid model name in the action definition."
58msgstr "اسم نموذج خاطئ في تعريف الإجراء."
59
60#. module: account_analytic_package
61#: view:account.analytic.line.package:0
62msgid "Units"
63msgstr "الوحدات"
64
65#. module: account_analytic_package
66#: view:product.product:0
67msgid "<0 if it's a service unit"
68msgstr "< ٠‎ لو كانت وحدة خدمة"
69
70#. module: account_analytic_package
71#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
72msgid "Service & Activity Units (no partner and account)"
73msgstr "وحدات الخدمة و النشاط ( ﻻ شريك و لا حساب)"
74
75#. module: account_analytic_package
76#: field:account.analytic.line.package,product_id:0
77#: field:account.analytic.line.package.month,product_id:0
78msgid "Product"
79msgstr "المنتج"
80
81#. module: account_analytic_package
82#: field:crm.case.section,analytic_journal_id:0
83msgid "Analytic Journal"
84msgstr "يومية تحليلية"
85
86#. module: account_analytic_package
87#: view:account.analytic.line.package.month:0
88#: view:crm.case.section:0
89#: view:product.product:0
90msgid "Analytic Package"
91msgstr "حزمة تحليلية"
92
93#. module: account_analytic_package
94#: view:product.product:0
95msgid "Zero if not part of a package"
96msgstr "صفر لو لم تكن جزء من الحزمة"
97
98#. module: account_analytic_package
99#: field:account.analytic.line.package.month,total_service:0
100msgid "Total Service"
101msgstr "إجمالي الخدمة"
102
103#. module: account_analytic_package
104#: field:account.analytic.line.package,unit_weight:0
105msgid "Unit Weight"
106msgstr "وحدة الوزن"
107
108#. module: account_analytic_package
109#: view:product.product:0
110msgid "Package Units"
111msgstr "وحدات الحزمة"
112
113#. module: account_analytic_package
114#: field:account.analytic.line.package,date:0
115#: field:account.analytic.line.package.month,name:0
116msgid "Date"
117msgstr "التاريخ"
118
119#. module: account_analytic_package
120#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
121msgid "Packages"
122msgstr "الحزم"
123
124#. module: account_analytic_package
125#: view:account.analytic.line.package.month:0
126#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
127#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
128msgid "Service Units"
129msgstr "وحدات الخدمة"
130
131#. module: account_analytic_package
132#: field:account.analytic.line.package,total_weight:0
133#: field:account.analytic.line.package.month,total_weight:0
134msgid "Total Weight"
135msgstr "إجمالي الوزن"
136
137#. module: account_analytic_package
138#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
139#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
140#: view:product.product:0
141msgid "Products Units"
142msgstr "وحدات المنتجات"
143
144#. module: account_analytic_package
145#: model:ir.module.module,description:account_analytic_package.module_meta_information
146msgid ""
147"The Module allows to configure analytic account for product packages.\n"
148" Views for total and monthly product packages weight, Amount analysis."
149msgstr ""
150"هذا البرنامج يسمح لك بإعداد حساب تحليلي لحزم المنتج.\n"
151" عروض للإجمالي و الوزن لحزم المنتج الشهرية، و تحليلات المبلغ."
152
153#. module: account_analytic_package
154#: field:account.analytic.line.package,account_id:0
155msgid "Account"
156msgstr "حساب"
157
158#. module: account_analytic_package
159#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
160msgid "account_analytic_package"
161msgstr "account_analytic_package"
162
163#. module: account_analytic_package
164#: field:account.analytic.line.package,name:0
165msgid "Name"
166msgstr "الاسم"
167
168#. module: account_analytic_package
169#: view:account.analytic.line.package.month:0
170#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
171#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
172msgid "Activity Units"
173msgstr "وحدات النشاط"
174
175#. module: account_analytic_package
176#: view:crm.case.section:0
177msgid "The parent account of all package account"
178msgstr "الحساب الرئيسي لكل حسابات الحزم"
179
180#. module: account_analytic_package
181#: field:crm.case.section,package_product_id:0
182msgid "Package Product"
183msgstr "حزمة المنتج"
184
185#. module: account_analytic_package
186#: view:product.product:0
187msgid ">0 if it's a activity unit"
188msgstr "> ٠‎ لوكانت وحدة نشاط"
189
190#. module: account_analytic_package
191#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
192#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
193msgid "Monthly Services & Activity Units"
194msgstr "وحدات الخدمات و الأنشطة الشهرية"
195
196#. module: account_analytic_package
197#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
198msgid "account.analytic.line.package.month"
199msgstr "account.analytic.line.package.month"
200
201#. module: account_analytic_package
202#: field:account.analytic.line.package,unit_amount:0
203msgid "Quantity"
204msgstr "الكمية"
205
206#. module: account_analytic_package
207#: field:crm.case.section,analytic_account_id:0
208msgid "Main Analytic Account"
209msgstr "الحساب التحليلي الرئيسي"
210
211#. module: account_analytic_package
212#: field:account.analytic.account,package_ok:0
213msgid "Used in Package"
214msgstr "المستخدم في الحزمة"
215
216#. module: account_analytic_package
217#: field:account.analytic.line.package,partner_id:0
218#: field:account.analytic.line.package.month,partner_id:0
219msgid "Partner"
220msgstr "شريك"
221
222#. module: account_analytic_package
223#: field:account.analytic.line.package.month,total_activity:0
224msgid "Total Activity"
225msgstr "إجمالي النشاط"
0226
=== added file 'account_analytic_package/i18n/bg.po'
--- account_analytic_package/i18n/bg.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/bg.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,224 @@
1# Bulgarian translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2011-03-30 07:30+0000\n"
12"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr ""
25"Името на обекта трябва да започва с x_ и не може да никакви специални знаци !"
26
27#. module: account_analytic_package
28#: view:account.analytic.line.package.month:0
29msgid "Signed Units"
30msgstr ""
31
32#. module: account_analytic_package
33#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
34msgid "account.analytic.line.package"
35msgstr ""
36
37#. module: account_analytic_package
38#: constraint:ir.ui.view:0
39msgid "Invalid XML for View Architecture!"
40msgstr ""
41
42#. module: account_analytic_package
43#: view:account.analytic.account:0
44#: view:crm.case.section:0
45#: field:product.product,package_weight:0
46msgid "Package Weight"
47msgstr ""
48
49#. module: account_analytic_package
50#: view:account.analytic.line.package:0
51#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
52#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
53msgid "Service & Activity Units"
54msgstr ""
55
56#. module: account_analytic_package
57#: constraint:ir.actions.act_window:0
58msgid "Invalid model name in the action definition."
59msgstr "Невалидно име на модел при задаване на действие"
60
61#. module: account_analytic_package
62#: view:account.analytic.line.package:0
63msgid "Units"
64msgstr "Единици"
65
66#. module: account_analytic_package
67#: view:product.product:0
68msgid "<0 if it's a service unit"
69msgstr ""
70
71#. module: account_analytic_package
72#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
73msgid "Service & Activity Units (no partner and account)"
74msgstr ""
75
76#. module: account_analytic_package
77#: field:account.analytic.line.package,product_id:0
78#: field:account.analytic.line.package.month,product_id:0
79msgid "Product"
80msgstr "Продукт"
81
82#. module: account_analytic_package
83#: field:crm.case.section,analytic_journal_id:0
84msgid "Analytic Journal"
85msgstr "Аналитичен дневник"
86
87#. module: account_analytic_package
88#: view:account.analytic.line.package.month:0
89#: view:crm.case.section:0
90#: view:product.product:0
91msgid "Analytic Package"
92msgstr ""
93
94#. module: account_analytic_package
95#: view:product.product:0
96msgid "Zero if not part of a package"
97msgstr ""
98
99#. module: account_analytic_package
100#: field:account.analytic.line.package.month,total_service:0
101msgid "Total Service"
102msgstr ""
103
104#. module: account_analytic_package
105#: field:account.analytic.line.package,unit_weight:0
106msgid "Unit Weight"
107msgstr ""
108
109#. module: account_analytic_package
110#: view:product.product:0
111msgid "Package Units"
112msgstr ""
113
114#. module: account_analytic_package
115#: field:account.analytic.line.package,date:0
116#: field:account.analytic.line.package.month,name:0
117msgid "Date"
118msgstr "Дата"
119
120#. module: account_analytic_package
121#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
122msgid "Packages"
123msgstr "Пакети"
124
125#. module: account_analytic_package
126#: view:account.analytic.line.package.month:0
127#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
128#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
129msgid "Service Units"
130msgstr ""
131
132#. module: account_analytic_package
133#: field:account.analytic.line.package,total_weight:0
134#: field:account.analytic.line.package.month,total_weight:0
135msgid "Total Weight"
136msgstr ""
137
138#. module: account_analytic_package
139#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
140#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
141#: view:product.product:0
142msgid "Products Units"
143msgstr ""
144
145#. module: account_analytic_package
146#: model:ir.module.module,description:account_analytic_package.module_meta_information
147msgid ""
148"The Module allows to configure analytic account for product packages.\n"
149" Views for total and monthly product packages weight, Amount analysis."
150msgstr ""
151
152#. module: account_analytic_package
153#: field:account.analytic.line.package,account_id:0
154msgid "Account"
155msgstr "Сметка"
156
157#. module: account_analytic_package
158#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
159msgid "account_analytic_package"
160msgstr ""
161
162#. module: account_analytic_package
163#: field:account.analytic.line.package,name:0
164msgid "Name"
165msgstr "Име"
166
167#. module: account_analytic_package
168#: view:account.analytic.line.package.month:0
169#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
170#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
171msgid "Activity Units"
172msgstr ""
173
174#. module: account_analytic_package
175#: view:crm.case.section:0
176msgid "The parent account of all package account"
177msgstr ""
178
179#. module: account_analytic_package
180#: field:crm.case.section,package_product_id:0
181msgid "Package Product"
182msgstr ""
183
184#. module: account_analytic_package
185#: view:product.product:0
186msgid ">0 if it's a activity unit"
187msgstr ""
188
189#. module: account_analytic_package
190#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
191#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
192msgid "Monthly Services & Activity Units"
193msgstr ""
194
195#. module: account_analytic_package
196#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
197msgid "account.analytic.line.package.month"
198msgstr ""
199
200#. module: account_analytic_package
201#: field:account.analytic.line.package,unit_amount:0
202msgid "Quantity"
203msgstr "Количество"
204
205#. module: account_analytic_package
206#: field:crm.case.section,analytic_account_id:0
207msgid "Main Analytic Account"
208msgstr ""
209
210#. module: account_analytic_package
211#: field:account.analytic.account,package_ok:0
212msgid "Used in Package"
213msgstr ""
214
215#. module: account_analytic_package
216#: field:account.analytic.line.package,partner_id:0
217#: field:account.analytic.line.package.month,partner_id:0
218msgid "Partner"
219msgstr "Контрагент"
220
221#. module: account_analytic_package
222#: field:account.analytic.line.package.month,total_activity:0
223msgid "Total Activity"
224msgstr ""
0225
=== added file 'account_analytic_package/i18n/es.po'
--- account_analytic_package/i18n/es.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/es.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,228 @@
1# Spanish translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2011-11-13 13:13+0000\n"
12"Last-Translator: Equipo OPENTIA (http://www.opentia.com) <Unknown>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr ""
25"¡El objeto debe empezar con x_ y no puede contener ningún carácter especial!"
26
27#. module: account_analytic_package
28#: view:account.analytic.line.package.month:0
29msgid "Signed Units"
30msgstr ""
31
32#. module: account_analytic_package
33#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
34msgid "account.analytic.line.package"
35msgstr "línea.cuenta.analítica.paquete"
36
37#. module: account_analytic_package
38#: constraint:ir.ui.view:0
39msgid "Invalid XML for View Architecture!"
40msgstr "¡XML inválido para la definición de la vista!"
41
42#. module: account_analytic_package
43#: view:account.analytic.account:0
44#: view:crm.case.section:0
45#: field:product.product,package_weight:0
46msgid "Package Weight"
47msgstr "Peso del paquete"
48
49#. module: account_analytic_package
50#: view:account.analytic.line.package:0
51#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
52#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
53msgid "Service & Activity Units"
54msgstr "Servicio y unidades de actividad"
55
56#. module: account_analytic_package
57#: constraint:ir.actions.act_window:0
58msgid "Invalid model name in the action definition."
59msgstr "Nombre del modelo inválido en la definición de acción."
60
61#. module: account_analytic_package
62#: view:account.analytic.line.package:0
63msgid "Units"
64msgstr "Unidades"
65
66#. module: account_analytic_package
67#: view:product.product:0
68msgid "<0 if it's a service unit"
69msgstr "<0 si se trata de una unidad de servicio"
70
71#. module: account_analytic_package
72#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
73msgid "Service & Activity Units (no partner and account)"
74msgstr "Servicio y unidades de actividad (sin empresa y cuenta)"
75
76#. module: account_analytic_package
77#: field:account.analytic.line.package,product_id:0
78#: field:account.analytic.line.package.month,product_id:0
79msgid "Product"
80msgstr "Producto"
81
82#. module: account_analytic_package
83#: field:crm.case.section,analytic_journal_id:0
84msgid "Analytic Journal"
85msgstr "Diario analítico"
86
87#. module: account_analytic_package
88#: view:account.analytic.line.package.month:0
89#: view:crm.case.section:0
90#: view:product.product:0
91msgid "Analytic Package"
92msgstr "Analítica paquete"
93
94#. module: account_analytic_package
95#: view:product.product:0
96msgid "Zero if not part of a package"
97msgstr "Cero si no se parte de un paquete"
98
99#. module: account_analytic_package
100#: field:account.analytic.line.package.month,total_service:0
101msgid "Total Service"
102msgstr "Total Servicio"
103
104#. module: account_analytic_package
105#: field:account.analytic.line.package,unit_weight:0
106msgid "Unit Weight"
107msgstr "Unidad de peso"
108
109#. module: account_analytic_package
110#: view:product.product:0
111msgid "Package Units"
112msgstr "Unidades de paquete"
113
114#. module: account_analytic_package
115#: field:account.analytic.line.package,date:0
116#: field:account.analytic.line.package.month,name:0
117msgid "Date"
118msgstr "Fecha"
119
120#. module: account_analytic_package
121#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
122msgid "Packages"
123msgstr "Paquetes"
124
125#. module: account_analytic_package
126#: view:account.analytic.line.package.month:0
127#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
128#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
129msgid "Service Units"
130msgstr "Unidades de Servicio"
131
132#. module: account_analytic_package
133#: field:account.analytic.line.package,total_weight:0
134#: field:account.analytic.line.package.month,total_weight:0
135msgid "Total Weight"
136msgstr "Peso total"
137
138#. module: account_analytic_package
139#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
140#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
141#: view:product.product:0
142msgid "Products Units"
143msgstr "Unidades de producto"
144
145#. module: account_analytic_package
146#: model:ir.module.module,description:account_analytic_package.module_meta_information
147msgid ""
148"The Module allows to configure analytic account for product packages.\n"
149" Views for total and monthly product packages weight, Amount analysis."
150msgstr ""
151"El módulo permite configurar la contabilidad analítica para paquetes de "
152"productos.\n"
153" Vistas totales y mensuales de pesos de paquetes de productos, análisis "
154"de cantidades."
155
156#. module: account_analytic_package
157#: field:account.analytic.line.package,account_id:0
158msgid "Account"
159msgstr "Cuenta"
160
161#. module: account_analytic_package
162#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
163msgid "account_analytic_package"
164msgstr "análisis_cuenta_paquetes"
165
166#. module: account_analytic_package
167#: field:account.analytic.line.package,name:0
168msgid "Name"
169msgstr "Nombre"
170
171#. module: account_analytic_package
172#: view:account.analytic.line.package.month:0
173#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
174#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
175msgid "Activity Units"
176msgstr "Unidadees de actividad"
177
178#. module: account_analytic_package
179#: view:crm.case.section:0
180msgid "The parent account of all package account"
181msgstr "La cuenta padre de todas las cuentas de paquetes"
182
183#. module: account_analytic_package
184#: field:crm.case.section,package_product_id:0
185msgid "Package Product"
186msgstr "Paquete de productos"
187
188#. module: account_analytic_package
189#: view:product.product:0
190msgid ">0 if it's a activity unit"
191msgstr "> 0 si se trata de una unidad de actividad"
192
193#. module: account_analytic_package
194#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
195#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
196msgid "Monthly Services & Activity Units"
197msgstr "Servicios mensuales y unidades de actividad"
198
199#. module: account_analytic_package
200#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
201msgid "account.analytic.line.package.month"
202msgstr "línea.cuenta.analítica.paquete.mes"
203
204#. module: account_analytic_package
205#: field:account.analytic.line.package,unit_amount:0
206msgid "Quantity"
207msgstr "Cantidad"
208
209#. module: account_analytic_package
210#: field:crm.case.section,analytic_account_id:0
211msgid "Main Analytic Account"
212msgstr "Cuenta analítica general"
213
214#. module: account_analytic_package
215#: field:account.analytic.account,package_ok:0
216msgid "Used in Package"
217msgstr "Utilizados en el paquete"
218
219#. module: account_analytic_package
220#: field:account.analytic.line.package,partner_id:0
221#: field:account.analytic.line.package.month,partner_id:0
222msgid "Partner"
223msgstr "Empresa"
224
225#. module: account_analytic_package
226#: field:account.analytic.line.package.month,total_activity:0
227msgid "Total Activity"
228msgstr "Actividad total"
0229
=== added file 'account_analytic_package/i18n/fr_BE.po'
--- account_analytic_package/i18n/fr_BE.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/fr_BE.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,220 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_package
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.6\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:16:03+0000\n"
10"PO-Revision-Date: 2009-11-24 12:16:03+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_analytic_package
19#: constraint:ir.model:0
20msgid "The Object name must start with x_ and not contain any special character !"
21msgstr ""
22
23#. module: account_analytic_package
24#: view:account.analytic.line.package.month:0
25msgid "Signed Units"
26msgstr ""
27
28#. module: account_analytic_package
29#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
30msgid "account.analytic.line.package"
31msgstr ""
32
33#. module: account_analytic_package
34#: constraint:ir.ui.view:0
35msgid "Invalid XML for View Architecture!"
36msgstr ""
37
38#. module: account_analytic_package
39#: view:account.analytic.account:0
40#: view:crm.case.section:0
41#: field:product.product,package_weight:0
42msgid "Package Weight"
43msgstr ""
44
45#. module: account_analytic_package
46#: view:account.analytic.line.package:0
47#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
48#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
49msgid "Service & Activity Units"
50msgstr ""
51
52#. module: account_analytic_package
53#: constraint:ir.actions.act_window:0
54msgid "Invalid model name in the action definition."
55msgstr ""
56
57#. module: account_analytic_package
58#: view:account.analytic.line.package:0
59msgid "Units"
60msgstr ""
61
62#. module: account_analytic_package
63#: view:product.product:0
64msgid "<0 if it's a service unit"
65msgstr ""
66
67#. module: account_analytic_package
68#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
69msgid "Service & Activity Units (no partner and account)"
70msgstr ""
71
72#. module: account_analytic_package
73#: field:account.analytic.line.package,product_id:0
74#: field:account.analytic.line.package.month,product_id:0
75msgid "Product"
76msgstr ""
77
78#. module: account_analytic_package
79#: field:crm.case.section,analytic_journal_id:0
80msgid "Analytic Journal"
81msgstr ""
82
83#. module: account_analytic_package
84#: view:account.analytic.line.package.month:0
85#: view:crm.case.section:0
86#: view:product.product:0
87msgid "Analytic Package"
88msgstr ""
89
90#. module: account_analytic_package
91#: view:product.product:0
92msgid "Zero if not part of a package"
93msgstr ""
94
95#. module: account_analytic_package
96#: field:account.analytic.line.package.month,total_service:0
97msgid "Total Service"
98msgstr ""
99
100#. module: account_analytic_package
101#: field:account.analytic.line.package,unit_weight:0
102msgid "Unit Weight"
103msgstr ""
104
105#. module: account_analytic_package
106#: view:product.product:0
107msgid "Package Units"
108msgstr ""
109
110#. module: account_analytic_package
111#: field:account.analytic.line.package,date:0
112#: field:account.analytic.line.package.month,name:0
113msgid "Date"
114msgstr ""
115
116#. module: account_analytic_package
117#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
118msgid "Packages"
119msgstr ""
120
121#. module: account_analytic_package
122#: view:account.analytic.line.package.month:0
123#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
124#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
125msgid "Service Units"
126msgstr ""
127
128#. module: account_analytic_package
129#: field:account.analytic.line.package,total_weight:0
130#: field:account.analytic.line.package.month,total_weight:0
131msgid "Total Weight"
132msgstr ""
133
134#. module: account_analytic_package
135#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
136#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
137#: view:product.product:0
138msgid "Products Units"
139msgstr ""
140
141#. module: account_analytic_package
142#: model:ir.module.module,description:account_analytic_package.module_meta_information
143msgid "The Module allows to configure analytic account for product packages.\n"
144" Views for total and monthly product packages weight, Amount analysis."
145msgstr ""
146
147#. module: account_analytic_package
148#: field:account.analytic.line.package,account_id:0
149msgid "Account"
150msgstr "Compte"
151
152#. module: account_analytic_package
153#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
154msgid "account_analytic_package"
155msgstr ""
156
157#. module: account_analytic_package
158#: field:account.analytic.line.package,name:0
159msgid "Name"
160msgstr "Nom"
161
162#. module: account_analytic_package
163#: view:account.analytic.line.package.month:0
164#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
165#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
166msgid "Activity Units"
167msgstr ""
168
169#. module: account_analytic_package
170#: view:crm.case.section:0
171msgid "The parent account of all package account"
172msgstr ""
173
174#. module: account_analytic_package
175#: field:crm.case.section,package_product_id:0
176msgid "Package Product"
177msgstr ""
178
179#. module: account_analytic_package
180#: view:product.product:0
181msgid ">0 if it's a activity unit"
182msgstr ""
183
184#. module: account_analytic_package
185#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
186#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
187msgid "Monthly Services & Activity Units"
188msgstr ""
189
190#. module: account_analytic_package
191#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
192msgid "account.analytic.line.package.month"
193msgstr ""
194
195#. module: account_analytic_package
196#: field:account.analytic.line.package,unit_amount:0
197msgid "Quantity"
198msgstr "Quantité"
199
200#. module: account_analytic_package
201#: field:crm.case.section,analytic_account_id:0
202msgid "Main Analytic Account"
203msgstr "Compte analytique principal"
204
205#. module: account_analytic_package
206#: field:account.analytic.account,package_ok:0
207msgid "Used in Package"
208msgstr ""
209
210#. module: account_analytic_package
211#: field:account.analytic.line.package,partner_id:0
212#: field:account.analytic.line.package.month,partner_id:0
213msgid "Partner"
214msgstr "Partenaire"
215
216#. module: account_analytic_package
217#: field:account.analytic.line.package.month,total_activity:0
218msgid "Total Activity"
219msgstr ""
220
0221
=== added file 'account_analytic_package/i18n/nn.po'
--- account_analytic_package/i18n/nn.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/nn.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,223 @@
1# Norwegian Nynorsk translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2011-07-07 19:31+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr ""
25
26#. module: account_analytic_package
27#: view:account.analytic.line.package.month:0
28msgid "Signed Units"
29msgstr ""
30
31#. module: account_analytic_package
32#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
33msgid "account.analytic.line.package"
34msgstr ""
35
36#. module: account_analytic_package
37#: constraint:ir.ui.view:0
38msgid "Invalid XML for View Architecture!"
39msgstr ""
40
41#. module: account_analytic_package
42#: view:account.analytic.account:0
43#: view:crm.case.section:0
44#: field:product.product,package_weight:0
45msgid "Package Weight"
46msgstr ""
47
48#. module: account_analytic_package
49#: view:account.analytic.line.package:0
50#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
51#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
52msgid "Service & Activity Units"
53msgstr ""
54
55#. module: account_analytic_package
56#: constraint:ir.actions.act_window:0
57msgid "Invalid model name in the action definition."
58msgstr ""
59
60#. module: account_analytic_package
61#: view:account.analytic.line.package:0
62msgid "Units"
63msgstr ""
64
65#. module: account_analytic_package
66#: view:product.product:0
67msgid "<0 if it's a service unit"
68msgstr ""
69
70#. module: account_analytic_package
71#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
72msgid "Service & Activity Units (no partner and account)"
73msgstr ""
74
75#. module: account_analytic_package
76#: field:account.analytic.line.package,product_id:0
77#: field:account.analytic.line.package.month,product_id:0
78msgid "Product"
79msgstr ""
80
81#. module: account_analytic_package
82#: field:crm.case.section,analytic_journal_id:0
83msgid "Analytic Journal"
84msgstr ""
85
86#. module: account_analytic_package
87#: view:account.analytic.line.package.month:0
88#: view:crm.case.section:0
89#: view:product.product:0
90msgid "Analytic Package"
91msgstr ""
92
93#. module: account_analytic_package
94#: view:product.product:0
95msgid "Zero if not part of a package"
96msgstr ""
97
98#. module: account_analytic_package
99#: field:account.analytic.line.package.month,total_service:0
100msgid "Total Service"
101msgstr ""
102
103#. module: account_analytic_package
104#: field:account.analytic.line.package,unit_weight:0
105msgid "Unit Weight"
106msgstr ""
107
108#. module: account_analytic_package
109#: view:product.product:0
110msgid "Package Units"
111msgstr ""
112
113#. module: account_analytic_package
114#: field:account.analytic.line.package,date:0
115#: field:account.analytic.line.package.month,name:0
116msgid "Date"
117msgstr ""
118
119#. module: account_analytic_package
120#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
121msgid "Packages"
122msgstr ""
123
124#. module: account_analytic_package
125#: view:account.analytic.line.package.month:0
126#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
127#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
128msgid "Service Units"
129msgstr ""
130
131#. module: account_analytic_package
132#: field:account.analytic.line.package,total_weight:0
133#: field:account.analytic.line.package.month,total_weight:0
134msgid "Total Weight"
135msgstr ""
136
137#. module: account_analytic_package
138#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
139#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
140#: view:product.product:0
141msgid "Products Units"
142msgstr ""
143
144#. module: account_analytic_package
145#: model:ir.module.module,description:account_analytic_package.module_meta_information
146msgid ""
147"The Module allows to configure analytic account for product packages.\n"
148" Views for total and monthly product packages weight, Amount analysis."
149msgstr ""
150
151#. module: account_analytic_package
152#: field:account.analytic.line.package,account_id:0
153msgid "Account"
154msgstr ""
155
156#. module: account_analytic_package
157#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
158msgid "account_analytic_package"
159msgstr ""
160
161#. module: account_analytic_package
162#: field:account.analytic.line.package,name:0
163msgid "Name"
164msgstr ""
165
166#. module: account_analytic_package
167#: view:account.analytic.line.package.month:0
168#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
169#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
170msgid "Activity Units"
171msgstr ""
172
173#. module: account_analytic_package
174#: view:crm.case.section:0
175msgid "The parent account of all package account"
176msgstr ""
177
178#. module: account_analytic_package
179#: field:crm.case.section,package_product_id:0
180msgid "Package Product"
181msgstr ""
182
183#. module: account_analytic_package
184#: view:product.product:0
185msgid ">0 if it's a activity unit"
186msgstr ""
187
188#. module: account_analytic_package
189#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
190#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
191msgid "Monthly Services & Activity Units"
192msgstr ""
193
194#. module: account_analytic_package
195#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
196msgid "account.analytic.line.package.month"
197msgstr ""
198
199#. module: account_analytic_package
200#: field:account.analytic.line.package,unit_amount:0
201msgid "Quantity"
202msgstr ""
203
204#. module: account_analytic_package
205#: field:crm.case.section,analytic_account_id:0
206msgid "Main Analytic Account"
207msgstr ""
208
209#. module: account_analytic_package
210#: field:account.analytic.account,package_ok:0
211msgid "Used in Package"
212msgstr ""
213
214#. module: account_analytic_package
215#: field:account.analytic.line.package,partner_id:0
216#: field:account.analytic.line.package.month,partner_id:0
217msgid "Partner"
218msgstr ""
219
220#. module: account_analytic_package
221#: field:account.analytic.line.package.month,total_activity:0
222msgid "Total Activity"
223msgstr ""
0224
=== added file 'account_analytic_package/i18n/pl.po'
--- account_analytic_package/i18n/pl.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/pl.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,227 @@
1# Polish translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2011-02-15 15:01+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr ""
25"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
26"specjalnych !"
27
28#. module: account_analytic_package
29#: view:account.analytic.line.package.month:0
30msgid "Signed Units"
31msgstr "Uzgodnione jednostki"
32
33#. module: account_analytic_package
34#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
35msgid "account.analytic.line.package"
36msgstr ""
37
38#. module: account_analytic_package
39#: constraint:ir.ui.view:0
40msgid "Invalid XML for View Architecture!"
41msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
42
43#. module: account_analytic_package
44#: view:account.analytic.account:0
45#: view:crm.case.section:0
46#: field:product.product,package_weight:0
47msgid "Package Weight"
48msgstr "Waga opakowania"
49
50#. module: account_analytic_package
51#: view:account.analytic.line.package:0
52#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
53#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
54msgid "Service & Activity Units"
55msgstr "Jednostki usług i aktywności"
56
57#. module: account_analytic_package
58#: constraint:ir.actions.act_window:0
59msgid "Invalid model name in the action definition."
60msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
61
62#. module: account_analytic_package
63#: view:account.analytic.line.package:0
64msgid "Units"
65msgstr "Jednostki"
66
67#. module: account_analytic_package
68#: view:product.product:0
69msgid "<0 if it's a service unit"
70msgstr "<0 jeśli jednostka usługi"
71
72#. module: account_analytic_package
73#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
74msgid "Service & Activity Units (no partner and account)"
75msgstr "Jednostki usług i aktywności (bez partnerów i kont)"
76
77#. module: account_analytic_package
78#: field:account.analytic.line.package,product_id:0
79#: field:account.analytic.line.package.month,product_id:0
80msgid "Product"
81msgstr "Produkt"
82
83#. module: account_analytic_package
84#: field:crm.case.section,analytic_journal_id:0
85msgid "Analytic Journal"
86msgstr "Dziennik analityczny"
87
88#. module: account_analytic_package
89#: view:account.analytic.line.package.month:0
90#: view:crm.case.section:0
91#: view:product.product:0
92msgid "Analytic Package"
93msgstr "Analityka opakowania"
94
95#. module: account_analytic_package
96#: view:product.product:0
97msgid "Zero if not part of a package"
98msgstr "Zero , jeśli nie jest częścią opakowania"
99
100#. module: account_analytic_package
101#: field:account.analytic.line.package.month,total_service:0
102msgid "Total Service"
103msgstr "Suma usług"
104
105#. module: account_analytic_package
106#: field:account.analytic.line.package,unit_weight:0
107msgid "Unit Weight"
108msgstr "Waga jednostkowa"
109
110#. module: account_analytic_package
111#: view:product.product:0
112msgid "Package Units"
113msgstr "Jednostki opakowania"
114
115#. module: account_analytic_package
116#: field:account.analytic.line.package,date:0
117#: field:account.analytic.line.package.month,name:0
118msgid "Date"
119msgstr "Data"
120
121#. module: account_analytic_package
122#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
123msgid "Packages"
124msgstr "Opakowania"
125
126#. module: account_analytic_package
127#: view:account.analytic.line.package.month:0
128#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
129#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
130msgid "Service Units"
131msgstr "Jednostki usług"
132
133#. module: account_analytic_package
134#: field:account.analytic.line.package,total_weight:0
135#: field:account.analytic.line.package.month,total_weight:0
136msgid "Total Weight"
137msgstr "Suma wag"
138
139#. module: account_analytic_package
140#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
141#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
142#: view:product.product:0
143msgid "Products Units"
144msgstr "Jednostki produktów"
145
146#. module: account_analytic_package
147#: model:ir.module.module,description:account_analytic_package.module_meta_information
148msgid ""
149"The Module allows to configure analytic account for product packages.\n"
150" Views for total and monthly product packages weight, Amount analysis."
151msgstr ""
152"Moduł pozwala konfigurować konto analityczne dla opakowań produktu.\n"
153" Widoki dla sum i miesięcznych wag opakowań, Analiza wartościowa."
154
155#. module: account_analytic_package
156#: field:account.analytic.line.package,account_id:0
157msgid "Account"
158msgstr "Konto"
159
160#. module: account_analytic_package
161#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
162msgid "account_analytic_package"
163msgstr ""
164
165#. module: account_analytic_package
166#: field:account.analytic.line.package,name:0
167msgid "Name"
168msgstr "Nazwa"
169
170#. module: account_analytic_package
171#: view:account.analytic.line.package.month:0
172#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
173#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
174msgid "Activity Units"
175msgstr "Jednostki aktywności"
176
177#. module: account_analytic_package
178#: view:crm.case.section:0
179msgid "The parent account of all package account"
180msgstr "Konto nadrzędne dla wszystkich kont opakowań"
181
182#. module: account_analytic_package
183#: field:crm.case.section,package_product_id:0
184msgid "Package Product"
185msgstr "Opakowanie produktu"
186
187#. module: account_analytic_package
188#: view:product.product:0
189msgid ">0 if it's a activity unit"
190msgstr ">0 jeśli jednostka aktywności"
191
192#. module: account_analytic_package
193#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
194#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
195msgid "Monthly Services & Activity Units"
196msgstr "Jednostki miesięcznych usług i aktywności"
197
198#. module: account_analytic_package
199#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
200msgid "account.analytic.line.package.month"
201msgstr ""
202
203#. module: account_analytic_package
204#: field:account.analytic.line.package,unit_amount:0
205msgid "Quantity"
206msgstr "Ilość"
207
208#. module: account_analytic_package
209#: field:crm.case.section,analytic_account_id:0
210msgid "Main Analytic Account"
211msgstr "Główne konto analityczne"
212
213#. module: account_analytic_package
214#: field:account.analytic.account,package_ok:0
215msgid "Used in Package"
216msgstr "Stosowane w opakowaniach"
217
218#. module: account_analytic_package
219#: field:account.analytic.line.package,partner_id:0
220#: field:account.analytic.line.package.month,partner_id:0
221msgid "Partner"
222msgstr "Partner"
223
224#. module: account_analytic_package
225#: field:account.analytic.line.package.month,total_activity:0
226msgid "Total Activity"
227msgstr "Suma aktywności"
0228
=== added file 'account_analytic_package/i18n/sv.po'
--- account_analytic_package/i18n/sv.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/sv.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,225 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_package
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.14\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:16+0000\n"
10"PO-Revision-Date: 2011-02-15 15:01+0000\n"
11"Last-Translator: OpenERP Administrators <Unknown>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
17"X-Generator: Launchpad (build 15060)\n"
18
19#. module: account_analytic_package
20#: constraint:ir.model:0
21msgid ""
22"The Object name must start with x_ and not contain any special character !"
23msgstr ""
24"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
25
26#. module: account_analytic_package
27#: view:account.analytic.line.package.month:0
28msgid "Signed Units"
29msgstr "Signed Units"
30
31#. module: account_analytic_package
32#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
33msgid "account.analytic.line.package"
34msgstr "account.analytic.line.package"
35
36#. module: account_analytic_package
37#: constraint:ir.ui.view:0
38msgid "Invalid XML for View Architecture!"
39msgstr "Invalid XML for View Architecture!"
40
41#. module: account_analytic_package
42#: view:account.analytic.account:0
43#: view:crm.case.section:0
44#: field:product.product,package_weight:0
45msgid "Package Weight"
46msgstr "Package Weight"
47
48#. module: account_analytic_package
49#: view:account.analytic.line.package:0
50#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
51#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
52msgid "Service & Activity Units"
53msgstr "Service & Activity Units"
54
55#. module: account_analytic_package
56#: constraint:ir.actions.act_window:0
57msgid "Invalid model name in the action definition."
58msgstr "Invalid model name in the action definition."
59
60#. module: account_analytic_package
61#: view:account.analytic.line.package:0
62msgid "Units"
63msgstr "Units"
64
65#. module: account_analytic_package
66#: view:product.product:0
67msgid "<0 if it's a service unit"
68msgstr ""
69
70#. module: account_analytic_package
71#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
72msgid "Service & Activity Units (no partner and account)"
73msgstr "Service & Activity Units (no partner and account)"
74
75#. module: account_analytic_package
76#: field:account.analytic.line.package,product_id:0
77#: field:account.analytic.line.package.month,product_id:0
78msgid "Product"
79msgstr "Product"
80
81#. module: account_analytic_package
82#: field:crm.case.section,analytic_journal_id:0
83msgid "Analytic Journal"
84msgstr "Analytic Journal"
85
86#. module: account_analytic_package
87#: view:account.analytic.line.package.month:0
88#: view:crm.case.section:0
89#: view:product.product:0
90msgid "Analytic Package"
91msgstr "Analytic Package"
92
93#. module: account_analytic_package
94#: view:product.product:0
95msgid "Zero if not part of a package"
96msgstr "Zero if not part of a package"
97
98#. module: account_analytic_package
99#: field:account.analytic.line.package.month,total_service:0
100msgid "Total Service"
101msgstr "Total Service"
102
103#. module: account_analytic_package
104#: field:account.analytic.line.package,unit_weight:0
105msgid "Unit Weight"
106msgstr "Unit Weight"
107
108#. module: account_analytic_package
109#: view:product.product:0
110msgid "Package Units"
111msgstr "Package Units"
112
113#. module: account_analytic_package
114#: field:account.analytic.line.package,date:0
115#: field:account.analytic.line.package.month,name:0
116msgid "Date"
117msgstr "Date"
118
119#. module: account_analytic_package
120#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
121msgid "Packages"
122msgstr "Packages"
123
124#. module: account_analytic_package
125#: view:account.analytic.line.package.month:0
126#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
127#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
128msgid "Service Units"
129msgstr "Service Units"
130
131#. module: account_analytic_package
132#: field:account.analytic.line.package,total_weight:0
133#: field:account.analytic.line.package.month,total_weight:0
134msgid "Total Weight"
135msgstr "Total Weight"
136
137#. module: account_analytic_package
138#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
139#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
140#: view:product.product:0
141msgid "Products Units"
142msgstr "Products Units"
143
144#. module: account_analytic_package
145#: model:ir.module.module,description:account_analytic_package.module_meta_information
146msgid ""
147"The Module allows to configure analytic account for product packages.\n"
148" Views for total and monthly product packages weight, Amount analysis."
149msgstr ""
150"The Module allows to configure analytic account for product packages.\n"
151" Views for total and monthly product packages weight, Amount analysis."
152
153#. module: account_analytic_package
154#: field:account.analytic.line.package,account_id:0
155msgid "Account"
156msgstr "Account"
157
158#. module: account_analytic_package
159#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
160msgid "account_analytic_package"
161msgstr ""
162
163#. module: account_analytic_package
164#: field:account.analytic.line.package,name:0
165msgid "Name"
166msgstr "Name"
167
168#. module: account_analytic_package
169#: view:account.analytic.line.package.month:0
170#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
171#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
172msgid "Activity Units"
173msgstr "Activity Units"
174
175#. module: account_analytic_package
176#: view:crm.case.section:0
177msgid "The parent account of all package account"
178msgstr "The parent account of all package account"
179
180#. module: account_analytic_package
181#: field:crm.case.section,package_product_id:0
182msgid "Package Product"
183msgstr "Package Product"
184
185#. module: account_analytic_package
186#: view:product.product:0
187msgid ">0 if it's a activity unit"
188msgstr ">0 if it's a activity unit"
189
190#. module: account_analytic_package
191#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
192#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
193msgid "Monthly Services & Activity Units"
194msgstr "Monthly Services & Activity Units"
195
196#. module: account_analytic_package
197#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
198msgid "account.analytic.line.package.month"
199msgstr "account.analytic.line.package.month"
200
201#. module: account_analytic_package
202#: field:account.analytic.line.package,unit_amount:0
203msgid "Quantity"
204msgstr "Quantity"
205
206#. module: account_analytic_package
207#: field:crm.case.section,analytic_account_id:0
208msgid "Main Analytic Account"
209msgstr "Main Analytic Account"
210
211#. module: account_analytic_package
212#: field:account.analytic.account,package_ok:0
213msgid "Used in Package"
214msgstr "Used in Package"
215
216#. module: account_analytic_package
217#: field:account.analytic.line.package,partner_id:0
218#: field:account.analytic.line.package.month,partner_id:0
219msgid "Partner"
220msgstr "Företag"
221
222#. module: account_analytic_package
223#: field:account.analytic.line.package.month,total_activity:0
224msgid "Total Activity"
225msgstr "Total Activity"
0226
=== added file 'account_analytic_package/i18n/vi.po'
--- account_analytic_package/i18n/vi.po 1970-01-01 00:00:00 +0000
+++ account_analytic_package/i18n/vi.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,225 @@
1# Vietnamese translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:16+0000\n"
11"PO-Revision-Date: 2011-05-18 23:47+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_package
21#: constraint:ir.model:0
22msgid ""
23"The Object name must start with x_ and not contain any special character !"
24msgstr ""
25"Tên đối tượng phải bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc biệt "
26"nào!"
27
28#. module: account_analytic_package
29#: view:account.analytic.line.package.month:0
30msgid "Signed Units"
31msgstr ""
32
33#. module: account_analytic_package
34#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package
35msgid "account.analytic.line.package"
36msgstr "account.analytic.line.package"
37
38#. module: account_analytic_package
39#: constraint:ir.ui.view:0
40msgid "Invalid XML for View Architecture!"
41msgstr "XML không hợp lệ với Kiến trúc Xem!"
42
43#. module: account_analytic_package
44#: view:account.analytic.account:0
45#: view:crm.case.section:0
46#: field:product.product,package_weight:0
47msgid "Package Weight"
48msgstr ""
49
50#. module: account_analytic_package
51#: view:account.analytic.line.package:0
52#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree
53#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_tree
54msgid "Service & Activity Units"
55msgstr ""
56
57#. module: account_analytic_package
58#: constraint:ir.actions.act_window:0
59msgid "Invalid model name in the action definition."
60msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
61
62#. module: account_analytic_package
63#: view:account.analytic.line.package:0
64msgid "Units"
65msgstr "Các đơn vị"
66
67#. module: account_analytic_package
68#: view:product.product:0
69msgid "<0 if it's a service unit"
70msgstr ""
71
72#. module: account_analytic_package
73#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_tree_simplified
74msgid "Service & Activity Units (no partner and account)"
75msgstr ""
76
77#. module: account_analytic_package
78#: field:account.analytic.line.package,product_id:0
79#: field:account.analytic.line.package.month,product_id:0
80msgid "Product"
81msgstr ""
82
83#. module: account_analytic_package
84#: field:crm.case.section,analytic_journal_id:0
85msgid "Analytic Journal"
86msgstr ""
87
88#. module: account_analytic_package
89#: view:account.analytic.line.package.month:0
90#: view:crm.case.section:0
91#: view:product.product:0
92msgid "Analytic Package"
93msgstr ""
94
95#. module: account_analytic_package
96#: view:product.product:0
97msgid "Zero if not part of a package"
98msgstr ""
99
100#. module: account_analytic_package
101#: field:account.analytic.line.package.month,total_service:0
102msgid "Total Service"
103msgstr ""
104
105#. module: account_analytic_package
106#: field:account.analytic.line.package,unit_weight:0
107msgid "Unit Weight"
108msgstr ""
109
110#. module: account_analytic_package
111#: view:product.product:0
112msgid "Package Units"
113msgstr ""
114
115#. module: account_analytic_package
116#: field:account.analytic.line.package,date:0
117#: field:account.analytic.line.package.month,name:0
118msgid "Date"
119msgstr ""
120
121#. module: account_analytic_package
122#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package
123msgid "Packages"
124msgstr ""
125
126#. module: account_analytic_package
127#: view:account.analytic.line.package.month:0
128#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_service_tree
129#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_service_tree
130msgid "Service Units"
131msgstr ""
132
133#. module: account_analytic_package
134#: field:account.analytic.line.package,total_weight:0
135#: field:account.analytic.line.package.month,total_weight:0
136msgid "Total Weight"
137msgstr ""
138
139#. module: account_analytic_package
140#: model:ir.actions.act_window,name:account_analytic_package.action_package_product_tree
141#: model:ir.ui.menu,name:account_analytic_package.menu_action_package_product_tree
142#: view:product.product:0
143msgid "Products Units"
144msgstr ""
145
146#. module: account_analytic_package
147#: model:ir.module.module,description:account_analytic_package.module_meta_information
148msgid ""
149"The Module allows to configure analytic account for product packages.\n"
150" Views for total and monthly product packages weight, Amount analysis."
151msgstr ""
152
153#. module: account_analytic_package
154#: field:account.analytic.line.package,account_id:0
155msgid "Account"
156msgstr ""
157
158#. module: account_analytic_package
159#: model:ir.module.module,shortdesc:account_analytic_package.module_meta_information
160msgid "account_analytic_package"
161msgstr ""
162
163#. module: account_analytic_package
164#: field:account.analytic.line.package,name:0
165msgid "Name"
166msgstr ""
167
168#. module: account_analytic_package
169#: view:account.analytic.line.package.month:0
170#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_activity_tree
171#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_activity_tree
172msgid "Activity Units"
173msgstr ""
174
175#. module: account_analytic_package
176#: view:crm.case.section:0
177msgid "The parent account of all package account"
178msgstr ""
179
180#. module: account_analytic_package
181#: field:crm.case.section,package_product_id:0
182msgid "Package Product"
183msgstr ""
184
185#. module: account_analytic_package
186#: view:product.product:0
187msgid ">0 if it's a activity unit"
188msgstr ""
189
190#. module: account_analytic_package
191#: model:ir.actions.act_window,name:account_analytic_package.action_account_analytic_line_package_month_tree
192#: model:ir.ui.menu,name:account_analytic_package.menu_account_analytic_line_package_month_tree
193msgid "Monthly Services & Activity Units"
194msgstr ""
195
196#. module: account_analytic_package
197#: model:ir.model,name:account_analytic_package.model_account_analytic_line_package_month
198msgid "account.analytic.line.package.month"
199msgstr ""
200
201#. module: account_analytic_package
202#: field:account.analytic.line.package,unit_amount:0
203msgid "Quantity"
204msgstr ""
205
206#. module: account_analytic_package
207#: field:crm.case.section,analytic_account_id:0
208msgid "Main Analytic Account"
209msgstr ""
210
211#. module: account_analytic_package
212#: field:account.analytic.account,package_ok:0
213msgid "Used in Package"
214msgstr ""
215
216#. module: account_analytic_package
217#: field:account.analytic.line.package,partner_id:0
218#: field:account.analytic.line.package.month,partner_id:0
219msgid "Partner"
220msgstr ""
221
222#. module: account_analytic_package
223#: field:account.analytic.line.package.month,total_activity:0
224msgid "Total Activity"
225msgstr ""
0226
=== added directory 'account_analytic_progress'
=== added file 'account_analytic_progress/__init__.py.OTHER'
--- account_analytic_progress/__init__.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/__init__.py.OTHER 2012-05-07 20:14:26 +0000
@@ -0,0 +1,22 @@
1##############################################################################
2#
3# OpenERP, Open Source Management Solution
4# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20
21# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
22
023
=== added file 'account_analytic_progress/__terp__.py.OTHER'
--- account_analytic_progress/__terp__.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/__terp__.py.OTHER 2012-05-07 20:14:26 +0000
@@ -0,0 +1,41 @@
1##############################################################################
2#
3# OpenERP, Open Source Management Solution
4# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20{
21 "name" : "Account Analytic Progress - Define Progress bar for analytic accounts",
22 "description": """Progress bar for analytic accounts.
23This is the module used for displaying the shared funded
24development projects on the Tiny ERP website.""",
25 "version" : "1.0",
26 "author" : "tiny",
27 "category" : "Generic Modules/Accounting",
28 "module": "",
29 "website": "http://www.openerp.com",
30 "depends" : ["account_analytic_analysis"],
31 "init_xml" : [],
32 "update_xml" : [
33 "account_analytic_progress_view.xml"
34 ],
35 "demo_xml" : [],
36 "active": False,
37 "installable": True,
38
39}
40# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
41
042
=== added directory 'account_analytic_progress/i18n'
=== added file 'account_analytic_progress/i18n/account_analytic_progress.pot'
--- account_analytic_progress/i18n/account_analytic_progress.pot 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/account_analytic_progress.pot 2012-05-07 20:14:26 +0000
@@ -0,0 +1,45 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_progress
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.6\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:48:05+0000\n"
10"PO-Revision-Date: 2009-11-24 12:48:05+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_analytic_progress
19#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
20#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
21msgid "Remainging turnover by account"
22msgstr ""
23
24#. module: account_analytic_progress
25#: constraint:ir.ui.view:0
26msgid "Invalid XML for View Architecture!"
27msgstr ""
28
29#. module: account_analytic_progress
30#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
31msgid "account_analytic_progress"
32msgstr ""
33
34#. module: account_analytic_progress
35#: model:ir.module.module,description:account_analytic_progress.module_meta_information
36msgid "Progress bar for analytic accounts.\n"
37"This is the module used for displaying the shared funded\n"
38"development projects on the Tiny ERP website."
39msgstr ""
40
41#. module: account_analytic_progress
42#: constraint:ir.actions.act_window:0
43msgid "Invalid model name in the action definition."
44msgstr ""
45
046
=== added file 'account_analytic_progress/i18n/ar.po'
--- account_analytic_progress/i18n/ar.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/ar.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,50 @@
1# Arabic translation for openobject-addons
2# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2012-02-06 11:26+0000\n"
12"Last-Translator: husam <Unknown>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr "الباقي المسترجع للحساب"
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr "لم يتم العرض هناك خطأ في XML"
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr "عملية تحليل الحسابات"
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43"شريط عملية تحليل الحسابات\n"
44"هذه هي الوحدة المستخدمة لعرض تمويل مشترك\n"
45"المشاريع المطورة في موقع تني لتخطيط موارد المؤسسات"
46
47#. module: account_analytic_progress
48#: constraint:ir.actions.act_window:0
49msgid "Invalid model name in the action definition."
50msgstr "اسم نموذج خاطئ في تعريف الإجراء."
051
=== added file 'account_analytic_progress/i18n/bg.po'
--- account_analytic_progress/i18n/bg.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/bg.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,47 @@
1# Bulgarian translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2011-03-30 07:16+0000\n"
12"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr ""
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr ""
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr ""
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43
44#. module: account_analytic_progress
45#: constraint:ir.actions.act_window:0
46msgid "Invalid model name in the action definition."
47msgstr "Невалидно име на модел при задаване на действие"
048
=== added file 'account_analytic_progress/i18n/es.po'
--- account_analytic_progress/i18n/es.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/es.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,50 @@
1# Spanish translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2011-02-15 15:01+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr "Pérdida restante por cuenta"
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr "¡XML inválido para la estructura de la vista!"
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr "account_analytic_progress"
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43"Barra de progreso para cuentas analíticas.\n"
44"Este es el módulo que se utiliza para mostrar proyectos de\n"
45"desarrollo con fondos compartidos en la web de Tiny ERP."
46
47#. module: account_analytic_progress
48#: constraint:ir.actions.act_window:0
49msgid "Invalid model name in the action definition."
50msgstr "Nombre de modelo inválido en la definición de acción."
051
=== added file 'account_analytic_progress/i18n/fr_BE.po'
--- account_analytic_progress/i18n/fr_BE.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/fr_BE.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,45 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_progress
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.6\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:48:05+0000\n"
10"PO-Revision-Date: 2009-11-24 12:48:05+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_analytic_progress
19#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
20#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
21msgid "Remainging turnover by account"
22msgstr ""
23
24#. module: account_analytic_progress
25#: constraint:ir.ui.view:0
26msgid "Invalid XML for View Architecture!"
27msgstr ""
28
29#. module: account_analytic_progress
30#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
31msgid "account_analytic_progress"
32msgstr ""
33
34#. module: account_analytic_progress
35#: model:ir.module.module,description:account_analytic_progress.module_meta_information
36msgid "Progress bar for analytic accounts.\n"
37"This is the module used for displaying the shared funded\n"
38"development projects on the Tiny ERP website."
39msgstr ""
40
41#. module: account_analytic_progress
42#: constraint:ir.actions.act_window:0
43msgid "Invalid model name in the action definition."
44msgstr ""
45
046
=== added file 'account_analytic_progress/i18n/it.po'
--- account_analytic_progress/i18n/it.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/it.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,47 @@
1# Italian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2011-02-15 15:01+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Italian <it@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr ""
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr "XML non valido per visualizzare l'Achitettura!"
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr "account_analytic_progress"
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43
44#. module: account_analytic_progress
45#: constraint:ir.actions.act_window:0
46msgid "Invalid model name in the action definition."
47msgstr "Nome modello non valido nella definizione dell'azione."
048
=== added file 'account_analytic_progress/i18n/nl.po'
--- account_analytic_progress/i18n/nl.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/nl.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,47 @@
1# Dutch translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2011-02-15 15:01+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr ""
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr ""
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr ""
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43
44#. module: account_analytic_progress
45#: constraint:ir.actions.act_window:0
46msgid "Invalid model name in the action definition."
47msgstr ""
048
=== added file 'account_analytic_progress/i18n/ru.po'
--- account_analytic_progress/i18n/ru.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/ru.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,47 @@
1# Russian translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:48+0000\n"
11"PO-Revision-Date: 2011-03-30 17:22+0000\n"
12"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
13"Language-Team: Russian <ru@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_progress
21#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
22#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
23msgid "Remainging turnover by account"
24msgstr ""
25
26#. module: account_analytic_progress
27#: constraint:ir.ui.view:0
28msgid "Invalid XML for View Architecture!"
29msgstr "Неправильный XML для просмотра структуры!"
30
31#. module: account_analytic_progress
32#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
33msgid "account_analytic_progress"
34msgstr ""
35
36#. module: account_analytic_progress
37#: model:ir.module.module,description:account_analytic_progress.module_meta_information
38msgid ""
39"Progress bar for analytic accounts.\n"
40"This is the module used for displaying the shared funded\n"
41"development projects on the Tiny ERP website."
42msgstr ""
43
44#. module: account_analytic_progress
45#: constraint:ir.actions.act_window:0
46msgid "Invalid model name in the action definition."
47msgstr "Недопустимое имя модели в определении действия"
048
=== added file 'account_analytic_progress/i18n/sv.po'
--- account_analytic_progress/i18n/sv.po 1970-01-01 00:00:00 +0000
+++ account_analytic_progress/i18n/sv.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,49 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_progress
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 5.0.14\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2009-11-24 12:48+0000\n"
10"PO-Revision-Date: 2011-02-15 15:01+0000\n"
11"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"X-Launchpad-Export-Date: 2012-04-05 04:53+0000\n"
17"X-Generator: Launchpad (build 15060)\n"
18
19#. module: account_analytic_progress
20#: model:ir.actions.act_window,name:account_analytic_progress.action_account_analytic_progress_graph
21#: model:ir.ui.menu,name:account_analytic_progress.menu_account_analytic_progress_graph
22msgid "Remainging turnover by account"
23msgstr ""
24
25#. module: account_analytic_progress
26#: constraint:ir.ui.view:0
27msgid "Invalid XML for View Architecture!"
28msgstr ""
29
30#. module: account_analytic_progress
31#: model:ir.module.module,shortdesc:account_analytic_progress.module_meta_information
32msgid "account_analytic_progress"
33msgstr ""
34
35#. module: account_analytic_progress
36#: model:ir.module.module,description:account_analytic_progress.module_meta_information
37msgid ""
38"Progress bar for analytic accounts.\n"
39"This is the module used for displaying the shared funded\n"
40"development projects on the Tiny ERP website."
41msgstr ""
42"Progress bar for analytic accounts.\n"
43"This is the module used for displaying the shared funded\n"
44"development projects on the Tiny ERP website."
45
46#. module: account_analytic_progress
47#: constraint:ir.actions.act_window:0
48msgid "Invalid model name in the action definition."
49msgstr ""
050
=== added directory 'account_analytic_required'
=== added file 'account_analytic_required/__init__.py'
--- account_analytic_required/__init__.py 1970-01-01 00:00:00 +0000
+++ account_analytic_required/__init__.py 2012-05-07 20:14:26 +0000
@@ -0,0 +1,24 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# Account analytic required module for OpenERP
5# Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
6# @author Alexis de Lattre <alexis.delattre@akretion.com>
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23
24import account
025
=== added file 'account_analytic_required/__terp__.py'
--- account_analytic_required/__terp__.py 1970-01-01 00:00:00 +0000
+++ account_analytic_required/__terp__.py 2012-05-07 20:14:26 +0000
@@ -0,0 +1,44 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# Account analytic required module for OpenERP
5# Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
6# @author Alexis de Lattre <alexis.delattre@akretion.com>
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23
24{
25 'name': 'Account analytic required',
26 'version': '0.1',
27 'category': 'Generic Modules/Accounting',
28 'license': 'AGPL-3',
29 'description': """This module adds an option "analytic policy" on account types. You have the choice between 3 policies : always, never and optional.
30
31For example, if you want to have an analytic account on all your expenses, set the policy to "always" for the account type "expense" ; then, if you try to save an account move line with an account of type "expense" without analytic account, you will get an error message.
32
33Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during the Akretion-Camptocamp code sprint of June 2011.
34""",
35 'author': 'Akretion',
36 'website': 'http://www.akretion.com/',
37 'depends': ['account'],
38 'init_xml': [],
39 'update_xml': ['account_view.xml'],
40 'demo_xml': [],
41 'installable': True,
42 'active': False,
43}
44
045
=== added file 'account_analytic_required/account.py'
--- account_analytic_required/account.py 1970-01-01 00:00:00 +0000
+++ account_analytic_required/account.py 2012-05-07 20:14:26 +0000
@@ -0,0 +1,67 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# Account analytic required module for OpenERP
5# Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
6# @author Alexis de Lattre <alexis.delattre@akretion.com>
7# Developped during the Akretion-Camptocamp code sprint of June 2011
8#
9# This program is free software: you can redistribute it and/or modify
10# it under the terms of the GNU Affero General Public License as
11# published by the Free Software Foundation, either version 3 of the
12# License, or (at your option) any later version.
13#
14# This program is distributed in the hope that it will be useful,
15# but WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17# GNU Affero General Public License for more details.
18#
19# You should have received a copy of the GNU Affero General Public License
20# along with this program. If not, see <http://www.gnu.org/licenses/>.
21#
22##############################################################################
23
24from osv import fields, osv
25from tools.translate import _
26
27
28class account_account_type(osv.osv):
29 _inherit = "account.account.type"
30
31 _columns = {
32 'analytic_policy' : fields.selection([
33 ('optional', 'Optional'),
34 ('always', 'Always'),
35 ('never', 'Never')
36 ], 'Policy for analytic account', help="Set the policy for analytic accounts : if you select 'Optional', the accountant is free to put an analytic account on an account move line with this type of account ; if you select 'Always', the accountant will get an error message if there is no analytic account ; if you select 'Never', the accountant will get an error message if an analytic account is present."),
37 }
38
39 _defaults = {
40 'analytic_policy': lambda *a: 'optional',
41 }
42
43account_account_type()
44
45
46class account_move_line(osv.osv):
47 _inherit = "account.move.line"
48
49 def check_analytic_required(self, cr, uid, vals, context=None):
50 if vals.has_key('account_id'):
51 account = self.pool.get('account.account').browse(cr, uid, vals['account_id'], context=context)
52 if account.user_type.analytic_policy == 'always' and not vals.get('analytic_account_id', False):
53 raise osv.except_osv(_('Error :'), _("Analytic policy is set to 'Always' with account %s '%s' but the analytic account is missing in the account move line with label '%s'." % (account.code, account.name, vals.get('name', False))))
54 elif account.user_type.analytic_policy == 'never' and vals.get('analytic_account_id', False):
55 cur_analytic_account = self.pool.get('account.analytic.account').read(cr, uid, vals['analytic_account_id'], ['name', 'code'], context=context)
56 raise osv.except_osv(_('Error :'), _("Analytic policy is set to 'Never' with account %s '%s' but the account move line with label '%s' has an analytic account %s '%s'." % (account.code, account.name, vals.get('name', False), cur_analytic_account['code'], cur_analytic_account['name'])))
57 return True
58
59 def create(self, cr, uid, vals, context=None, check=True):
60 self.check_analytic_required(cr, uid, vals, context=context)
61 return super(account_move_line, self).create(cr, uid, vals, context=context, check=check)
62
63 def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
64 self.check_analytic_required(cr, uid, vals, context=context)
65 return super(account_move_line, self).write(cr, uid, ids, vals, context=context, check=check, update_check=update_check)
66
67account_move_line()
068
=== added file 'account_analytic_required/account_view.xml'
--- account_analytic_required/account_view.xml 1970-01-01 00:00:00 +0000
+++ account_analytic_required/account_view.xml 2012-05-07 20:14:26 +0000
@@ -0,0 +1,24 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 Account analytic required module for OpenERP
4 Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
5 @author Alexis de Lattre <alexis.delattre@akretion.com>
6 The licence is in the file __terp__.py
7-->
8
9<openerp>
10<data>
11
12<record id="account_analytic_required_account_type_form" model="ir.ui.view">
13 <field name="name">account_analytic_required.account_type_form</field>
14 <field name="model">account.account.type</field>
15 <field name="inherit_id" ref="account.view_account_type_form" />
16 <field name="arch" type="xml">
17 <field name="code" position="after">
18 <field name="analytic_policy" select="2" />
19 </field>
20 </field>
21</record>
22
23</data>
24</openerp>
025
=== added directory 'account_analytic_required/i18n'
=== added file 'account_analytic_required/i18n/account_analytic_required.pot'
--- account_analytic_required/i18n/account_analytic_required.pot 1970-01-01 00:00:00 +0000
+++ account_analytic_required/i18n/account_analytic_required.pot 2012-05-07 20:14:26 +0000
@@ -0,0 +1,94 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_required
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.2\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-06-10 07:49+0000\n"
10"PO-Revision-Date: 2011-06-10 07:49+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_analytic_required
19#: field:account.account.type,analytic_policy:0
20msgid "Policy for analytic account"
21msgstr ""
22
23#. module: account_analytic_required
24#: help:account.account.type,analytic_policy:0
25msgid "Set the policy for analytic accounts : if you select 'Optional', the accountant is free to put an analytic account on an account move line with this type of account ; if you select 'Always', the accountant will get an error message if there is no analytic account ; if you select 'Never', the accountant will get an error message if an analytic account is present."
26msgstr ""
27
28#. module: account_analytic_required
29#: selection:account.account.type,analytic_policy:0
30msgid "Optional"
31msgstr ""
32
33#. module: account_analytic_required
34#: model:ir.module.module,description:account_analytic_required.module_meta_information
35msgid "This module adds an option \"analytic policy\" on account types. You have the choice between 3 policies : always, never and optional.\n"
36"\n"
37"For example, if you want to have an analytic account on all your expenses, set the policy to \"always\" for the account type \"expense\" ; then, if you try to save an account move line with an account of type \"expense\" without analytic account, you will get an error message.\n"
38"\n"
39"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during the Akretion-Camptocamp code sprint of June 2011.\n"
40""
41msgstr ""
42
43#. module: account_analytic_required
44#: constraint:account.move.line:0
45msgid "You can not create move line on closed account."
46msgstr ""
47
48#. module: account_analytic_required
49#: selection:account.account.type,analytic_policy:0
50msgid "Always"
51msgstr ""
52
53#. module: account_analytic_required
54#: selection:account.account.type,analytic_policy:0
55msgid "Never"
56msgstr ""
57
58#. module: account_analytic_required
59#: model:ir.module.module,shortdesc:account_analytic_required.module_meta_information
60msgid "Account analytic required"
61msgstr ""
62
63#. module: account_analytic_required
64#: sql_constraint:account.move.line:0
65msgid "Wrong credit or debit value in accounting entry !"
66msgstr ""
67
68#. module: account_analytic_required
69#: constraint:account.move.line:0
70msgid "You can not create move line on view account."
71msgstr ""
72
73#. module: account_analytic_required
74#: model:ir.model,name:account_analytic_required.model_account_move_line
75msgid "Journal Items"
76msgstr ""
77
78#. module: account_analytic_required
79#: model:ir.model,name:account_analytic_required.model_account_account_type
80msgid "Account Type"
81msgstr ""
82
83#. module: account_analytic_required
84#: constraint:account.move.line:0
85msgid "Company must be same for its related account and period."
86msgstr ""
87
88#. module: account_analytic_required
89#: code:addons/account_analytic_required/account.py:53
90#: code:addons/account_analytic_required/account.py:56
91#, python-format
92msgid "Error :"
93msgstr ""
94
095
=== added file 'account_analytic_required/i18n/ar.po'
--- account_analytic_required/i18n/ar.po 1970-01-01 00:00:00 +0000
+++ account_analytic_required/i18n/ar.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,120 @@
1# Arabic translation for openobject-addons
2# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2011-06-10 07:49+0000\n"
11"PO-Revision-Date: 2012-02-08 07:01+0000\n"
12"Last-Translator: husam <Unknown>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-04-05 05:03+0000\n"
18"X-Generator: Launchpad (build 15060)\n"
19
20#. module: account_analytic_required
21#: field:account.account.type,analytic_policy:0
22msgid "Policy for analytic account"
23msgstr "سياسة للحسابات التحليلية"
24
25#. module: account_analytic_required
26#: help:account.account.type,analytic_policy:0
27msgid ""
28"Set the policy for analytic accounts : if you select 'Optional', the "
29"accountant is free to put an analytic account on an account move line with "
30"this type of account ; if you select 'Always', the accountant will get an "
31"error message if there is no analytic account ; if you select 'Never', the "
32"accountant will get an error message if an analytic account is present."
33msgstr ""
34"ضع سياسة للحسابات التحليلية: إذا قمت بتحديد \"الاختياري\"، فان المحاسب حر في "
35"وضع حساب تحليلي على حساب خط التحرك مع هذا النوع من الحساب، وإذا قمت بتحديد "
36"\"دائما\"، فان المحاسب سوف يحصل على رسالة خطأ إذا كان هناك لا يوجد حساب "
37"تحليلي، وإذا قمت بتحديد \"أبدا\"، فان المحاسب سوف يحصل على رسالة خطأ إذا كان "
38"هناك حساب تحليلي موجود"
39
40#. module: account_analytic_required
41#: selection:account.account.type,analytic_policy:0
42msgid "Optional"
43msgstr "إختياري"
44
45#. module: account_analytic_required
46#: model:ir.module.module,description:account_analytic_required.module_meta_information
47msgid ""
48"This module adds an option \"analytic policy\" on account types. You have "
49"the choice between 3 policies : always, never and optional.\n"
50"\n"
51"For example, if you want to have an analytic account on all your expenses, "
52"set the policy to \"always\" for the account type \"expense\" ; then, if you "
53"try to save an account move line with an account of type \"expense\" without "
54"analytic account, you will get an error message.\n"
55"\n"
56"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during "
57"the Akretion-Camptocamp code sprint of June 2011.\n"
58msgstr ""
59"هذه الوحدة تضيف خيار \"السياسة التحليلية\" على أنواع الحسابات. لديك خيار بين "
60"3 سياسات: دائما، أبدا، واختياري.\n"
61"\n"
62"على سبيل المثال، إذا كنت تريد أن يكون لديك حساب تحليلي عن جميع النفقات "
63"الخاصة بك، اختار النهج \"دائما\" من أجل نوع الحساب\"مصروف\"، ثم، إذا حاولت "
64"حفظ الحركة في حساب مع حساب \"مصروف\" من دون حساب تحليلي، وسوف تحصل على "
65"رسالة خطأ.\n"
66"\n"
67"طورت الوحدة بواسطة اتر أليكسيس دي alexis.delattre@akretion.com> Akretion-"
68"Camptocamp من يونيو 2011\n"
69
70#. module: account_analytic_required
71#: constraint:account.move.line:0
72msgid "You can not create move line on closed account."
73msgstr "لا يمكنك انشاء حركة على الحساب"
74
75#. module: account_analytic_required
76#: selection:account.account.type,analytic_policy:0
77msgid "Always"
78msgstr "دائماً"
79
80#. module: account_analytic_required
81#: selection:account.account.type,analytic_policy:0
82msgid "Never"
83msgstr "أبدًا"
84
85#. module: account_analytic_required
86#: model:ir.module.module,shortdesc:account_analytic_required.module_meta_information
87msgid "Account analytic required"
88msgstr "مطلوب حساب تحليلي"
89
90#. module: account_analytic_required
91#: sql_constraint:account.move.line:0
92msgid "Wrong credit or debit value in accounting entry !"
93msgstr "قيمة دائنة أو مدينة خاطئة في القيد المحاسبي !"
94
95#. module: account_analytic_required
96#: constraint:account.move.line:0
97msgid "You can not create move line on view account."
98msgstr "لا يمكنك عمل حركة على هذا الحساب"
99
100#. module: account_analytic_required
101#: model:ir.model,name:account_analytic_required.model_account_move_line
102msgid "Journal Items"
103msgstr "عناصر دفتر اليومية"
104
105#. module: account_analytic_required
106#: model:ir.model,name:account_analytic_required.model_account_account_type
107msgid "Account Type"
108msgstr "نوع الحساب"
109
110#. module: account_analytic_required
111#: constraint:account.move.line:0
112msgid "Company must be same for its related account and period."
113msgstr "يجب ان تكون الشركة نفس فترتها وحسابها المتعلق بها."
114
115#. module: account_analytic_required
116#: code:addons/account_analytic_required/account.py:53
117#: code:addons/account_analytic_required/account.py:56
118#, python-format
119msgid "Error :"
120msgstr "خطأ :"
0121
=== added file 'account_analytic_required/i18n/ca.po'
--- account_analytic_required/i18n/ca.po 1970-01-01 00:00:00 +0000
+++ account_analytic_required/i18n/ca.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,120 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_required
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.2\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-06-10 07:49+0000\n"
10"PO-Revision-Date: 2011-06-24 10:26+0000\n"
11"Last-Translator: jmartin (Zikzakmedia) <jmartin@zikzakmedia.com>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"X-Launchpad-Export-Date: 2012-04-05 05:03+0000\n"
17"X-Generator: Launchpad (build 15060)\n"
18
19#. module: account_analytic_required
20#: field:account.account.type,analytic_policy:0
21msgid "Policy for analytic account"
22msgstr "Política per als comptes analítics"
23
24#. module: account_analytic_required
25#: help:account.account.type,analytic_policy:0
26msgid ""
27"Set the policy for analytic accounts : if you select 'Optional', the "
28"accountant is free to put an analytic account on an account move line with "
29"this type of account ; if you select 'Always', the accountant will get an "
30"error message if there is no analytic account ; if you select 'Never', the "
31"accountant will get an error message if an analytic account is present."
32msgstr ""
33"Configura la política per als comptes analítics: Si seleccioneu 'Opcional', "
34"el comptable és lliure de posar un compte analític en un apunt comptable amb "
35"aquest tipus de compte; si seleccioneu 'Sempre', el comptable rebrà un "
36"missatge d'error si l'apunt no té compte analític; si seleccioneu 'Mai', el "
37"comptable rebrà un missatge d'error si l'apunt té un compte analític."
38
39#. module: account_analytic_required
40#: selection:account.account.type,analytic_policy:0
41msgid "Optional"
42msgstr "Opcional"
43
44#. module: account_analytic_required
45#: model:ir.module.module,description:account_analytic_required.module_meta_information
46msgid ""
47"This module adds an option \"analytic policy\" on account types. You have "
48"the choice between 3 policies : always, never and optional.\n"
49"\n"
50"For example, if you want to have an analytic account on all your expenses, "
51"set the policy to \"always\" for the account type \"expense\" ; then, if you "
52"try to save an account move line with an account of type \"expense\" without "
53"analytic account, you will get an error message.\n"
54"\n"
55"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during "
56"the Akretion-Camptocamp code sprint of June 2011.\n"
57msgstr ""
58"Aquest mòdul afegeix una opció \"política analítica\" als tipus comptables. "
59"Podeu escollir entre 3 polítiques: 'Sempre', 'Mai' i 'Opcional'.\n"
60"\n"
61"Per exemple, si voleu tenir un compte analític de totes les vostres "
62"despeses, seleccioneu la política \"Sempre\" per al tipus comptable "
63"\"Despesa\"; llavors, si intenteu desar un apunt comptable de tipus "
64"comptable \"Despesa\" sense compte analític, obtindreu un missatge d'error.\n"
65"\n"
66"Mòdul desenvolupat per Alexis de Lattre <alexis.delattre@akretion.com> "
67"durant la cursa de codi Akretion-Camptocamp de juny de 2011.\n"
68
69#. module: account_analytic_required
70#: constraint:account.move.line:0
71msgid "You can not create move line on closed account."
72msgstr "No podeu crear un apunt en un compte tancat."
73
74#. module: account_analytic_required
75#: selection:account.account.type,analytic_policy:0
76msgid "Always"
77msgstr "Sempre"
78
79#. module: account_analytic_required
80#: selection:account.account.type,analytic_policy:0
81msgid "Never"
82msgstr "Mai"
83
84#. module: account_analytic_required
85#: model:ir.module.module,shortdesc:account_analytic_required.module_meta_information
86msgid "Account analytic required"
87msgstr "El compte analític és requerit."
88
89#. module: account_analytic_required
90#: sql_constraint:account.move.line:0
91msgid "Wrong credit or debit value in accounting entry !"
92msgstr "Valor erroni al deure o a l'haver de l'assentament comptable!"
93
94#. module: account_analytic_required
95#: constraint:account.move.line:0
96msgid "You can not create move line on view account."
97msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
98
99#. module: account_analytic_required
100#: model:ir.model,name:account_analytic_required.model_account_move_line
101msgid "Journal Items"
102msgstr "Apunts comptables"
103
104#. module: account_analytic_required
105#: model:ir.model,name:account_analytic_required.model_account_account_type
106msgid "Account Type"
107msgstr "Tipus de compte"
108
109#. module: account_analytic_required
110#: constraint:account.move.line:0
111msgid "Company must be same for its related account and period."
112msgstr ""
113"La companyia ha de ser la mateixa que la dels comptes i períodes relacionats."
114
115#. module: account_analytic_required
116#: code:addons/account_analytic_required/account.py:53
117#: code:addons/account_analytic_required/account.py:56
118#, python-format
119msgid "Error :"
120msgstr "Error:"
0121
=== added file 'account_analytic_required/i18n/es.po'
--- account_analytic_required/i18n/es.po 1970-01-01 00:00:00 +0000
+++ account_analytic_required/i18n/es.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,122 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_required
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.2\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-06-10 07:49+0000\n"
10"PO-Revision-Date: 2011-06-24 10:25+0000\n"
11"Last-Translator: jmartin (Zikzakmedia) <jmartin@zikzakmedia.com>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"X-Launchpad-Export-Date: 2012-04-05 05:03+0000\n"
17"X-Generator: Launchpad (build 15060)\n"
18
19#. module: account_analytic_required
20#: field:account.account.type,analytic_policy:0
21msgid "Policy for analytic account"
22msgstr "Política para las cuentas analíticas"
23
24#. module: account_analytic_required
25#: help:account.account.type,analytic_policy:0
26msgid ""
27"Set the policy for analytic accounts : if you select 'Optional', the "
28"accountant is free to put an analytic account on an account move line with "
29"this type of account ; if you select 'Always', the accountant will get an "
30"error message if there is no analytic account ; if you select 'Never', the "
31"accountant will get an error message if an analytic account is present."
32msgstr ""
33"Configura la política para las cuentas analíticas: Si selecciona 'Opcional', "
34"el contable es libre de poner una cuenta analítica en un apunte contable de "
35"este tipo de cuenta; si selecciona 'Siempre', el contable recibirá un "
36"mensaje de error si el apunte no tiene cuenta analítica; si selecciona "
37"'Nunca', el contable recibirá un mensaje de error si el apunte tiene una "
38"cuenta analítica."
39
40#. module: account_analytic_required
41#: selection:account.account.type,analytic_policy:0
42msgid "Optional"
43msgstr "Opcional"
44
45#. module: account_analytic_required
46#: model:ir.module.module,description:account_analytic_required.module_meta_information
47msgid ""
48"This module adds an option \"analytic policy\" on account types. You have "
49"the choice between 3 policies : always, never and optional.\n"
50"\n"
51"For example, if you want to have an analytic account on all your expenses, "
52"set the policy to \"always\" for the account type \"expense\" ; then, if you "
53"try to save an account move line with an account of type \"expense\" without "
54"analytic account, you will get an error message.\n"
55"\n"
56"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during "
57"the Akretion-Camptocamp code sprint of June 2011.\n"
58msgstr ""
59"Este módulo añade una opción \"política analítica\" a los tipos contables. "
60"Puede escoger entre 3 políticas: 'Siempre', 'Nunca' y 'Opcional'.\n"
61"\n"
62"Por ejemplo, si quiere tener una cuenta analítica de todos sus gastos, "
63"seleccione la política \"Siempre\" para el tipo contable \"Gasto\"; "
64"entonces, si intenta guardar un apunte contable de tipo contable \"Gasto\" "
65"sin cuenta analítica, obtendrá un mensaje de error.\n"
66"\n"
67"Módulo desarrollado por Alexis de Lattre <alexis.delattre@akretion.com> "
68"durante la carrera de código Akretion-Camptocamp de junio de 2011.\n"
69
70#. module: account_analytic_required
71#: constraint:account.move.line:0
72msgid "You can not create move line on closed account."
73msgstr "No puede crear un apunte en una cuenta cerrada."
74
75#. module: account_analytic_required
76#: selection:account.account.type,analytic_policy:0
77msgid "Always"
78msgstr "Siempre"
79
80#. module: account_analytic_required
81#: selection:account.account.type,analytic_policy:0
82msgid "Never"
83msgstr "Nunca"
84
85#. module: account_analytic_required
86#: model:ir.module.module,shortdesc:account_analytic_required.module_meta_information
87msgid "Account analytic required"
88msgstr "La cuenta analítica es requerida."
89
90#. module: account_analytic_required
91#: sql_constraint:account.move.line:0
92msgid "Wrong credit or debit value in accounting entry !"
93msgstr "¡Valor erróneo en el debe o en el haber del asiento contable!"
94
95#. module: account_analytic_required
96#: constraint:account.move.line:0
97msgid "You can not create move line on view account."
98msgstr "No puede crear un apunte en una cuenta de tipo \"Vista\"."
99
100#. module: account_analytic_required
101#: model:ir.model,name:account_analytic_required.model_account_move_line
102msgid "Journal Items"
103msgstr "Apuntes contables"
104
105#. module: account_analytic_required
106#: model:ir.model,name:account_analytic_required.model_account_account_type
107msgid "Account Type"
108msgstr "Tipo de cuenta"
109
110#. module: account_analytic_required
111#: constraint:account.move.line:0
112msgid "Company must be same for its related account and period."
113msgstr ""
114"La compañía debe ser la misma que la de las cuentas y los periodos "
115"relacionados."
116
117#. module: account_analytic_required
118#: code:addons/account_analytic_required/account.py:53
119#: code:addons/account_analytic_required/account.py:56
120#, python-format
121msgid "Error :"
122msgstr "Error:"
0123
=== added file 'account_analytic_required/i18n/fr.po'
--- account_analytic_required/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ account_analytic_required/i18n/fr.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,121 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_analytic_required
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.2\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-06-10 07:49+0000\n"
10"PO-Revision-Date: 2011-06-14 15:19+0000\n"
11"Last-Translator: Alexis de Lattre <alexis@via.ecp.fr>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"X-Launchpad-Export-Date: 2012-04-05 05:03+0000\n"
17"X-Generator: Launchpad (build 15060)\n"
18
19#. module: account_analytic_required
20#: field:account.account.type,analytic_policy:0
21msgid "Policy for analytic account"
22msgstr "Politique pour les comptes analytiques"
23
24#. module: account_analytic_required
25#: help:account.account.type,analytic_policy:0
26msgid ""
27"Set the policy for analytic accounts : if you select 'Optional', the "
28"accountant is free to put an analytic account on an account move line with "
29"this type of account ; if you select 'Always', the accountant will get an "
30"error message if there is no analytic account ; if you select 'Never', the "
31"accountant will get an error message if an analytic account is present."
32msgstr ""
33"Configurez la politique pour les comptes analytiques : si vous sélectionnez "
34"'Optionnel', le comptable est libre de saisir ou non un compte analytique "
35"sur une ligne comptable avec ce type de compte de comptabilité générale ; si "
36"vous sélectionnez 'Toujours', le comptable aura un message d'erreur si il "
37"n'y a pas de compte analytique ; si vous sélectionnez 'Jamais', le comptable "
38"aura un message d'erreur si un compte analytique est présent."
39
40#. module: account_analytic_required
41#: selection:account.account.type,analytic_policy:0
42msgid "Optional"
43msgstr "Optionnel"
44
45#. module: account_analytic_required
46#: model:ir.module.module,description:account_analytic_required.module_meta_information
47msgid ""
48"This module adds an option \"analytic policy\" on account types. You have "
49"the choice between 3 policies : always, never and optional.\n"
50"\n"
51"For example, if you want to have an analytic account on all your expenses, "
52"set the policy to \"always\" for the account type \"expense\" ; then, if you "
53"try to save an account move line with an account of type \"expense\" without "
54"analytic account, you will get an error message.\n"
55"\n"
56"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during "
57"the Akretion-Camptocamp code sprint of June 2011.\n"
58msgstr ""
59"This module adds an option \"analytic policy\" on account types. You have "
60"the choice between 3 policies : always, never and optional.\n"
61"\n"
62"For example, if you want to have an analytic account on all your expenses, "
63"set the policy to \"always\" for the account type \"expense\" ; then, if you "
64"try to save an account move line with an account of type \"expense\" without "
65"analytic account, you will get an error message.\n"
66"\n"
67"Module developped by Alexis de Lattre <alexis.delattre@akretion.com> during "
68"the Akretion-Camptocamp code sprint of June 2011.\n"
69
70#. module: account_analytic_required
71#: constraint:account.move.line:0
72msgid "You can not create move line on closed account."
73msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé"
74
75#. module: account_analytic_required
76#: selection:account.account.type,analytic_policy:0
77msgid "Always"
78msgstr "Toujours"
79
80#. module: account_analytic_required
81#: selection:account.account.type,analytic_policy:0
82msgid "Never"
83msgstr "Jamais"
84
85#. module: account_analytic_required
86#: model:ir.module.module,shortdesc:account_analytic_required.module_meta_information
87msgid "Account analytic required"
88msgstr "Account analytic required"
89
90#. module: account_analytic_required
91#: sql_constraint:account.move.line:0
92msgid "Wrong credit or debit value in accounting entry !"
93msgstr "Valeur erronée au crédit ou au débit de la pièce comptable !"
94
95#. module: account_analytic_required
96#: constraint:account.move.line:0
97msgid "You can not create move line on view account."
98msgstr ""
99"Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
100
101#. module: account_analytic_required
102#: model:ir.model,name:account_analytic_required.model_account_move_line
103msgid "Journal Items"
104msgstr "Écritures comptables"
105
106#. module: account_analytic_required
107#: model:ir.model,name:account_analytic_required.model_account_account_type
108msgid "Account Type"
109msgstr "Type de compte"
110
111#. module: account_analytic_required
112#: constraint:account.move.line:0
113msgid "Company must be same for its related account and period."
114msgstr "La société doit être la même pour les comptes et périodes liées."
115
116#. module: account_analytic_required
117#: code:addons/account_analytic_required/account.py:53
118#: code:addons/account_analytic_required/account.py:56
119#, python-format
120msgid "Error :"
121msgstr "Erreur :"
0122
=== added directory 'account_anglo_saxon'
=== renamed directory 'account_anglo_saxon' => 'account_anglo_saxon.moved'
=== added directory 'account_anglo_saxon/i18n'
=== added file 'account_anglo_saxon/i18n/ar.po'
--- account_anglo_saxon/i18n/ar.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/ar.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Arabic translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-06-23 04:52+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr "حساب الأسهم"
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "هناك خطأ في XML للعرض!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "حساب تفريق السعر"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr "سوف يستخدم هذا الحساب لتفريق السعر بين قيمة سعر الشراء وسعر التكلفة."
065
=== added file 'account_anglo_saxon/i18n/bg.po'
--- account_anglo_saxon/i18n/bg.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/bg.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,80 @@
1# Bulgarian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-02-17 06:05+0000\n"
12"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Счетоводство на собственост"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Този модул поддържа англо-саксонската методика за счетоводство \n"
42" променяйки счетоводната логика при складови движения. Разликата между "
43"държавите с англо-саксонско счетоводство \n"
44" и държавите със счетоводство Рейн, или още наричани държави с "
45"контининтално счетоводство е момента на отчитане на цената на продадените "
46"стоки срещу цената на продажбите. \n"
47" Англо-саксонското счетоводство отчита цената при издаване на фактура, "
48"континенталното счетоводство отчита цената в момента на доставка на "
49"стоката.\n"
50" Този модул прибавя тази функционалност чрез използването на междинна "
51"сметка за съхраняване на стойността на доставените стоки и отчитане обратно "
52"на тази междинна сметка \n"
53" при издаване на фактура, за да се прехвърли стойността й към сметката на "
54"длъжника, или към сметката на кредитора."
55
56#. module: account_anglo_saxon
57#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
58msgid "Stock Account"
59msgstr "Сметка Склад"
60
61#. module: account_anglo_saxon
62#: constraint:ir.ui.view:0
63msgid "Invalid XML for View Architecture!"
64msgstr "Невалиден XML за преглед на архитектурата"
65
66#. module: account_anglo_saxon
67#: field:product.category,property_account_creditor_price_difference_categ:0
68#: field:product.template,property_account_creditor_price_difference:0
69msgid "Price Difference Account"
70msgstr "Сметка Разлика в цената"
71
72#. module: account_anglo_saxon
73#: help:product.category,property_account_creditor_price_difference_categ:0
74#: help:product.template,property_account_creditor_price_difference:0
75msgid ""
76"This account will be used to value price difference between purchase price "
77"and cost price."
78msgstr ""
79"Тази сметка ще бъде използвана за пресмятане на разликата между покупната "
80"цена и цената на себестойност."
081
=== added file 'account_anglo_saxon/i18n/de.po'
--- account_anglo_saxon/i18n/de.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/de.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,83 @@
1# German translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-11-16 20:34+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Finanzkonten Einstellungen"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Dieses Modul unterstützt die angelsächsische Buchungslogik durch eine \n"
42" Änderung der Buchungslogik bei der Lagerbuchhaltung. Ein wesentlicher "
43"Unterschied zwischen der angelsächsichen Buchungslogik und der Methodik der "
44"kontinental-europäischen \n"
45" Länder, liegt in verschiedenen Zeitpunkten der Buchung des "
46"Materialaufwands aus Warenverkauf. \n"
47" Die angelsächsische Finanzbuchhaltung bucht den Warenaufwand zum "
48"Zeitpunkt des Warenverkaufs, kontinental-europäische Länder buchen den "
49"Warenaufwand erst zum Zeitpunkt des Warenabgangs unter Berücksichtigung von "
50"Preisdifferenzen zwischen Ein- und Verkauf.\n"
51" Dieses Modul erweitert OpenERP um die angelsächsiche Buchungsmethode, "
52"indem zusätzlich zum Zeitpunkt des Warenabgangs auf ein separates "
53"Zwischenkonto gebucht \n"
54" wird. Dieses Interimskonto wird dann erst bei der Rechnungsbuchung "
55"entweder gegen Debitor (Kundenrechnung)oder Kreditor (Lieferantenrechnung) "
56"mitsamt Preisdifferenz ausgeglichen."
57
58#. module: account_anglo_saxon
59#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
60msgid "Stock Account"
61msgstr "Lagerbestandskonto"
62
63#. module: account_anglo_saxon
64#: constraint:ir.ui.view:0
65msgid "Invalid XML for View Architecture!"
66msgstr "Fehler in XML Quellen für diese Ansicht"
67
68#. module: account_anglo_saxon
69#: field:product.category,property_account_creditor_price_difference_categ:0
70#: field:product.template,property_account_creditor_price_difference:0
71msgid "Price Difference Account"
72msgstr "Konto Preisdifferenz"
73
74#. module: account_anglo_saxon
75#: help:product.category,property_account_creditor_price_difference_categ:0
76#: help:product.template,property_account_creditor_price_difference:0
77msgid ""
78"This account will be used to value price difference between purchase price "
79"and cost price."
80msgstr ""
81"Dieses Konto wird genutzt, um Unterschiede zwischen Einkaufs- und "
82"Verkaufspreis der Rechnung und Durchschnittspreisen zum Zeitpunkt des "
83"Warenzu- oder Warenabgangs als Preisdifferenz zu buchen."
084
=== added file 'account_anglo_saxon/i18n/el.po'
--- account_anglo_saxon/i18n/el.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/el.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,80 @@
1# Greek translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-06-09 04:31+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Greek <el@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Λογιστική Αξία"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Αυτή η μονάδα θα υποστηρίξει την Αγγλοσαξονική λογιστική μεθοδολογία με \n"
42" αλλαγή της λογιστικής λογικής με τις συνναλαγές μετοχών. Η διαφορά "
43"ανάμεσα στη λογιστική των Αγγλοσαξονικών χωρών \n"
44" και του Ρήνου ή της επωνομαζόμενης λογιστικής των ηπειρωτικών χωρών, "
45"είναι η στιγμή που υπολογίζεται το κόστος κτήσης έναντι του κόστους "
46"πωλήσεων. \n"
47" Η Αγγλοσαξωνική λογιστική υπολογίζει το κόστος όταν δημιουργείται το "
48"τιμολόγιο πώλησης. Η ηπειρωτική λογιστική υπολογίζει το κόστος τη στιγμή που "
49"τα προϊοντα αποστέλονται.\n"
50" Αυτή η μονάδα θα προσθέση αυτή τη λειτουργία χρησιμοποιώντας έναν "
51"ενδιάμεσο λογαριασμό, για να αποθηκεύση την αξία των απεσταλμένων προϊόντων "
52"και θα χρησιμοποιήσει αυτό τον ενδιάμεσο λογαριασμό \n"
53" όταν δημιουργηθεί το τιμολόγιο για να μεταφέρει αυτό το ποσό στο "
54"λογαριασμό χρέωσης ή πίστωσης."
55
56#. module: account_anglo_saxon
57#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
58msgid "Stock Account"
59msgstr "Λογαριασμός μετοχής"
60
61#. module: account_anglo_saxon
62#: constraint:ir.ui.view:0
63msgid "Invalid XML for View Architecture!"
64msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
65
66#. module: account_anglo_saxon
67#: field:product.category,property_account_creditor_price_difference_categ:0
68#: field:product.template,property_account_creditor_price_difference:0
69msgid "Price Difference Account"
70msgstr "Λογαριασμός διαφοράς τιμής"
71
72#. module: account_anglo_saxon
73#: help:product.category,property_account_creditor_price_difference_categ:0
74#: help:product.template,property_account_creditor_price_difference:0
75msgid ""
76"This account will be used to value price difference between purchase price "
77"and cost price."
78msgstr ""
79"Αυτός ο λογαριασμός θα χρησιμοποιείται να μετράει τη διαφορά μεταξύ τιμής "
80"αγοράς και τιμή κόστους."
081
=== added file 'account_anglo_saxon/i18n/es.po'
--- account_anglo_saxon/i18n/es.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/es.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,79 @@
1# Spanish translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-04-24 06:34+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Contabilidad de la propiedad"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Éste módulo soportará la metodología de contabilización Anglosajona \n"
42" cambiando la lógica de contabilización con transacciones de acciones. La "
43"diferencia entre los países de contabilización Anglosajona \n"
44" y el Rin o también llamados países de contabilización Continental es el "
45"momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
46" La contabilización Anglosajona toma el costo cuando la factura de ventas "
47"es creada, la contabilización Continental tomará el costo en el momento en "
48"que los bienes son enviados.\n"
49" Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
50"para almacenar el valor de los bienes enviados y devolverá esta cuenta "
51"provisional \n"
52" cuando la factura sea creada para transferir esta cantidad al deudor o "
53"acreedor de la cuenta."
54
55#. module: account_anglo_saxon
56#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
57msgid "Stock Account"
58msgstr "Cuenta de Valores"
59
60#. module: account_anglo_saxon
61#: constraint:ir.ui.view:0
62msgid "Invalid XML for View Architecture!"
63msgstr "¡XML Inválido para la Arquitectura de la Vista!"
64
65#. module: account_anglo_saxon
66#: field:product.category,property_account_creditor_price_difference_categ:0
67#: field:product.template,property_account_creditor_price_difference:0
68msgid "Price Difference Account"
69msgstr "Precio de la cuenta diferencia"
70
71#. module: account_anglo_saxon
72#: help:product.category,property_account_creditor_price_difference_categ:0
73#: help:product.template,property_account_creditor_price_difference:0
74msgid ""
75"This account will be used to value price difference between purchase price "
76"and cost price."
77msgstr ""
78"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
79"precio de compra y precio de coste"
080
=== added file 'account_anglo_saxon/i18n/es_EC.po'
--- account_anglo_saxon/i18n/es_EC.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/es_EC.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,79 @@
1# Spanish (Ecuador) translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-09-17 15:28+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Contabilidad de la propiedad"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Éste módulo soportará la metodología de contabilización Anglosajona \n"
42" cambiando la lógica de contabilización con transacciones de acciones. La "
43"diferencia entre los países de contabilización Anglosajona \n"
44" y el Rin o también llamados países de contabilización Continental es el "
45"momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
46" La contabilización Anglosajona toma el costo cuando la factura de ventas "
47"es creada, la contabilización Continental tomará el costo en el momento en "
48"que los bienes son enviados.\n"
49" Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
50"para almacenar el valor de los bienes enviados y devolverá esta cuenta "
51"provisional \n"
52" cuando la factura sea creada para transferir esta cantidad al deudor o "
53"acreedor de la cuenta."
54
55#. module: account_anglo_saxon
56#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
57msgid "Stock Account"
58msgstr "Cuenta de Valores"
59
60#. module: account_anglo_saxon
61#: constraint:ir.ui.view:0
62msgid "Invalid XML for View Architecture!"
63msgstr "¡XML Inválido para la Arquitectura de la Vista!"
64
65#. module: account_anglo_saxon
66#: field:product.category,property_account_creditor_price_difference_categ:0
67#: field:product.template,property_account_creditor_price_difference:0
68msgid "Price Difference Account"
69msgstr "Precio de la cuenta diferencia"
70
71#. module: account_anglo_saxon
72#: help:product.category,property_account_creditor_price_difference_categ:0
73#: help:product.template,property_account_creditor_price_difference:0
74msgid ""
75"This account will be used to value price difference between purchase price "
76"and cost price."
77msgstr ""
78"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
79"precio de compra y precio de coste"
080
=== added file 'account_anglo_saxon/i18n/et.po'
--- account_anglo_saxon/i18n/et.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/et.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Estonian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-04-24 06:52+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Estonian <et@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr "Laoarvestuse"
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "Vigane XML vaate arhitektuurile!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr ""
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
065
=== added file 'account_anglo_saxon/i18n/fr.po'
--- account_anglo_saxon/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/fr.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,66 @@
1# French translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-12-21 13:58+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Propriété de comptabilité"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "XML invalide pour l'architecture de la vue !"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "Compte d'écart de prix"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
65"Ce compte sera utilisé pour valoriser l'écart de prix entre le prix d'achat "
66"et le prix standard de l'article."
067
=== added file 'account_anglo_saxon/i18n/hi.po'
--- account_anglo_saxon/i18n/hi.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/hi.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,65 @@
1# Hindi translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-03-17 05:27+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Hindi <hi@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " लेखांकन संपत्ति"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "संरचना देखने के लिए अमान्य XML!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "मुल्यांतर खाता"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
65"इस खाता का उपयोग क्रय मूल्य और विक्रय मूल्य का अंतर निकालने में किया जायेगा"
066
=== added file 'account_anglo_saxon/i18n/hu.po'
--- account_anglo_saxon/i18n/hu.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/hu.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Hungarian translation for openobject-addons
2# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2011-01-10 09:28+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr ""
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "Árkülönbözet számla"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
065
=== added file 'account_anglo_saxon/i18n/id.po'
--- account_anglo_saxon/i18n/id.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/id.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Indonesian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-05-28 04:46+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Indonesian <id@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr ""
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
065
=== added file 'account_anglo_saxon/i18n/it.po'
--- account_anglo_saxon/i18n/it.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/it.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,66 @@
1# Italian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-08-18 12:13+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Italian <it@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Proprietà Contabili"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr "Conto Prodotto"
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "XML non valido per visualizzare l'Achitettura!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "Contro Differenze di prezzo"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
65"Questo conto viene usato per valorizzare le differenze di prezzo tra il "
66"prezzo di vendita e il prezzo di acquisto."
067
=== added file 'account_anglo_saxon/i18n/mn.po'
--- account_anglo_saxon/i18n/mn.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/mn.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,66 @@
1# Mongolian translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-10-15 11:25+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Mongolian <mn@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Тооцооны Хөрөнгө"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr "Агуулахын данс"
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "Дэлгэцийн XML алдаатай!"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "Үнийн өөрчлөлтийн данс"
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
65"Энэ данс нь худалдан авалтын үнэ болон өртгийн үнийн хоорондох үнийн "
66"өөрчлөлтийг дүгнэхийн тулд ашиглагдана."
067
=== added file 'account_anglo_saxon/i18n/nl.po'
--- account_anglo_saxon/i18n/nl.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/nl.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,79 @@
1# Dutch translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-07-17 05:02+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Administratieve instelling"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Deze module geeft ondersteuning voor de Angelsaksische boekhoud methoden "
42"door \n"
43" de boekingslogica bij voorraad transacties te veranderen. Het verschil "
44"tussen de Angelsaksische boekhoud landen en de\n"
45" Rijn- of ook wel continentale boekhoud landen is het moment van het "
46"nemen van de kosten van verkochte goederen versus kostprijs verkopen. \n"
47" Angelsaksische boekhoudingen nemen de kosten op het wanneer de "
48"verkoopfactuur wordt gemaakt, Continentale boekhoudingen wanneer wordt "
49"geleverd.\n"
50" Deze module voegt deze functionaliteit toe door een tussenrekening te "
51"gebruiken voor het boeken van de geleverde goederen en \n"
52" voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
53"boeken naar de klant of leverancier."
54
55#. module: account_anglo_saxon
56#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
57msgid "Stock Account"
58msgstr "Voorraadrekening"
59
60#. module: account_anglo_saxon
61#: constraint:ir.ui.view:0
62msgid "Invalid XML for View Architecture!"
63msgstr "Ongeldige XML voor weergave opbouw!"
64
65#. module: account_anglo_saxon
66#: field:product.category,property_account_creditor_price_difference_categ:0
67#: field:product.template,property_account_creditor_price_difference:0
68msgid "Price Difference Account"
69msgstr "Prijsverschillen rekening"
70
71#. module: account_anglo_saxon
72#: help:product.category,property_account_creditor_price_difference_categ:0
73#: help:product.template,property_account_creditor_price_difference:0
74msgid ""
75"This account will be used to value price difference between purchase price "
76"and cost price."
77msgstr ""
78"Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
79"kostprijs te boeken."
080
=== added file 'account_anglo_saxon/i18n/oc.po'
--- account_anglo_saxon/i18n/oc.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/oc.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Occitan (post 1500) translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-03-13 05:33+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Occitan (post 1500) <oc@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr "XML invalid per l'arquitectura de la vista"
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr ""
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
065
=== added file 'account_anglo_saxon/i18n/pl.po'
--- account_anglo_saxon/i18n/pl.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/pl.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,82 @@
1# Polish translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-02-25 07:13+0000\n"
12"Last-Translator: OpenERP Administrators <Unknown>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr " Właściwości konta"
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41"Ten moduł umożliwia stosowanie Anglosaskiej metodologii księgowej przez "
42"zmianę logiki księgowania \n"
43" przy przesunięciach magazynowych. Różnica pomiędzy krajami anglosaskimi "
44"a innymi (zwanymi kontynentalnymi) \n"
45" polega na momencie księgowania kosztu sprzedaży w stosunku do momentu "
46"sprzedaży. \n"
47" W krajach anglosaskich koszt sprzedaży jest księgowany w momencie "
48"utworzenia faktury. W krajach kontynentalnych \n"
49" koszt jest księgowany w momencie wysyłki towaru.\n"
50" Ten moduł dodaje taką funkcjonalność przez zastosowanie konta "
51"pośredniego, do przechowania wartości wysłanego towaru\n"
52" i stanowi konto przeciwne do księgowania kosztów sprzedaży w momencie "
53"wystawienia faktury.\n"
54"\n"
55" Moduł dodaje również funkcjonalność zliczania odchyleń kosztów od cen "
56"ewidencyjnych."
57
58#. module: account_anglo_saxon
59#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
60msgid "Stock Account"
61msgstr "Konto zapasu"
62
63#. module: account_anglo_saxon
64#: constraint:ir.ui.view:0
65msgid "Invalid XML for View Architecture!"
66msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
67
68#. module: account_anglo_saxon
69#: field:product.category,property_account_creditor_price_difference_categ:0
70#: field:product.template,property_account_creditor_price_difference:0
71msgid "Price Difference Account"
72msgstr "Konto różnic cenowych"
73
74#. module: account_anglo_saxon
75#: help:product.category,property_account_creditor_price_difference_categ:0
76#: help:product.template,property_account_creditor_price_difference:0
77msgid ""
78"This account will be used to value price difference between purchase price "
79"and cost price."
80msgstr ""
81"To konto będzie stosowane do rejestrowania różnic cenowych między ceną "
82"zakupu a kosztem (ceną ewidencyjną)."
083
=== added file 'account_anglo_saxon/i18n/pt.po'
--- account_anglo_saxon/i18n/pt.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/pt.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,64 @@
1# Portuguese translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-12-12 12:32+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr ""
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr ""
57
58#. module: account_anglo_saxon
59#: help:product.category,property_account_creditor_price_difference_categ:0
60#: help:product.template,property_account_creditor_price_difference:0
61msgid ""
62"This account will be used to value price difference between purchase price "
63"and cost price."
64msgstr ""
065
=== added file 'account_anglo_saxon/i18n/pt_BR.po'
--- account_anglo_saxon/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/pt_BR.po 2012-05-07 20:14:26 +0000
@@ -0,0 +1,66 @@
1# Brazilian Portuguese translation for openobject-addons
2# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
3# This file is distributed under the same license as the openobject-addons package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2009-11-24 12:50+0000\n"
11"PO-Revision-Date: 2010-11-25 23:53+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n"
18"X-Generator: Launchpad (build 12177)\n"
19
20#. module: account_anglo_saxon
21#: view:product.category:0
22msgid " Accounting Property"
23msgstr ""
24
25#. module: account_anglo_saxon
26#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
27msgid ""
28"This module will support the Anglo-Saxons accounting methodology by \n"
29" changing the accounting logic with stock transactions. The difference "
30"between the Anglo-Saxon accounting countries \n"
31" and the Rhine or also called Continental accounting countries is the "
32"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
33" Anglo-Saxons accounting does take the cost when sales invoice is "
34"created, Continental accounting will take the cost at he moment the goods "
35"are shipped.\n"
36" This module will add this functionality by using a interim account, to "
37"store the value of shipped goods and will contra book this interim account \n"
38" when the invoice is created to transfer this amount to the debtor or "
39"creditor account."
40msgstr ""
41
42#. module: account_anglo_saxon
43#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
44msgid "Stock Account"
45msgstr ""
46
47#. module: account_anglo_saxon
48#: constraint:ir.ui.view:0
49msgid "Invalid XML for View Architecture!"
50msgstr ""
51
52#. module: account_anglo_saxon
53#: field:product.category,property_account_creditor_price_difference_categ:0
54#: field:product.template,property_account_creditor_price_difference:0
55msgid "Price Difference Account"
56msgstr "Diferença de preço de Conta"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: