pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account,sale,purchase: reflect the changes to pot

Browse Source 
Commits like 622b70ee3e or 9d25cc3429 do break the translations
This commit is contained in:
Martin Trigaux
2018-04-27 17:05:28 +02:00
parent ceeba05d70
commit 6ef1269abe
4 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/account.pot
+22 -19
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
"POT-Creation-Date: 2018-04-27 14:47+0000\n"
"PO-Revision-Date: 2018-04-27 14:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,6 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_state
msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed Invoice.\n"
" * The 'Pro-forma' status is used when the invoice does not have an invoice number.\n"
" * The 'Open' status is used when user creates invoice, an invoice number is generated. It stays in the open status till the user pays the invoice.\n"
" * The 'Paid' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled.\n"
" * The 'Cancelled' status is used when user cancel invoice."
@@ -170,7 +169,7 @@ msgstr ""
#: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
msgid "<div>\n"
"% set record = ctx.get('record')\n"
"% set company = record and record.company_id or user.company_id\n"
"% set company = record and record.company_id or ctx.get('company')\n"
"<table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed; border-collapse:separate;\" summary=\"o_mail_notification\">\n"
"<tbody>\n"
" <!-- HEADER -->\n"
@@ -1480,6 +1479,21 @@ msgstr ""
msgid "Adjustment Tax"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_adjustment_type
msgid "Adjustment Type"
msgstr ""
#. module: account
#: selection:tax.adjustments.wizard,adjustment_type:0
msgid "Adjustment in favor of the Estate"
msgstr ""
#. module: account
#: selection:tax.adjustments.wizard,adjustment_type:0
msgid "Adjustment in your favor"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
#: model:ir.ui.view,arch_db:account.view_tax_form
@@ -5314,7 +5328,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
#: model:ir.ui.view,arch_db:account.portal_my_invoices
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model:ir.ui.view,arch_db:account.view_account_payment_form
#: model:ir.ui.view,arch_db:account.view_account_payment_graph
#: model:ir.ui.view,arch_db:account.view_invoice_graph
@@ -6532,17 +6545,6 @@ msgstr ""
msgid "Normal Text"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_credit_notes
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_invoices
msgid "Not Draft"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Not Paid"
msgstr ""
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:254
@@ -6742,13 +6744,14 @@ msgstr ""
#: selection:account.invoice,state:0
#: selection:account.invoice.report,state:0
#: code:addons/account/static/src/xml/account_payment.xml:82
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#, python-format
msgid "Open"
msgstr ""
#. module: account
#. openerp-web
#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:636
#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:662
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
msgid "Open balance"
@@ -6933,12 +6936,13 @@ msgstr ""
#: selection:account.invoice,state:0
#: selection:account.invoice.report,state:0
#: model:ir.ui.view,arch_db:account.report_overdue_document
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "Paid"
msgstr ""
#. module: account
#: code:addons/account/models/account_payment.py:411
#: code:addons/account/models/account_payment.py:426
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -9667,7 +9671,6 @@ msgid "Total"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
#: model:ir.ui.view,arch_db:account.view_move_tree
msgid "Total Amount"
msgstr ""
addons/mrp_repair/i18n/mrp_repair.pot
+4 -4
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~18\n"
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-02 11:27+0000\n"
"PO-Revision-Date: 2017-10-02 11:27+0000\n"
"POT-Creation-Date: 2018-04-27 14:52+0000\n"
"PO-Revision-Date: 2018-04-27 14:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgid "<?xml version=\"1.0\"?>\n"
" (with reference: ${object.origin} )\n"
" % endif\n"
" % if object.invoice_method != 'none':\n"
" amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}.</strong>\n"
" amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}.</strong>\n"
" % endif\n"
" </p>\n"
" <p>You can reply to this email if you have any questions.</p>\n"
addons/purchase/i18n/purchase.pot
+7 -7
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-16 08:08+0000\n"
"PO-Revision-Date: 2017-11-16 08:08+0000\n"
"POT-Creation-Date: 2018-04-27 14:51+0000\n"
"PO-Revision-Date: 2018-04-27 14:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
#: model:mail.template,body_html:purchase.email_template_edi_purchase
msgid "\n"
"<p>Dear\n"
"% if object.partner_id.is_company and object.child_ids:\n"
"% if object.partner_id.is_company and object.partner_id.child_ids:\n"
" ${object.partner_id.child_ids[0].name}\n"
"% else :\n"
" ${object.partner_id.name}\n"
@@ -32,7 +32,7 @@ msgid "\n"
"% if object.origin:\n"
" (RFQ origin: ${object.origin})\n"
"% endif\n"
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
@@ -49,7 +49,7 @@ msgstr ""
#. module: purchase
#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
msgid "\n"
"<p>Dear ${object.partner_id.name} \n"
"<p>Dear ${object.partner_id.name}\n"
"% if object.partner_id.parent_id:\n"
" (<i>${object.partner_id.parent_id.name}</i>)\n"
"% endif\n"
@@ -62,7 +62,7 @@ msgid "\n"
"% if object.origin:\n"
" (RFQ origin: ${object.origin})\n"
"% endif\n"
"amounting <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
"amounting <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
@@ -130,7 +130,7 @@ msgstr ""
#: model:mail.template,body_html:purchase.mail_template_data_notification_email_purchase_order
msgid "<html>\n"
" <head></head>\n"
" % set company = record and record.company_id or or ctx.get('company')\n"
" % set company = record and record.company_id or ctx.get('company')\n"
" <body style=\"margin: 0; padding: 0;\">\n"
" <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n"
" <tbody>\n"
addons/sale/i18n/sale.pot
+43 -31
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-19 13:43+0000\n"
"PO-Revision-Date: 2018-02-19 13:43+0000\n"
"POT-Creation-Date: 2018-04-27 14:48+0000\n"
"PO-Revision-Date: 2018-04-27 14:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid "\n"
"% if object.origin:\n"
"(with reference: ${object.origin} )\n"
"% endif\n"
"amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong>\n"
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
@@ -129,7 +129,7 @@ msgstr ""
msgid "<html>\n"
" <head></head>\n"
" % set record = ctx.get('record')\n"
" % set company = record and record.company_id or user.company_id\n"
" % set company = record and record.company_id or ctx.get('company')\n"
" <body style=\"margin: 0; padding: 0;\">\n"
" <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed; border-collapse:separate;\" summary=\"o_mail_notification\">\n"
" <tbody>\n"
@@ -228,11 +228,6 @@ msgstr ""
msgid "<span class=\"label label-danger\"><i class=\"fa fa-fw fa-warning\"/><span class=\"hidden-xs\"> Problem</span></span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
msgid "<span class=\"label label-default hidden-xs\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Done</span></span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
@@ -244,11 +239,6 @@ msgstr ""
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Done</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
@@ -259,11 +249,21 @@ msgstr ""
msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Invoiced</span></span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
msgid "<span class=\"label label-success hidden-xs\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Done</span></span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
msgid "<span class=\"label label-success\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "<span>Pro-Forma Invoice # </span>"
@@ -286,6 +286,7 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "<strong>Expiration Date:</strong>"
msgstr ""
@@ -1378,17 +1379,12 @@ msgid "No longer edit orders once confirmed"
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
msgid "Note that once a Quotation becomes a Sales Order, it will be moved\n"
" from the Quotations list to the Sales Order list."
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
msgid "Note that once a Quotation becomes a Sales Order, it will be moved\n"
" from the Quotations list to the Sales Order list."
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
@@ -1610,11 +1606,6 @@ msgstr ""
msgid "Payment"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Payment Acquirers"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_payment_term_id
msgid "Payment Terms"
@@ -2131,6 +2122,11 @@ msgstr ""
msgid "Sell and purchase products in different units of measure"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_website_sale_digital
msgid "Sell digital products - provide downloadable content on your customer portal"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Sell products by multiple of unit # per package"
@@ -2513,6 +2509,22 @@ msgstr ""
msgid "Track Service"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_ups
msgid "UPS"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_usps
msgid "USPS"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:570
#, python-format
msgid "Uncategorized"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_unit
#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
@@ -2656,23 +2668,23 @@ msgid "Your Order has been confirmed."
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
msgid "Your next actions should flow efficiently: confirm the Quotation\n"
" to a Sales Order, then create the Invoice and collect the Payment."
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
msgid "Your next actions should flow efficiently: confirm the Quotation\n"
" to a Sales Order, then create the Invoice and collect the Payment."
msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
msgid "Your next actions should flow efficiently: confirm the Quotation to a Sales Order, then create the Invoice and collect the Payment."
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_bpost
msgid "bpost"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_error
#: model:ir.ui.view,arch_db:sale.portal_order_success