[tryton-debian-vcs] tryton-modules-sale branch debian updated. debian/3.6.0-1-4-g9131b84
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:27:25 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=debian/3.6.0-1-4-g9131b84
commit 9131b84f10e570d4655f4098995e1dffd0639abf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:15 2015 +0100
Merging upstream version 3.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 932573a..2bd628f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 3.8.0 - 2015-11-02
+* Bug fixes (see mercurial logs for details)
+* Delivery Date of Line shows effective date if possible
+* Add shipment party
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 727f1da..b7e26c8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_sale
============
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/doc/index.rst b/doc/index.rst
index 0435a06..ffe455e 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -14,6 +14,7 @@ optional or completed with sensible default values:
- Party: The customer.
- Invoice Address: The invoice address of the customer.
+- Shipment Party: An optional different party where the shipment will be sent.
- Shipment Address: The address where the shipment will be sent.
- Description: An optional description for the order.
- Reference: The internal reference of the sale (will be generated
diff --git a/invoice.py b/invoice.py
index 39578ce..595102a 100644
--- a/invoice.py
+++ b/invoice.py
@@ -73,8 +73,7 @@ class Invoice:
@classmethod
def search_sales(cls, name, clause):
- return [('lines.origin.sale.id',) + tuple(clause[1:])
- + ('sale.line',)]
+ return [('lines.origin.sale',) + tuple(clause[1:]) + ('sale.line',)]
@classmethod
def copy(cls, invoices, default=None):
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 02f9813..eac91a3 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -446,6 +446,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Начин на изпращане"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Върнати доставки"
@@ -764,14 +768,6 @@ msgid "Draft Sale Order"
msgstr "Проект на поръчка за продажба"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Телефон:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Количество"
@@ -804,10 +800,6 @@ msgid "Unit Price"
msgstr "Единична цена"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "ДДС номер:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "ДДС:"
@@ -1004,6 +996,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr "Редове от продажба"
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1034,10 +1030,6 @@ msgid "Handle Shipment Exception"
msgstr "Обработване на грешка при изпращане"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Фактури"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Друга информация"
@@ -1057,10 +1049,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Продажби"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Изпращания"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Движения"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index c3c3ecb..fdae002 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,7 +16,7 @@ msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" is missing the customer location in line \"%(line)s\"."
msgstr ""
"No es troba la localització del client a la línia \"%(line)s\" de la venda "
-"\"%(sale)\"."
+"\"%(sale)s\"."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
@@ -35,7 +35,7 @@ msgid ""
"Invoice and Shipment addresses must be defined for the quotation of sale "
"\"%s\"."
msgstr ""
-"L'adreça d'enviament i facturació s'han de definir per al pressupost de la "
+"L'adreça d'enviament i facturació s'han de definir pel pressupost de la "
"venda \"%s\"."
msgctxt "error:sale.sale:"
@@ -72,7 +72,7 @@ msgstr "Termini de lliurament"
msgctxt "field:product.template,salable:"
msgid "Salable"
-msgstr "Pot ser venut"
+msgstr "Vendible"
msgctxt "field:product.template,sale_uom:"
msgid "Sale UOM"
@@ -448,12 +448,16 @@ msgstr "Data de venda"
msgctxt "field:sale.sale,shipment_address:"
msgid "Shipment Address"
-msgstr "Adreça enviament"
+msgstr "Adreça d'enviament"
msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Mètode d'enviament"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Tercer de l'enviament"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Albarans de devolució"
@@ -598,7 +602,7 @@ msgstr "Tercers amb vendes"
msgctxt "model:ir.action,name:act_return_form"
msgid "Returns"
-msgstr "Devolució"
+msgstr "Albarans de devolució"
msgctxt "model:ir.action,name:act_sale_configuration_form"
msgid "Sales Configuration"
@@ -642,7 +646,7 @@ msgstr "Gestiona excepció d'enviament"
msgctxt "model:ir.action.act_window.domain,name:act_sale_form_domain_all"
msgid "All"
-msgstr "Totes"
+msgstr "Tot"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_confirmed"
@@ -764,14 +768,6 @@ msgid "Draft Sale Order"
msgstr "Comanda de venda esborrany"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correu electrònic:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Telèfon:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Quantitat"
@@ -804,10 +800,6 @@ msgid "Unit Price"
msgstr "Preu unitari"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "CIF/NIF:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "CIF/NIF:"
@@ -1036,10 +1028,6 @@ msgid "Handle Shipment Exception"
msgstr "Gestiona excepció d'enviament"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Factures"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Informació addicional"
@@ -1059,10 +1047,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Vendes"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Albarans"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Moviments"
@@ -1073,7 +1057,7 @@ msgstr "Cancel·la"
msgctxt "wizard_button:sale.handle.invoice.exception,ask,handle:"
msgid "OK"
-msgstr "Accepta"
+msgstr "D'acord"
msgctxt "wizard_button:sale.handle.shipment.exception,ask,end:"
msgid "Cancel"
@@ -1081,7 +1065,7 @@ msgstr "Cancel·la"
msgctxt "wizard_button:sale.handle.shipment.exception,ask,handle:"
msgid "OK"
-msgstr "Accepta"
+msgstr "D'acord"
msgctxt "wizard_button:sale.return_sale,start,end:"
msgid "Cancel"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 612de9d..2b6e79f 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -444,6 +444,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr ""
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -753,14 +757,6 @@ msgid "Draft Sale Order"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr ""
@@ -793,10 +789,6 @@ msgid "Unit Price"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr ""
@@ -992,6 +984,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr ""
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1021,10 +1017,6 @@ msgid "Handle Shipment Exception"
msgstr ""
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr ""
@@ -1044,10 +1036,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr ""
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr ""
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1e0c513..dd00aad 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -42,7 +42,7 @@ msgstr ""
msgctxt "error:sale.sale:"
msgid "It misses an \"Account Receivable\" on the party \"%s\"."
-msgstr "Fehlendes Forderungskonto für Partei \"%s\""
+msgstr "Fehlendes Forderungskonto für Partei \"%s\"."
msgctxt "error:sale.sale:"
msgid "Sale \"%s\" must be cancelled before deletion."
@@ -204,11 +204,11 @@ msgstr "Notiz"
msgctxt "field:sale.line,product:"
msgid "Product"
-msgstr "Artikel"
+msgstr "Variante"
msgctxt "field:sale.line,product_uom_category:"
msgid "Product Uom Category"
-msgstr "Artikel Maßeinheit Kategorie"
+msgstr "Maßeinheitenkategorie"
msgctxt "field:sale.line,quantity:"
msgid "Quantity"
@@ -462,6 +462,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Liefermethode"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Lieferpartei"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Lieferposten Rücknahmen"
@@ -603,7 +607,7 @@ msgstr "Rechnungsausgang"
msgctxt "model:ir.action,name:act_open_customer"
msgid "Parties associated to Sales"
-msgstr "Parteien: Verkäufen zugeordnet"
+msgstr "Parteien mit Verkäufen"
msgctxt "model:ir.action,name:act_return_form"
msgid "Returns"
@@ -686,7 +690,7 @@ msgstr "Einstellungen"
msgctxt "model:ir.ui.menu,name:menu_customer"
msgid "Parties associated to Sales"
-msgstr "Parteien: Verkäufen zugeordnet"
+msgstr "Parteien mit Verkäufen"
msgctxt "model:ir.ui.menu,name:menu_sale"
msgid "Sales"
@@ -773,14 +777,6 @@ msgid "Draft Sale Order"
msgstr "Auftrag (Entwurf)"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Telefon:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Anzahl"
@@ -813,10 +809,6 @@ msgid "Unit Price"
msgstr "Einzelpreis"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "USt-ID-Nr.:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "USt-ID-Nr:"
@@ -838,7 +830,7 @@ msgstr "Manuell"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Order Processed"
-msgstr "Nach Auftragsausführung"
+msgstr "Bei Auftragsausführung"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Shipment Sent"
@@ -854,7 +846,7 @@ msgstr "Bei Bezahlung"
msgctxt "selection:sale.configuration,sale_shipment_method:"
msgid "On Order Processed"
-msgstr "Nach Auftragsausführung"
+msgstr "Bei Auftragsausführung"
msgctxt "selection:sale.line,type:"
msgid "Comment"
@@ -878,7 +870,7 @@ msgstr "Manuell"
msgctxt "selection:sale.sale,invoice_method:"
msgid "On Order Processed"
-msgstr "Nach Auftragsausführung"
+msgstr "Bei Auftragsausführung"
msgctxt "selection:sale.sale,invoice_method:"
msgid "On Shipment Sent"
@@ -910,7 +902,7 @@ msgstr "Bei Bezahlung"
msgctxt "selection:sale.sale,shipment_method:"
msgid "On Order Processed"
-msgstr "Nach Auftragsausführung"
+msgstr "Bei Auftragsausführung"
msgctxt "selection:sale.sale,shipment_state:"
msgid "Exception"
@@ -970,7 +962,7 @@ msgstr "Verkauf"
msgctxt "view:product.product:"
msgid "Products"
-msgstr "Artikel"
+msgstr "Varianten"
msgctxt "view:product.template:"
msgid "Customers"
@@ -1046,10 +1038,6 @@ msgid "Handle Shipment Exception"
msgstr "Liefervorbehalt bearbeiten"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Rechnungen"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Sonstiges"
@@ -1069,10 +1057,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Verkäufe"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Lieferposten"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Lagerbewegungen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 2def8da..a90c33c 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -14,11 +14,13 @@ msgstr ""
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" is missing the customer location in line \"%(line)s\"."
msgstr ""
-"Falta la ubicación del cliente en la línea «%(line)s» de la venta «%(sale)»."
+"Falta la ubicación del cliente en la línea «%(line)s» de la venta "
+"«%(sale)s»."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
-msgstr "Falta la propiedad «Cuenta a cobrar» por defecto de las ventas."
+msgstr ""
+"Falta la propiedad «Cuenta a cobrar» por defecto de la venta «%(sale)s»."
msgctxt "error:sale.sale:"
msgid "Invalid combination of shipment and invoicing methods on sale \"%s\"."
@@ -450,6 +452,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Método de envío"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Entidad de envío"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Remitos de devolución"
@@ -760,14 +766,6 @@ msgid "Draft Sale Order"
msgstr "Ordenes de venta en borrador"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Teléfono:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Cantidad"
@@ -800,10 +798,6 @@ msgid "Unit Price"
msgstr "Precio unitario"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "CUIT:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "CUIT:"
@@ -1032,10 +1026,6 @@ msgid "Handle Shipment Exception"
msgstr "Gestionar excepción de remito"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Información adicional"
@@ -1055,10 +1045,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Ventas"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Remitos"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Movimientos"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0777ec3..a5b26d0 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -453,6 +453,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Método de Envío"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Devolución"
@@ -763,14 +767,6 @@ msgid "Draft Sale Order"
msgstr "Pedido en Borrador"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Teléfono:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Cantidad"
@@ -803,10 +799,6 @@ msgid "Unit Price"
msgstr "Precio Unitario"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "Número Identificación:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "NIT:"
@@ -1035,10 +1027,6 @@ msgid "Handle Shipment Exception"
msgstr "Gestionar Excepción de Envío"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Info Adicional"
@@ -1058,10 +1046,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Ventas"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Envios"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Movimientos"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 2bc547c..dff1f04 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -9,20 +9,18 @@ msgstr "No puede restablecer a borrador una factura generada por una venta."
msgctxt "error:sale.line:"
msgid "Product \"%(product)s\" of sale %(sale)s misses a revenue account."
msgstr ""
-"Al producto \"%(product)s\" de la venta \"%(sale)s\" le falta definir la "
-"cuenta de ingresos."
+"Al producto \"%(product)s\" de la venta %(sale)s le falta definir la cuenta "
+"de ingresos."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" is missing the customer location in line \"%(line)s\"."
-msgstr ""
-"A la venta \"%(sale)s\" le falta la bodega del cliente en la línea "
-"\"%(line)s\"."
+msgstr "Falta la ubicación cliente en la línea \"%(line)s\" de la venta \"%(sale)s\"."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
msgstr ""
"A la venta \"%(sale)s\" le falta la propiedad por defecto \"Cuenta de "
-"Ingresos\"."
+"ingresos\"."
msgctxt "error:sale.sale:"
msgid "Invalid combination of shipment and invoicing methods on sale \"%s\"."
@@ -48,7 +46,7 @@ msgstr "La venta \"%s\" debe ser cancelada antes de ser eliminada."
msgctxt "error:sale.sale:"
msgid "Warehouse must be defined for the quotation of sale \"%s\"."
-msgstr "Se debe definir el depósito para la cotización de la venta \"%s\"."
+msgstr "Se debe definir la bodega para la cotización de la venta \"%s\"."
msgctxt "error:stock.shipment.out.return:"
msgid "You cannot reset to draft a move generated by a sale."
@@ -100,7 +98,7 @@ msgstr "Método de facturación"
msgctxt "field:sale.configuration,sale_sequence:"
msgid "Sale Reference Sequence"
-msgstr "Secuencia de pedidos de venta"
+msgstr "Secuencia de referencia de venta"
msgctxt "field:sale.configuration,sale_shipment_method:"
msgid "Sale Shipment Method"
@@ -140,7 +138,7 @@ msgstr "Recrear movimientos"
msgctxt "field:sale.line,amount:"
msgid "Amount"
-msgstr "Subtotal"
+msgstr "Importe"
msgctxt "field:sale.line,create_date:"
msgid "Create Date"
@@ -224,7 +222,7 @@ msgstr "Impuestos"
msgctxt "field:sale.line,to_location:"
msgid "To Location"
-msgstr "A bodega"
+msgstr "A ubicación"
msgctxt "field:sale.line,type:"
msgid "Type"
@@ -244,7 +242,7 @@ msgstr "Precio unitario"
msgctxt "field:sale.line,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Bodega"
msgctxt "field:sale.line,write_date:"
msgid "Write Date"
@@ -454,9 +452,13 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Método de envío"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Tercero del envío"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
-msgstr "Devolución de envío"
+msgstr "Guías de remisión de devolución"
msgctxt "field:sale.sale,shipment_state:"
msgid "Shipment State"
@@ -464,7 +466,7 @@ msgstr "Estado de envío"
msgctxt "field:sale.sale,shipments:"
msgid "Shipments"
-msgstr "Envíos"
+msgstr "Guías de remisión"
msgctxt "field:sale.sale,state:"
msgid "State"
@@ -484,19 +486,19 @@ msgstr "Total"
msgctxt "field:sale.sale,total_amount_cache:"
msgid "Total Tax"
-msgstr "Total Impuestos"
+msgstr "Total impuestos"
msgctxt "field:sale.sale,untaxed_amount:"
msgid "Untaxed"
-msgstr "Base sin impuesto"
+msgstr "Base imponible"
msgctxt "field:sale.sale,untaxed_amount_cache:"
msgid "Untaxed Cache"
-msgstr "Base sin impuesto precalculada"
+msgstr "Base imponible precalculada"
msgctxt "field:sale.sale,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Bodega"
msgctxt "field:sale.sale,write_date:"
msgid "Write Date"
@@ -622,7 +624,7 @@ msgstr "Ventas"
msgctxt "model:ir.action,name:act_shipment_form"
msgid "Shipments"
-msgstr "Envíos"
+msgstr "Guías de remisión"
msgctxt "model:ir.action,name:report_sale"
msgid "Sale"
@@ -634,7 +636,7 @@ msgstr "Gestionar excepción de factura"
msgctxt "model:ir.action,name:wizard_return_sale"
msgid "Return Sale"
-msgstr "Crear devolución de venta"
+msgstr "Devolución de venta"
msgctxt "model:ir.action,name:wizard_shipment_handle_exception"
msgid "Handle Shipment Exception"
@@ -656,7 +658,7 @@ msgstr "Borrador"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_processing"
msgid "Processing"
-msgstr "En Proceso"
+msgstr "En proceso"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_quotation"
@@ -717,7 +719,7 @@ msgstr "Línea de venta"
msgctxt "model:sale.line-account.tax,name:"
msgid "Sale Line - Tax"
-msgstr "Línea de Venta - Impuesto"
+msgstr "Línea de venta - Impuesto"
msgctxt "model:sale.line-ignored-stock.move,name:"
msgid "Sale Line - Ignored Move"
@@ -745,7 +747,7 @@ msgstr "Venta - Factura recreada"
msgctxt "odt:sale.sale:"
msgid "Amount"
-msgstr "Subtotal"
+msgstr "Importe"
msgctxt "odt:sale.sale:"
msgid "Date:"
@@ -764,14 +766,6 @@ msgid "Draft Sale Order"
msgstr "Pedido de venta en borrador"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Teléfono:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Cantidad"
@@ -793,7 +787,7 @@ msgstr "Impuestos:"
msgctxt "odt:sale.sale:"
msgid "Total (excl. taxes):"
-msgstr "Base (sin impuestos):"
+msgstr "Total (sin impuestos):"
msgctxt "odt:sale.sale:"
msgid "Total:"
@@ -804,12 +798,8 @@ msgid "Unit Price"
msgstr "Precio unitario"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "Número de RUC:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
-msgstr "RUC:"
+msgstr "CI/RUC:"
msgctxt "selection:account.invoice,sale_exception_state:"
msgid ""
@@ -829,7 +819,7 @@ msgstr "Manual"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Order Processed"
-msgstr "Al procesar pedido"
+msgstr "Al procesar el pedido"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Shipment Sent"
@@ -889,7 +879,7 @@ msgstr "Pagada"
msgctxt "selection:sale.sale,invoice_state:"
msgid "Waiting"
-msgstr "En Espera"
+msgstr "En espera"
msgctxt "selection:sale.sale,shipment_method:"
msgid "Manual"
@@ -1036,10 +1026,6 @@ msgid "Handle Shipment Exception"
msgstr "Gestionar excepción de envío"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Información adicional"
@@ -1059,10 +1045,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Ventas"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Envíos"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Movimientos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 3f93637..5571a45 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -16,7 +16,7 @@ msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" is missing the customer location in line \"%(line)s\"."
msgstr ""
"Falta la ubicación del cliente en la línea \"%(line)s\" de la venta "
-"\"%(sale)\"."
+"\"%(sale)s\"."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
@@ -35,7 +35,7 @@ msgid ""
"Invoice and Shipment addresses must be defined for the quotation of sale "
"\"%s\"."
msgstr ""
-"Las direcciones de envío y facturación se deben definir para el presupuesto "
+"Se deben definir las direcciones de envío y facturación para el presupuesto "
"de venta \"%s\"."
msgctxt "error:sale.sale:"
@@ -72,7 +72,7 @@ msgstr "Plazo de entrega"
msgctxt "field:product.template,salable:"
msgid "Salable"
-msgstr "Puede ser vendido"
+msgstr "Vendible"
msgctxt "field:product.template,sale_uom:"
msgid "Sale UOM"
@@ -454,6 +454,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Método de envío"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Tercero del envío"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Albaranes de devolución"
@@ -598,7 +602,7 @@ msgstr "Terceros con ventas"
msgctxt "model:ir.action,name:act_return_form"
msgid "Returns"
-msgstr "Devolución"
+msgstr "Albaranes de devolución"
msgctxt "model:ir.action,name:act_sale_configuration_form"
msgid "Sales Configuration"
@@ -764,14 +768,6 @@ msgid "Draft Sale Order"
msgstr "Ventas borrador"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Teléfono:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Cantidad"
@@ -804,10 +800,6 @@ msgid "Unit Price"
msgstr "Precio unidad"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "CIF/NIF:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "CIF/NIF:"
@@ -1036,10 +1028,6 @@ msgid "Handle Shipment Exception"
msgstr "Gestionar excepción de envío"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Información adicional"
@@ -1059,10 +1047,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Ventas"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Albaranes"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Movimientos"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 93%
copy from locale/es_ES.po
copy to locale/es_MX.po
index 3f93637..968b24b 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -21,7 +21,7 @@ msgstr ""
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
msgstr ""
-"Falta la propiedad \"Cuenta de ingresos\" por defecto en la venta "
+"Falta la propiedad \"Cuenta de ingresos\" predefinida en la venta "
"\"%(sale)s\"."
msgctxt "error:sale.sale:"
@@ -40,7 +40,7 @@ msgstr ""
msgctxt "error:sale.sale:"
msgid "It misses an \"Account Receivable\" on the party \"%s\"."
-msgstr "Falta una \"Cuenta a cobrar\" al tercero \"%s\"."
+msgstr "Falta una \"Cuenta a cobrar\" a la entidad \"%s\"."
msgctxt "error:sale.sale:"
msgid "Sale \"%s\" must be cancelled before deletion."
@@ -424,11 +424,11 @@ msgstr "Origen"
msgctxt "field:sale.sale,party:"
msgid "Party"
-msgstr "Tercero"
+msgstr "Entidad"
msgctxt "field:sale.sale,party_lang:"
msgid "Party Language"
-msgstr "Idioma del tercero"
+msgstr "Idioma de la entidad"
msgctxt "field:sale.sale,payment_term:"
msgid "Payment Term"
@@ -454,9 +454,13 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Método de envío"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
-msgstr "Albaranes de devolución"
+msgstr "Envíos de devolución"
msgctxt "field:sale.sale,shipment_state:"
msgid "Shipment State"
@@ -464,7 +468,7 @@ msgstr "Estado envío"
msgctxt "field:sale.sale,shipments:"
msgid "Shipments"
-msgstr "Albaranes"
+msgstr "Envíos"
msgctxt "field:sale.sale,state:"
msgid "State"
@@ -594,7 +598,7 @@ msgstr "Facturas"
msgctxt "model:ir.action,name:act_open_customer"
msgid "Parties associated to Sales"
-msgstr "Terceros con ventas"
+msgstr "Entidades con ventas"
msgctxt "model:ir.action,name:act_return_form"
msgid "Returns"
@@ -622,7 +626,7 @@ msgstr "Ventas"
msgctxt "model:ir.action,name:act_shipment_form"
msgid "Shipments"
-msgstr "Albaranes"
+msgstr "Envíos"
msgctxt "model:ir.action,name:report_sale"
msgid "Sale"
@@ -677,7 +681,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_customer"
msgid "Parties associated to Sales"
-msgstr "Terceros con ventas"
+msgstr "Entidades con ventas"
msgctxt "model:ir.ui.menu,name:menu_sale"
msgid "Sales"
@@ -745,71 +749,59 @@ msgstr "Venta - Factura recreada"
msgctxt "odt:sale.sale:"
msgid "Amount"
-msgstr "Importe"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Date:"
-msgstr "Fecha:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Description"
-msgstr "Descripción"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Description:"
-msgstr "Descripción:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Draft Sale Order"
-msgstr "Ventas borrador"
-
-msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Teléfono:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Quotation N°:"
-msgstr "Presupuesto Nº:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Sale Order N°:"
-msgstr "Venta Nº:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Taxes"
-msgstr "Impuestos"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Taxes:"
-msgstr "Impuestos:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Total (excl. taxes):"
-msgstr "Base imponible:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Total:"
-msgstr "Total:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "Unit Price"
-msgstr "Precio unidad"
-
-msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "CIF/NIF:"
+msgstr ""
msgctxt "odt:sale.sale:"
msgid "VAT:"
-msgstr "CIF/NIF:"
+msgstr ""
msgctxt "selection:account.invoice,sale_exception_state:"
msgid ""
@@ -957,115 +949,107 @@ msgstr "Recreado"
msgctxt "view:party.party:"
msgid "Sale"
-msgstr "Venta"
+msgstr ""
msgctxt "view:product.product:"
msgid "Products"
-msgstr "Productos"
+msgstr ""
msgctxt "view:product.template:"
msgid "Customers"
-msgstr "Clientes"
+msgstr ""
msgctxt "view:sale.configuration:"
msgid "Sale Configuration"
-msgstr "Configuración de venta"
+msgstr ""
msgctxt "view:sale.handle.invoice.exception.ask:"
msgid "Choose invoices to recreate"
-msgstr "Seleccione las facturas a recrear"
+msgstr ""
msgctxt "view:sale.handle.invoice.exception.ask:"
msgid "Handle Invoice Exception"
-msgstr "Gestionar excepción de factura"
+msgstr ""
msgctxt "view:sale.handle.shipment.exception.ask:"
msgid "Choose move to recreate"
-msgstr "Seleccione los movimientos a recrear"
+msgstr ""
msgctxt "view:sale.handle.shipment.exception.ask:"
msgid "Handle shipment Exception"
-msgstr "Gestionar excepción de envío"
+msgstr ""
msgctxt "view:sale.line:"
msgid "General"
-msgstr "General"
+msgstr ""
msgctxt "view:sale.line:"
msgid "Notes"
-msgstr "Notas"
+msgstr ""
msgctxt "view:sale.line:"
msgid "Sale Line"
-msgstr "Línea de venta"
+msgstr ""
msgctxt "view:sale.line:"
msgid "Sale Lines"
-msgstr "Líneas de venta"
+msgstr ""
msgctxt "view:sale.line:"
msgid "Taxes"
-msgstr "Impuestos"
+msgstr ""
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
-msgstr "¿Está seguro de devolver estos pedidos de venta?"
+msgstr ""
msgctxt "view:sale.return_sale.start:"
msgid "Return Sale"
-msgstr "Devolución de venta"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Draft"
-msgstr "Borrador"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Handle Invoice Exception"
-msgstr "Gestionar excepción de factura"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Handle Shipment Exception"
-msgstr "Gestionar excepción de envío"
-
-msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturas"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Other Info"
-msgstr "Información adicional"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Process"
-msgstr "Procesar"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Quote"
-msgstr "Presupuesto"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Sale"
-msgstr "Venta"
+msgstr ""
msgctxt "view:sale.sale:"
msgid "Sales"
-msgstr "Ventas"
-
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Albaranes"
+msgstr ""
msgctxt "view:stock.move:"
msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
msgctxt "wizard_button:sale.handle.invoice.exception,ask,end:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c15eb5e..fc4eb2b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -20,7 +20,7 @@ msgstr ""
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
msgstr ""
-"La propriété par défaut « Compte de produit » est absente de la vente « "
+"La propriété par défaut « compte de produit » est absente de la vente « "
"%(sale)s »."
msgctxt "error:sale.sale:"
@@ -453,6 +453,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Méthode de livraison"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Tiers destinataire"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Retours d'expédition"
@@ -763,14 +767,6 @@ msgid "Draft Sale Order"
msgstr "Bon de commande brouillon"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Email :"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Téléphone :"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Quantité"
@@ -792,7 +788,7 @@ msgstr "Taxes :"
msgctxt "odt:sale.sale:"
msgid "Total (excl. taxes):"
-msgstr "Total (HT) :"
+msgstr "Total (hors taxes) :"
msgctxt "odt:sale.sale:"
msgid "Total:"
@@ -803,10 +799,6 @@ msgid "Unit Price"
msgstr "Prix unitaire"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "Numéro TVA :"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "TVA :"
@@ -928,7 +920,7 @@ msgstr "Confirmé"
msgctxt "selection:sale.sale,state:"
msgid "Done"
-msgstr "Fait"
+msgstr "Terminée"
msgctxt "selection:sale.sale,state:"
msgid "Draft"
@@ -960,7 +952,7 @@ msgstr "Vente"
msgctxt "view:product.product:"
msgid "Products"
-msgstr "produits"
+msgstr "Produits"
msgctxt "view:product.template:"
msgid "Customers"
@@ -1035,10 +1027,6 @@ msgid "Handle Shipment Exception"
msgstr "Gérer l'exception d'expédition"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Factures"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Autre information"
@@ -1058,10 +1046,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Ventes"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Expéditions"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Mouvements"
diff --git a/locale/cs_CZ.po b/locale/hu_HU.po
similarity index 98%
copy from locale/cs_CZ.po
copy to locale/hu_HU.po
index 612de9d..2b6e79f 100644
--- a/locale/cs_CZ.po
+++ b/locale/hu_HU.po
@@ -444,6 +444,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr ""
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -753,14 +757,6 @@ msgid "Draft Sale Order"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr ""
@@ -793,10 +789,6 @@ msgid "Unit Price"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr ""
@@ -992,6 +984,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr ""
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1021,10 +1017,6 @@ msgid "Handle Shipment Exception"
msgstr ""
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr ""
@@ -1044,10 +1036,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr ""
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr ""
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/it_IT.po
similarity index 98%
copy from locale/cs_CZ.po
copy to locale/it_IT.po
index 612de9d..2b6e79f 100644
--- a/locale/cs_CZ.po
+++ b/locale/it_IT.po
@@ -444,6 +444,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr ""
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -753,14 +757,6 @@ msgid "Draft Sale Order"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr ""
@@ -793,10 +789,6 @@ msgid "Unit Price"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr ""
@@ -992,6 +984,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr ""
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1021,10 +1017,6 @@ msgid "Handle Shipment Exception"
msgstr ""
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr ""
@@ -1044,10 +1036,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr ""
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr ""
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/ja_JP.po
similarity index 98%
copy from locale/cs_CZ.po
copy to locale/ja_JP.po
index 612de9d..2b6e79f 100644
--- a/locale/cs_CZ.po
+++ b/locale/ja_JP.po
@@ -444,6 +444,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr ""
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -753,14 +757,6 @@ msgid "Draft Sale Order"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr ""
@@ -793,10 +789,6 @@ msgid "Unit Price"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr ""
@@ -992,6 +984,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr ""
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1021,10 +1017,6 @@ msgid "Handle Shipment Exception"
msgstr ""
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr ""
@@ -1044,10 +1036,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr ""
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr ""
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/lt_LT.po
similarity index 98%
copy from locale/cs_CZ.po
copy to locale/lt_LT.po
index 612de9d..2b6e79f 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt_LT.po
@@ -444,6 +444,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr ""
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -753,14 +757,6 @@ msgid "Draft Sale Order"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr ""
@@ -793,10 +789,6 @@ msgid "Unit Price"
msgstr ""
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr ""
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr ""
@@ -992,6 +984,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr ""
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1021,10 +1017,6 @@ msgid "Handle Shipment Exception"
msgstr ""
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr ""
@@ -1044,10 +1036,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr ""
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr ""
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 6a2d4ae..a210a1e 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -450,6 +450,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Levering afhandeling"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr ""
@@ -779,16 +783,6 @@ msgstr ""
#, fuzzy
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#, fuzzy
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Telefoon:"
-
-#, fuzzy
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Hoeveelheid"
@@ -827,11 +821,6 @@ msgstr "Eenheidsprijs"
#, fuzzy
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "BTW-nummer:"
-
-#, fuzzy
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "BTW:"
@@ -1034,6 +1023,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr "Offerteregels"
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1063,10 +1056,6 @@ msgid "Handle Shipment Exception"
msgstr "Zendinguitzondering afhandelen"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Facturen"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Aanvullende informatie"
@@ -1086,10 +1075,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Verkoop"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Leveringen"
-
#, fuzzy
msgctxt "view:stock.move:"
msgid "Moves"
diff --git a/locale/ca_ES.po b/locale/pt_BR.po
similarity index 73%
copy from locale/ca_ES.po
copy to locale/pt_BR.po
index c3c3ecb..43fb88e 100644
--- a/locale/ca_ES.po
+++ b/locale/pt_BR.po
@@ -4,87 +4,82 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.invoice:"
msgid "You cannot reset to draft an invoice generated by a sale."
-msgstr "No podeu restaurar a esborrany una factura generada per una venda."
+msgstr "Você não pode tornar \"Em aberto\" uma fatura gerada por uma venda."
msgctxt "error:sale.line:"
msgid "Product \"%(product)s\" of sale %(sale)s misses a revenue account."
msgstr ""
-"Falta el compte d'ingressos del producte \"%(product)s\" de la venda "
-"%(sale)s."
+"Falta a conta de receitas para o produto \"%(product)s\" da venta %(sale)s."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" is missing the customer location in line \"%(line)s\"."
-msgstr ""
-"No es troba la localització del client a la línia \"%(line)s\" de la venda "
-"\"%(sale)\"."
+msgstr "Falta a localização do cliente na linha \"%(line)s\" da venda \"%(sale)s\"."
msgctxt "error:sale.line:"
msgid "Sale \"%(sale)s\" misses an \"account revenue\" default property."
-msgstr ""
-"Falta la propietat \"Compte d'ingressos\" per defecte de la venda "
-"\"%(sale)s\"."
+msgstr "Falta a propriedade padrão \"conta de receitas\" na venda \"%(sale)s\"."
msgctxt "error:sale.sale:"
msgid "Invalid combination of shipment and invoicing methods on sale \"%s\"."
msgstr ""
-"La combinació de mètodes d'enviament i facturació a la venda \"%s\" no és "
-"correcta."
+"A combinação de métodos de remesssa e faturamento é inválida para a venda "
+"\"%s\"."
msgctxt "error:sale.sale:"
msgid ""
"Invoice and Shipment addresses must be defined for the quotation of sale "
"\"%s\"."
msgstr ""
-"L'adreça d'enviament i facturació s'han de definir per al pressupost de la "
-"venda \"%s\"."
+"A combinação de métodos de remessa e de faturamento na venda \"%s\" não é "
+"correta."
msgctxt "error:sale.sale:"
msgid "It misses an \"Account Receivable\" on the party \"%s\"."
-msgstr "Falta un \"Compte a cobrar\" al tercer \"%s\"."
+msgstr "Falta a \"Conta a Receber\" na pessoa \"%s\"."
msgctxt "error:sale.sale:"
msgid "Sale \"%s\" must be cancelled before deletion."
-msgstr "Heu de cancel·lar la venda \"%s\" abans de ser eliminat."
+msgstr "A venda \"%s\" deve ser cancelada antes de ser apagada."
msgctxt "error:sale.sale:"
msgid "Warehouse must be defined for the quotation of sale \"%s\"."
-msgstr "S'ha de definir el magatzem per al pressupost de la venda \"%s\"."
+msgstr "Deve ser definido um armazém para a cotação da venda \"%s\"."
msgctxt "error:stock.shipment.out.return:"
msgid "You cannot reset to draft a move generated by a sale."
-msgstr "No podeu restaurar a esborrany un moviment generat per una venda."
+msgstr "Você não pode tornar \"Em aberto\" uma movimentação gerada por uma venda."
msgctxt "error:stock.shipment.out:"
msgid "You cannot reset to draft a move generated by a sale."
-msgstr "No podeu restaurar a esborrany un moviment generat per una venda."
+msgstr "Você não pode tornar \"Em aberto\" uma movimentação gerada por uma venda."
msgctxt "field:account.invoice,sale_exception_state:"
msgid "Exception State"
-msgstr "Estat d'excepció"
+msgstr "Estado da exceção"
msgctxt "field:account.invoice,sales:"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "field:product.template,delivery_time:"
msgid "Delivery Time"
-msgstr "Termini de lliurament"
+msgstr "Tempo de entrega"
msgctxt "field:product.template,salable:"
msgid "Salable"
-msgstr "Pot ser venut"
+msgstr "Vendável"
msgctxt "field:product.template,sale_uom:"
msgid "Sale UOM"
-msgstr "UdM de venda"
+msgstr "UM para venda"
msgctxt "field:sale.configuration,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.configuration,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.configuration,id:"
msgid "ID"
@@ -92,31 +87,31 @@ msgstr "ID"
msgctxt "field:sale.configuration,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.configuration,sale_invoice_method:"
msgid "Sale Invoice Method"
-msgstr "Mètode de facturació"
+msgstr "Método da fatura da venda"
msgctxt "field:sale.configuration,sale_sequence:"
msgid "Sale Reference Sequence"
-msgstr "Seqüència de numeració vendes"
+msgstr "Sequência da referência para venda"
msgctxt "field:sale.configuration,sale_shipment_method:"
msgid "Sale Shipment Method"
-msgstr "Mètode d'enviament"
+msgstr "Método da expedição da venda"
msgctxt "field:sale.configuration,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.configuration,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.handle.invoice.exception.ask,domain_invoices:"
msgid "Domain Invoices"
-msgstr "Domini factures"
+msgstr "Faturas do domínio"
msgctxt "field:sale.handle.invoice.exception.ask,id:"
msgid "ID"
@@ -124,11 +119,11 @@ msgstr "ID"
msgctxt "field:sale.handle.invoice.exception.ask,recreate_invoices:"
msgid "Recreate Invoices"
-msgstr "Recrea factures"
+msgstr "Recriar faturas"
msgctxt "field:sale.handle.shipment.exception.ask,domain_moves:"
msgid "Domain Moves"
-msgstr "Domini dels moviments"
+msgstr "Movimentações no domínio"
msgctxt "field:sale.handle.shipment.exception.ask,id:"
msgid "ID"
@@ -136,31 +131,31 @@ msgstr "ID"
msgctxt "field:sale.handle.shipment.exception.ask,recreate_moves:"
msgid "Recreate Moves"
-msgstr "Recrea moviments"
+msgstr "Recriar movimentações"
msgctxt "field:sale.line,amount:"
msgid "Amount"
-msgstr "Import"
+msgstr "Quantidade"
msgctxt "field:sale.line,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.line,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.line,delivery_date:"
msgid "Delivery Date"
-msgstr "Data de lliurament"
+msgstr "Data de Entrega"
msgctxt "field:sale.line,description:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Descrição"
msgctxt "field:sale.line,from_location:"
msgid "From Location"
-msgstr "Des de la ubicació"
+msgstr "Origem"
msgctxt "field:sale.line,id:"
msgid "ID"
@@ -168,47 +163,47 @@ msgstr "ID"
msgctxt "field:sale.line,invoice_lines:"
msgid "Invoice Lines"
-msgstr "Línies de factura"
+msgstr "Linhas da fatura"
msgctxt "field:sale.line,move_done:"
msgid "Moves Done"
-msgstr "Moviments finalitzats"
+msgstr "Movimentações feitas"
msgctxt "field:sale.line,move_exception:"
msgid "Moves Exception"
-msgstr "Excepció de moviments"
+msgstr "Exceção nas movimentações"
msgctxt "field:sale.line,moves:"
msgid "Moves"
-msgstr "Moviments"
+msgstr "Movimentações"
msgctxt "field:sale.line,moves_ignored:"
msgid "Ignored Moves"
-msgstr "Moviments ignorats"
+msgstr "Movimentações ignoradas"
msgctxt "field:sale.line,moves_recreated:"
msgid "Recreated Moves"
-msgstr "Moviments recreats"
+msgstr "Recriar movimentações"
msgctxt "field:sale.line,note:"
msgid "Note"
-msgstr "Nota"
+msgstr "Observação"
msgctxt "field:sale.line,product:"
msgid "Product"
-msgstr "Producte"
+msgstr "Produto"
msgctxt "field:sale.line,product_uom_category:"
msgid "Product Uom Category"
-msgstr "Categoria UdM del producte"
+msgstr "Categoria da UDM do Produto"
msgctxt "field:sale.line,quantity:"
msgid "Quantity"
-msgstr "Quantitat"
+msgstr "Quantidade"
msgctxt "field:sale.line,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.line,sale:"
msgid "Sale"
@@ -216,7 +211,7 @@ msgstr "Venda"
msgctxt "field:sale.line,sequence:"
msgid "Sequence"
-msgstr "Seqüència"
+msgstr "Sequência"
msgctxt "field:sale.line,taxes:"
msgid "Taxes"
@@ -224,43 +219,43 @@ msgstr "Impostos"
msgctxt "field:sale.line,to_location:"
msgid "To Location"
-msgstr "A la ubicació"
+msgstr "Destino"
msgctxt "field:sale.line,type:"
msgid "Type"
-msgstr "Tipus"
+msgstr "Tipo"
msgctxt "field:sale.line,unit:"
msgid "Unit"
-msgstr "Unitat"
+msgstr "Unidade"
msgctxt "field:sale.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimals de la unitat"
+msgstr "Dígitos da unidade"
msgctxt "field:sale.line,unit_price:"
msgid "Unit Price"
-msgstr "Preu unitari"
+msgstr "Preço unitário"
msgctxt "field:sale.line,warehouse:"
msgid "Warehouse"
-msgstr "Magatzem"
+msgstr "Estoque/Almoxarifado"
msgctxt "field:sale.line,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.line,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.line-account.tax,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.line-account.tax,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.line-account.tax,id:"
msgid "ID"
@@ -268,31 +263,31 @@ msgstr "ID"
msgctxt "field:sale.line-account.tax,line:"
msgid "Sale Line"
-msgstr "Línia de venta"
+msgstr "Linha da fatura"
msgctxt "field:sale.line-account.tax,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.line-account.tax,tax:"
msgid "Tax"
-msgstr "Impost"
+msgstr "Impostos"
msgctxt "field:sale.line-account.tax,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.line-account.tax,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.line-ignored-stock.move,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.line-ignored-stock.move,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.line-ignored-stock.move,id:"
msgid "ID"
@@ -300,31 +295,31 @@ msgstr "ID"
msgctxt "field:sale.line-ignored-stock.move,move:"
msgid "Move"
-msgstr "Moviment"
+msgstr "Movimentação"
msgctxt "field:sale.line-ignored-stock.move,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.line-ignored-stock.move,sale_line:"
msgid "Sale Line"
-msgstr "Línia de venda"
+msgstr "Linha da fatura"
msgctxt "field:sale.line-ignored-stock.move,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.line-ignored-stock.move,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.line-recreated-stock.move,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.line-recreated-stock.move,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.line-recreated-stock.move,id:"
msgid "ID"
@@ -332,23 +327,23 @@ msgstr "ID"
msgctxt "field:sale.line-recreated-stock.move,move:"
msgid "Move"
-msgstr "Moviment"
+msgstr "Movimentação"
msgctxt "field:sale.line-recreated-stock.move,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.line-recreated-stock.move,sale_line:"
msgid "Sale Line"
-msgstr "Línia de venta"
+msgstr "Linha da fatura"
msgctxt "field:sale.line-recreated-stock.move,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.line-recreated-stock.move,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.return_sale.start,id:"
msgid "ID"
@@ -356,7 +351,7 @@ msgstr "ID"
msgctxt "field:sale.sale,comment:"
msgid "Comment"
-msgstr "Comentari"
+msgstr "Comentário"
msgctxt "field:sale.sale,company:"
msgid "Company"
@@ -364,23 +359,23 @@ msgstr "Empresa"
msgctxt "field:sale.sale,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.sale,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.sale,currency:"
msgid "Currency"
-msgstr "Moneda"
+msgstr "Moeda"
msgctxt "field:sale.sale,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la moneda"
+msgstr "Dígitos da moeda"
msgctxt "field:sale.sale,description:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Descrição"
msgctxt "field:sale.sale,id:"
msgid "ID"
@@ -388,95 +383,99 @@ msgstr "ID"
msgctxt "field:sale.sale,invoice_address:"
msgid "Invoice Address"
-msgstr "Adreça de facturació"
+msgstr "Endereço para faturamento"
msgctxt "field:sale.sale,invoice_method:"
msgid "Invoice Method"
-msgstr "Mètode de facturació"
+msgstr "Método da fatura"
msgctxt "field:sale.sale,invoice_state:"
msgid "Invoice State"
-msgstr "Estat factura"
+msgstr "Estado da fatura"
msgctxt "field:sale.sale,invoices:"
msgid "Invoices"
-msgstr "Factures"
+msgstr "Faturas"
msgctxt "field:sale.sale,invoices_ignored:"
msgid "Ignored Invoices"
-msgstr "Factures ignorades"
+msgstr "Faturas ignoradas"
msgctxt "field:sale.sale,invoices_recreated:"
msgid "Recreated Invoices"
-msgstr "Factures recreades"
+msgstr "Faturas Recriadas"
msgctxt "field:sale.sale,lines:"
msgid "Lines"
-msgstr "Línies"
+msgstr "Linhas"
msgctxt "field:sale.sale,moves:"
msgid "Moves"
-msgstr "Moviments"
+msgstr "Movimentações"
msgctxt "field:sale.sale,origin:"
msgid "Origin"
-msgstr "Origen"
+msgstr "Origem"
msgctxt "field:sale.sale,party:"
msgid "Party"
-msgstr "Tercer"
+msgstr "Parceiro"
msgctxt "field:sale.sale,party_lang:"
msgid "Party Language"
-msgstr "Idioma del tercer"
+msgstr "Língua do parceiro"
msgctxt "field:sale.sale,payment_term:"
msgid "Payment Term"
-msgstr "Termini de pagament"
+msgstr "Vencimento do pagamento"
msgctxt "field:sale.sale,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.sale,reference:"
msgid "Reference"
-msgstr "Referència"
+msgstr "Referência"
msgctxt "field:sale.sale,sale_date:"
msgid "Sale Date"
-msgstr "Data de venda"
+msgstr "Data da venda"
msgctxt "field:sale.sale,shipment_address:"
msgid "Shipment Address"
-msgstr "Adreça enviament"
+msgstr "Endereço de entrega"
msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
-msgstr "Mètode d'enviament"
+msgstr "Método da expedição"
+
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Destinatário da Remessa"
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
-msgstr "Albarans de devolució"
+msgstr "Retornos de Remessas"
msgctxt "field:sale.sale,shipment_state:"
msgid "Shipment State"
-msgstr "Estat enviament"
+msgstr "Estado da expedição"
msgctxt "field:sale.sale,shipments:"
msgid "Shipments"
-msgstr "Albarans"
+msgstr "Expedições"
msgctxt "field:sale.sale,state:"
msgid "State"
-msgstr "Estat"
+msgstr "Estado"
msgctxt "field:sale.sale,tax_amount:"
msgid "Tax"
-msgstr "Impost"
+msgstr "Impostos"
msgctxt "field:sale.sale,tax_amount_cache:"
msgid "Tax Cache"
-msgstr "Impostos precalculats"
+msgstr "Tributos Pré-calculados"
msgctxt "field:sale.sale,total_amount:"
msgid "Total"
@@ -484,35 +483,35 @@ msgstr "Total"
msgctxt "field:sale.sale,total_amount_cache:"
msgid "Total Tax"
-msgstr "Total impostos"
+msgstr "Total de Tributos"
msgctxt "field:sale.sale,untaxed_amount:"
msgid "Untaxed"
-msgstr "Base imposable"
+msgstr "Não tributado"
msgctxt "field:sale.sale,untaxed_amount_cache:"
msgid "Untaxed Cache"
-msgstr "Base imposable precalculada"
+msgstr "Isenção Pré-Calculada"
msgctxt "field:sale.sale,warehouse:"
msgid "Warehouse"
-msgstr "Magatzem"
+msgstr "Estoque/Almoxarifado"
msgctxt "field:sale.sale,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.sale,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.sale-ignored-account.invoice,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.sale-ignored-account.invoice,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.sale-ignored-account.invoice,id:"
msgid "ID"
@@ -520,11 +519,11 @@ msgstr "ID"
msgctxt "field:sale.sale-ignored-account.invoice,invoice:"
msgid "Invoice"
-msgstr "Factura"
+msgstr "Faturar"
msgctxt "field:sale.sale-ignored-account.invoice,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.sale-ignored-account.invoice,sale:"
msgid "Sale"
@@ -532,19 +531,19 @@ msgstr "Venda"
msgctxt "field:sale.sale-ignored-account.invoice,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.sale-ignored-account.invoice,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:sale.sale-recreated-account.invoice,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de criação"
msgctxt "field:sale.sale-recreated-account.invoice,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Criado pelo usuário"
msgctxt "field:sale.sale-recreated-account.invoice,id:"
msgid "ID"
@@ -552,11 +551,11 @@ msgstr "ID"
msgctxt "field:sale.sale-recreated-account.invoice,invoice:"
msgid "Invoice"
-msgstr "Factura"
+msgstr "Faturar"
msgctxt "field:sale.sale-recreated-account.invoice,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nome"
msgctxt "field:sale.sale-recreated-account.invoice,sale:"
msgid "Sale"
@@ -564,11 +563,11 @@ msgstr "Venda"
msgctxt "field:sale.sale-recreated-account.invoice,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de gravação"
msgctxt "field:sale.sale-recreated-account.invoice,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Gravado pelo usuário"
msgctxt "field:stock.move,sale:"
msgid "Sale"
@@ -576,53 +575,53 @@ msgstr "Venda"
msgctxt "field:stock.move,sale_exception_state:"
msgid "Exception State"
-msgstr "Estat excepció"
+msgstr "Estado da exceção"
msgctxt "help:product.template,delivery_time:"
msgid "In number of days"
-msgstr "En nombre de dies."
+msgstr "Em número de dias"
msgctxt "help:sale.handle.invoice.exception.ask,recreate_invoices:"
msgid ""
"The selected invoices will be recreated. The other ones will be ignored."
msgstr ""
-"Les factures seleccionades seran recreades. Les altres seran ignorades."
+"As faturas escolhidas serão recriadas. As demais faturas serão ignoradas"
msgctxt "model:ir.action,name:act_invoice_form"
msgid "Invoices"
-msgstr "Factures"
+msgstr "Faturas"
msgctxt "model:ir.action,name:act_open_customer"
msgid "Parties associated to Sales"
-msgstr "Tercers amb vendes"
+msgstr "Parceiros associados a vendas"
msgctxt "model:ir.action,name:act_return_form"
msgid "Returns"
-msgstr "Devolució"
+msgstr "Devolução"
msgctxt "model:ir.action,name:act_sale_configuration_form"
msgid "Sales Configuration"
-msgstr "Configuració de les vendes"
+msgstr "Configuração das vendas"
msgctxt "model:ir.action,name:act_sale_form"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:ir.action,name:act_sale_form2"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:ir.action,name:act_sale_invoice_relate"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:ir.action,name:act_sale_shipments_relate"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:ir.action,name:act_shipment_form"
msgid "Shipments"
-msgstr "Albarans"
+msgstr "Expedições"
msgctxt "model:ir.action,name:report_sale"
msgid "Sale"
@@ -630,38 +629,38 @@ msgstr "Venda"
msgctxt "model:ir.action,name:wizard_invoice_handle_exception"
msgid "Handle Invoice Exception"
-msgstr "Gestiona excepció de factura"
+msgstr "Manejar exceção da fatura"
msgctxt "model:ir.action,name:wizard_return_sale"
msgid "Return Sale"
-msgstr "Devolució comanda"
+msgstr "Devolução de Venda"
msgctxt "model:ir.action,name:wizard_shipment_handle_exception"
msgid "Handle Shipment Exception"
-msgstr "Gestiona excepció d'enviament"
+msgstr "Manejar exceção da expedição"
msgctxt "model:ir.action.act_window.domain,name:act_sale_form_domain_all"
msgid "All"
-msgstr "Totes"
+msgstr "Todos"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_confirmed"
msgid "Confirmed"
-msgstr "Confirmada"
+msgstr "Confirmado"
msgctxt "model:ir.action.act_window.domain,name:act_sale_form_domain_draft"
msgid "Draft"
-msgstr "Esborrany"
+msgstr "Rascunho"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_processing"
msgid "Processing"
-msgstr "En procés"
+msgstr "Processamento"
msgctxt ""
"model:ir.action.act_window.domain,name:act_sale_form_domain_quotation"
msgid "Quotation"
-msgstr "Pressupost"
+msgstr "Cotação"
msgctxt "model:ir.sequence,name:sequence_sale"
msgid "Sale"
@@ -673,63 +672,63 @@ msgstr "Venda"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Configuració"
+msgstr "Configuração"
msgctxt "model:ir.ui.menu,name:menu_customer"
msgid "Parties associated to Sales"
-msgstr "Tercers amb vendes"
+msgstr "Parceiros associados a vendas"
msgctxt "model:ir.ui.menu,name:menu_sale"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:ir.ui.menu,name:menu_sale_configuration"
msgid "Sales Configuration"
-msgstr "Vendes"
+msgstr "Configuração das vendas"
msgctxt "model:ir.ui.menu,name:menu_sale_form"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:res.group,name:group_sale"
msgid "Sales"
-msgstr "Vendes"
+msgstr "Vendas"
msgctxt "model:res.group,name:group_sale_admin"
msgid "Sales Administrator"
-msgstr "Administració de vendes"
+msgstr "Administrador de vendas"
msgctxt "model:sale.configuration,name:"
msgid "Sale Configuration"
-msgstr "Configuració de les vendes"
+msgstr "Configuração de vendas"
msgctxt "model:sale.handle.invoice.exception.ask,name:"
msgid "Handle Invoice Exception"
-msgstr "Gestiona excepció de factura"
+msgstr "Exceção da fatura do punho"
msgctxt "model:sale.handle.shipment.exception.ask,name:"
msgid "Handle Shipment Exception"
-msgstr "Gestiona excepció d'enviament"
+msgstr "Exceção da expedição do punho"
msgctxt "model:sale.line,name:"
msgid "Sale Line"
-msgstr "Línia de venda"
+msgstr "Linha da fatura"
msgctxt "model:sale.line-account.tax,name:"
msgid "Sale Line - Tax"
-msgstr "Línia de venda - Impost"
+msgstr "Linha da venda - Imposto"
msgctxt "model:sale.line-ignored-stock.move,name:"
msgid "Sale Line - Ignored Move"
-msgstr "Línia de venda - Moviment ignorat"
+msgstr "Linha da venda - Movimentação ignorado"
msgctxt "model:sale.line-recreated-stock.move,name:"
msgid "Sale Line - Recreated Move"
-msgstr "Línia de venda - Moviment recreat"
+msgstr "Linha da Fatura - Recriar movimentação"
msgctxt "model:sale.return_sale.start,name:"
msgid "Return Sale"
-msgstr "Devolució comanda"
+msgstr "Criar Devolução de Venda"
msgctxt "model:sale.sale,name:"
msgid "Sale"
@@ -737,15 +736,15 @@ msgstr "Venda"
msgctxt "model:sale.sale-ignored-account.invoice,name:"
msgid "Sale - Ignored Invoice"
-msgstr "Venda - Factura ignorada"
+msgstr "Venda - Fatura ignorada"
msgctxt "model:sale.sale-recreated-account.invoice,name:"
msgid "Sale - Recreated Invoice"
-msgstr "Venda - Factura recreada"
+msgstr "Venda - Recriar fatura"
msgctxt "odt:sale.sale:"
msgid "Amount"
-msgstr "Import"
+msgstr "Quantidade"
msgctxt "odt:sale.sale:"
msgid "Date:"
@@ -753,35 +752,27 @@ msgstr "Data:"
msgctxt "odt:sale.sale:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Descrição"
msgctxt "odt:sale.sale:"
msgid "Description:"
-msgstr "Descripció:"
+msgstr "Descrição:"
msgctxt "odt:sale.sale:"
msgid "Draft Sale Order"
-msgstr "Comanda de venda esborrany"
-
-msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Correu electrònic:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Telèfon:"
+msgstr "Rascunho de Ordem de Venda"
msgctxt "odt:sale.sale:"
msgid "Quantity"
-msgstr "Quantitat"
+msgstr "Quantidade"
msgctxt "odt:sale.sale:"
msgid "Quotation N°:"
-msgstr "Pressupost Núm.:"
+msgstr "Cotação n°:"
msgctxt "odt:sale.sale:"
msgid "Sale Order N°:"
-msgstr "Venta Núm.:"
+msgstr "Ordem de Venda n°:"
msgctxt "odt:sale.sale:"
msgid "Taxes"
@@ -789,11 +780,11 @@ msgstr "Impostos"
msgctxt "odt:sale.sale:"
msgid "Taxes:"
-msgstr "Impostos:"
+msgstr "Tributos"
msgctxt "odt:sale.sale:"
msgid "Total (excl. taxes):"
-msgstr "Base imposable:"
+msgstr "Total (sem tributos):"
msgctxt "odt:sale.sale:"
msgid "Total:"
@@ -801,15 +792,11 @@ msgstr "Total:"
msgctxt "odt:sale.sale:"
msgid "Unit Price"
-msgstr "Preu unitari"
-
-msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "CIF/NIF:"
+msgstr "Preço unitário"
msgctxt "odt:sale.sale:"
msgid "VAT:"
-msgstr "CIF/NIF:"
+msgstr "IVA:"
msgctxt "selection:account.invoice,sale_exception_state:"
msgid ""
@@ -817,11 +804,11 @@ msgstr ""
msgctxt "selection:account.invoice,sale_exception_state:"
msgid "Ignored"
-msgstr "Ignorat"
+msgstr "Ignorado"
msgctxt "selection:account.invoice,sale_exception_state:"
msgid "Recreated"
-msgstr "Recreada"
+msgstr "Recriado"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "Manual"
@@ -829,11 +816,11 @@ msgstr "Manual"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Order Processed"
-msgstr "Al processar la comanda"
+msgstr "Ao Processar a Ordem"
msgctxt "selection:sale.configuration,sale_invoice_method:"
msgid "On Shipment Sent"
-msgstr "Al enviar-ho"
+msgstr "No ato do envio"
msgctxt "selection:sale.configuration,sale_shipment_method:"
msgid "Manual"
@@ -841,19 +828,19 @@ msgstr "Manual"
msgctxt "selection:sale.configuration,sale_shipment_method:"
msgid "On Invoice Paid"
-msgstr "Al pagar la factura"
+msgstr "No pagamento da fatura"
msgctxt "selection:sale.configuration,sale_shipment_method:"
msgid "On Order Processed"
-msgstr "Al processar la comanda"
+msgstr "Ao Processar a Ordem"
msgctxt "selection:sale.line,type:"
msgid "Comment"
-msgstr "Comentari"
+msgstr "Comentário"
msgctxt "selection:sale.line,type:"
msgid "Line"
-msgstr "Línia"
+msgstr "Linha"
msgctxt "selection:sale.line,type:"
msgid "Subtotal"
@@ -861,7 +848,7 @@ msgstr "Subtotal"
msgctxt "selection:sale.line,type:"
msgid "Title"
-msgstr "Títol"
+msgstr "Título"
msgctxt "selection:sale.sale,invoice_method:"
msgid "Manual"
@@ -869,27 +856,27 @@ msgstr "Manual"
msgctxt "selection:sale.sale,invoice_method:"
msgid "On Order Processed"
-msgstr "Al processar la comanda"
+msgstr "Ao Processar a Ordem"
msgctxt "selection:sale.sale,invoice_method:"
msgid "On Shipment Sent"
-msgstr "Al enviar-ho"
+msgstr "No ato do envio"
msgctxt "selection:sale.sale,invoice_state:"
msgid "Exception"
-msgstr "Excepció"
+msgstr "Exceção"
msgctxt "selection:sale.sale,invoice_state:"
msgid "None"
-msgstr "Cap"
+msgstr "Nenhum"
msgctxt "selection:sale.sale,invoice_state:"
msgid "Paid"
-msgstr "Pagada"
+msgstr "Pago"
msgctxt "selection:sale.sale,invoice_state:"
msgid "Waiting"
-msgstr "En espera"
+msgstr "Espera"
msgctxt "selection:sale.sale,shipment_method:"
msgid "Manual"
@@ -897,51 +884,51 @@ msgstr "Manual"
msgctxt "selection:sale.sale,shipment_method:"
msgid "On Invoice Paid"
-msgstr "Al pagar la factura"
+msgstr "No pagamento da fatura"
msgctxt "selection:sale.sale,shipment_method:"
msgid "On Order Processed"
-msgstr "Al processar la comanda"
+msgstr "Ao Processar a Ordem"
msgctxt "selection:sale.sale,shipment_state:"
msgid "Exception"
-msgstr "Excepció"
+msgstr "Exceção"
msgctxt "selection:sale.sale,shipment_state:"
msgid "None"
-msgstr "Cap"
+msgstr "Nenhum"
msgctxt "selection:sale.sale,shipment_state:"
msgid "Sent"
-msgstr "Enviada"
+msgstr "Emitido"
msgctxt "selection:sale.sale,shipment_state:"
msgid "Waiting"
-msgstr "En espera"
+msgstr "Espera"
msgctxt "selection:sale.sale,state:"
msgid "Canceled"
-msgstr "Cancel·lada"
+msgstr "Cancelado"
msgctxt "selection:sale.sale,state:"
msgid "Confirmed"
-msgstr "Confirmada"
+msgstr "Confirmado"
msgctxt "selection:sale.sale,state:"
msgid "Done"
-msgstr "Finalitzada"
+msgstr "Feito"
msgctxt "selection:sale.sale,state:"
msgid "Draft"
-msgstr "Esborrany"
+msgstr "Rascunho"
msgctxt "selection:sale.sale,state:"
msgid "Processing"
-msgstr "En procés"
+msgstr "Processamento"
msgctxt "selection:sale.sale,state:"
msgid "Quotation"
-msgstr "Pressupost"
+msgstr "Cotação"
msgctxt "selection:stock.move,sale_exception_state:"
msgid ""
@@ -949,11 +936,11 @@ msgstr ""
msgctxt "selection:stock.move,sale_exception_state:"
msgid "Ignored"
-msgstr "Ignorat"
+msgstr "Ignorado"
msgctxt "selection:stock.move,sale_exception_state:"
msgid "Recreated"
-msgstr "Recreat"
+msgstr "Recriado"
msgctxt "view:party.party:"
msgid "Sale"
@@ -961,47 +948,47 @@ msgstr "Venda"
msgctxt "view:product.product:"
msgid "Products"
-msgstr "Productes"
+msgstr "Produtos"
msgctxt "view:product.template:"
msgid "Customers"
-msgstr "Clients"
+msgstr "Clientes"
msgctxt "view:sale.configuration:"
msgid "Sale Configuration"
-msgstr "Configuració comades de venda"
+msgstr "Configuração de vendas"
msgctxt "view:sale.handle.invoice.exception.ask:"
msgid "Choose invoices to recreate"
-msgstr "Seleccioneu les factures a recrear"
+msgstr "Escolhe as Faturas para recriar"
msgctxt "view:sale.handle.invoice.exception.ask:"
msgid "Handle Invoice Exception"
-msgstr "Gestiona excepció de factura"
+msgstr "Manejar exceção da fatura"
msgctxt "view:sale.handle.shipment.exception.ask:"
msgid "Choose move to recreate"
-msgstr "Seleccioneu els moviments a recrear"
+msgstr "Escolha as movimentações a recriar"
msgctxt "view:sale.handle.shipment.exception.ask:"
msgid "Handle shipment Exception"
-msgstr "Gestiona excepció d'enviament"
+msgstr "Manejar Exceção de Remessa"
msgctxt "view:sale.line:"
msgid "General"
-msgstr "General"
+msgstr "Geral"
msgctxt "view:sale.line:"
msgid "Notes"
-msgstr "Notes"
+msgstr "Observação"
msgctxt "view:sale.line:"
msgid "Sale Line"
-msgstr "Línia de venda"
+msgstr "Linha da fatura"
msgctxt "view:sale.line:"
msgid "Sale Lines"
-msgstr "Línies de venda"
+msgstr "Linhas de Venda"
msgctxt "view:sale.line:"
msgid "Taxes"
@@ -1009,47 +996,43 @@ msgstr "Impostos"
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
-msgstr "Esteu segur de retornar aquestes comandes de venda?"
+msgstr "Tem certeza que deseja devolver estes pedidos de venda?"
msgctxt "view:sale.return_sale.start:"
msgid "Return Sale"
-msgstr "Devolució comanda"
+msgstr "Devolução de Venda"
msgctxt "view:sale.sale:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancelar"
msgctxt "view:sale.sale:"
msgid "Confirm"
-msgstr "Confirma"
+msgstr "Confirmar"
msgctxt "view:sale.sale:"
msgid "Draft"
-msgstr "Esborrany"
+msgstr "Rascunho"
msgctxt "view:sale.sale:"
msgid "Handle Invoice Exception"
-msgstr "Gestiona excepció de factura"
+msgstr "Manejar exceção da fatura"
msgctxt "view:sale.sale:"
msgid "Handle Shipment Exception"
-msgstr "Gestiona excepció d'enviament"
-
-msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Factures"
+msgstr "Manejar exceção da expedição"
msgctxt "view:sale.sale:"
msgid "Other Info"
-msgstr "Informació addicional"
+msgstr "Outras informações"
msgctxt "view:sale.sale:"
msgid "Process"
-msgstr "Processa"
+msgstr "Processar"
msgctxt "view:sale.sale:"
msgid "Quote"
-msgstr "Pressupost"
+msgstr "Cotar"
msgctxt "view:sale.sale:"
msgid "Sale"
@@ -1057,36 +1040,32 @@ msgstr "Venda"
msgctxt "view:sale.sale:"
msgid "Sales"
-msgstr "Vendes"
-
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Albarans"
+msgstr "Vendas"
msgctxt "view:stock.move:"
msgid "Moves"
-msgstr "Moviments"
+msgstr "Movimentações"
msgctxt "wizard_button:sale.handle.invoice.exception,ask,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancelar"
msgctxt "wizard_button:sale.handle.invoice.exception,ask,handle:"
msgid "OK"
-msgstr "Accepta"
+msgstr "OK"
msgctxt "wizard_button:sale.handle.shipment.exception,ask,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancelar"
msgctxt "wizard_button:sale.handle.shipment.exception,ask,handle:"
msgid "OK"
-msgstr "Accepta"
+msgstr "OK"
msgctxt "wizard_button:sale.return_sale,start,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancelar"
msgctxt "wizard_button:sale.return_sale,start,return_:"
msgid "Return"
-msgstr "Devolució"
+msgstr "Devolver"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index d091623..a3ab6b4 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -452,6 +452,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Метод доставки"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr ""
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Возврат"
@@ -766,14 +770,6 @@ msgid "Draft Sale Order"
msgstr "Черновой заказ на продажу"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "Эл.почта:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Телефон:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Кол-во"
@@ -806,10 +802,6 @@ msgid "Unit Price"
msgstr "Цена за единицу"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "ИНН:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "ИНН:"
@@ -1006,6 +998,10 @@ msgctxt "view:sale.line:"
msgid "Sale Lines"
msgstr "Строки продажи"
+msgctxt "view:sale.line:"
+msgid "Taxes"
+msgstr ""
+
msgctxt "view:sale.return_sale.start:"
msgid "Are you sure to return those/this sale(s)?"
msgstr ""
@@ -1036,10 +1032,6 @@ msgid "Handle Shipment Exception"
msgstr "Обработка особых ситуаций доставки"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Инвойсы"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Другая информация"
@@ -1059,10 +1051,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Продажи"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Доставка"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Перемещения"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index b38384c..8dea5e7 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -458,6 +458,10 @@ msgctxt "field:sale.sale,shipment_method:"
msgid "Shipment Method"
msgstr "Način odpreme"
+msgctxt "field:sale.sale,shipment_party:"
+msgid "Shipment Party"
+msgstr "Pošiljatelj"
+
msgctxt "field:sale.sale,shipment_returns:"
msgid "Shipment Returns"
msgstr "Vrnjene odpremnice"
@@ -767,14 +771,6 @@ msgid "Draft Sale Order"
msgstr "Osnutek prodajnega naloga"
msgctxt "odt:sale.sale:"
-msgid "E-Mail:"
-msgstr "E-pošta:"
-
-msgctxt "odt:sale.sale:"
-msgid "Phone:"
-msgstr "Telefon:"
-
-msgctxt "odt:sale.sale:"
msgid "Quantity"
msgstr "Količina"
@@ -807,10 +803,6 @@ msgid "Unit Price"
msgstr "Cena"
msgctxt "odt:sale.sale:"
-msgid "VAT Number:"
-msgstr "DDV številka:"
-
-msgctxt "odt:sale.sale:"
msgid "VAT:"
msgstr "DDV:"
@@ -1039,10 +1031,6 @@ msgid "Handle Shipment Exception"
msgstr "Obravnava pridržanih odpremnic"
msgctxt "view:sale.sale:"
-msgid "Invoices"
-msgstr "Računi"
-
-msgctxt "view:sale.sale:"
msgid "Other Info"
msgstr "Drugo"
@@ -1062,10 +1050,6 @@ msgctxt "view:sale.sale:"
msgid "Sales"
msgstr "Prodajni nalogi"
-msgctxt "view:sale.sale:"
-msgid "Shipments"
-msgstr "Odpremnice"
-
msgctxt "view:stock.move:"
msgid "Moves"
msgstr "Promet"
diff --git a/sale.odt b/sale.odt
index c1c82ae..6691544 100644
Binary files a/sale.odt and b/sale.odt differ
diff --git a/sale.py b/sale.py
index f4dce4e..c32bb08 100644
--- a/sale.py
+++ b/sale.py
@@ -7,6 +7,7 @@ from functools import partial
from sql import Table, Null
from sql.functions import Overlay, Position
from sql.operators import Concat
+from sql.conditionals import Case
from trytond.model import Workflow, ModelView, ModelSQL, fields
from trytond.modules.company import CompanyReport
@@ -82,12 +83,21 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
'readonly': Eval('state') != 'draft',
'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
}, depends=['state', 'party'])
+ shipment_party = fields.Many2One('party.party', 'Shipment Party',
+ states={
+ 'readonly': (Eval('state') != 'draft'),
+ },
+ depends=['state'])
shipment_address = fields.Many2One('party.address', 'Shipment Address',
- domain=[('party', '=', Eval('party'))], states={
+ domain=[
+ ('party', '=', If(Bool(Eval('shipment_party')),
+ Eval('shipment_party'), Eval('party'))),
+ ],
+ states={
'readonly': Eval('state') != 'draft',
'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
},
- depends=['party', 'state'])
+ depends=['party', 'shipment_party', 'state'])
warehouse = fields.Many2One('stock.location', 'Warehouse',
domain=[('type', '=', 'warehouse')], states={
'readonly': Eval('state') != 'draft',
@@ -169,8 +179,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
shipment_returns = fields.Function(
fields.One2Many('stock.shipment.out.return', None, 'Shipment Returns'),
'get_shipment_returns', searcher='search_shipment_returns')
- moves = fields.Function(fields.One2Many('stock.move', None, 'Moves'),
- 'get_moves')
+ moves = fields.One2Many('stock.move', 'sale', 'Moves', readonly=True)
origin = fields.Reference('Origin', selection='get_origin', select=True,
states={
'readonly': Eval('state') != 'draft',
@@ -384,17 +393,27 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
def default_shipment_state():
return 'none'
- @fields.depends('party', 'payment_term')
+ @fields.depends('party', 'shipment_party', 'payment_term')
def on_change_party(self):
self.invoice_address = None
- self.shipment_address = None
+ if not self.shipment_party:
+ self.shipment_address = None
self.payment_term = self.default_payment_term()
if self.party:
self.invoice_address = self.party.address_get(type='invoice')
- self.shipment_address = self.party.address_get(type='delivery')
+ if not self.shipment_party:
+ self.shipment_address = self.party.address_get(type='delivery')
if self.party.customer_payment_term:
self.payment_term = self.party.customer_payment_term
+ @fields.depends('party', 'shipment_party')
+ def on_change_shipment_party(self):
+ if self.shipment_party:
+ self.shipment_address = self.shipment_party.address_get(
+ type='delivery')
+ elif self.party:
+ self.shipment_address = self.party.address_get(type='delivery')
+
@fields.depends('currency')
def on_change_with_currency_digits(self, name=None):
if self.currency:
@@ -510,7 +529,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
@classmethod
def search_invoices(cls, name, clause):
- return [('lines.invoice_lines.invoice.id',) + tuple(clause[1:])]
+ return [('lines.invoice_lines.invoice',) + tuple(clause[1:])]
def get_invoice_state(self):
'''
@@ -558,7 +577,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
Search on shipments or returns
'''
def method(self, name, clause):
- return [('lines.moves.shipment.id',) + tuple(clause[1:])
+ return [('lines.moves.shipment',) + tuple(clause[1:])
+ (model_name,)]
return classmethod(method)
@@ -566,9 +585,6 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
search_shipment_returns = search_shipments_returns(
'stock.shipment.out.return')
- def get_moves(self, name):
- return [m.id for l in self.lines for m in l.moves]
-
def get_shipment_state(self):
'''
Return the shipment state for the sale.
@@ -641,7 +657,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
@classmethod
def view_attributes(cls):
- return [('//field[@name="comment"]', 'spell', Eval('party_lang'))]
+ return [('/form//field[@name="comment"]', 'spell', Eval('party_lang'))]
@classmethod
def copy(cls, sales, default=None):
@@ -652,6 +668,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
default['reference'] = None
default['invoice_state'] = 'none'
default['invoices_ignored'] = None
+ default['moves'] = None
default['shipment_state'] = 'none'
default.setdefault('sale_date', None)
return super(Sale, cls).copy(sales, default=default)
@@ -764,7 +781,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
invoice = self._get_invoice_sale(invoice_type)
invoice.lines = ((list(invoice.lines)
if hasattr(invoice, 'lines') else [])
- + list(chain.from_iterable(invoice_lines.itervalues())))
+ + list(chain.from_iterable(invoice_lines[l.id] for l in self.lines
+ if l.id in invoice_lines)))
invoice.save()
Invoice.update_taxes([invoice])
@@ -801,7 +819,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
def _get_shipment_sale(self, Shipment, key):
values = {
- 'customer': self.party.id,
+ 'customer': (self.shipment_party.id if self.shipment_party
+ else self.party.id),
'delivery_address': self.shipment_address.id,
'company': self.company.id,
}
@@ -1042,11 +1061,9 @@ class SaleLine(ModelSQL, ModelView):
'To Location'), 'get_to_location')
delivery_date = fields.Function(fields.Date('Delivery Date',
states={
- 'invisible': ((Eval('type') != 'line')
- | (If(Bool(Eval('quantity')), Eval('quantity', 0), 0)
- <= 0)),
+ 'invisible': Eval('type') != 'line',
},
- depends=['type', 'quantity']),
+ depends=['type']),
'on_change_with_delivery_date')
@classmethod
@@ -1084,7 +1101,7 @@ class SaleLine(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
- return [table.sequence == Null, table.sequence]
+ return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_type():
@@ -1278,8 +1295,11 @@ class SaleLine(ModelSQL, ModelView):
if self.warehouse:
return self.warehouse.input_location.id
- @fields.depends('product', 'quantity', '_parent_sale.sale_date')
+ @fields.depends('product', 'quantity', 'moves', '_parent_sale.sale_date')
def on_change_with_delivery_date(self, name=None):
+ if self.moves:
+ return min(m.effective_date if m.effective_date else m.planned_date
+ for m in self.moves)
if self.product and self.quantity > 0:
date = self.sale.sale_date if self.sale else None
return self.product.compute_delivery_date(date=date)
@@ -1377,7 +1397,8 @@ class SaleLine(ModelSQL, ModelView):
@classmethod
def view_attributes(cls):
- return [('//field[@name="note"]|//field[@name="description"]',
+ return [
+ ('/form//field[@name="note"]|/form//field[@name="description"]',
'spell', Eval('_parent_sale', {}).get('party_lang'))]
@classmethod
@@ -1505,13 +1526,7 @@ class OpenCustomer(Wizard):
customer_ids = [line[0] for line in Transaction().cursor.fetchall()]
action['pyson_domain'] = PYSONEncoder().encode(
[('id', 'in', customer_ids)])
-
- model_data, = ModelData.search([
- ('fs_id', '=', 'act_open_customer'),
- ('module', '=', 'sale'),
- ], limit=1)
- wizard = Wizard(model_data.db_id)
-
+ wizard = Wizard(ModelData.get_id('sale', 'act_open_customer'))
action['name'] = wizard.name
return action, {}
diff --git a/sale.xml b/sale.xml
index 4f6e9e9..7757f9c 100644
--- a/sale.xml
+++ b/sale.xml
@@ -306,7 +306,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">sale.sale</field>
<field name="report_name">sale.sale</field>
<field name="report">sale/sale.odt</field>
- <field name="style">company/header_A4.odt</field>
</record>
<record model="ir.action.keyword" id="report_sale_keyword">
<field name="keyword">form_print</field>
diff --git a/setup.py b/setup.py
index 554f434..53aadc0 100644
--- a/setup.py
+++ b/setup.py
@@ -87,6 +87,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/tests/scenario_sale.rst b/tests/scenario_sale.rst
index 711b9ed..9e60219 100644
--- a/tests/scenario_sale.rst
+++ b/tests/scenario_sale.rst
@@ -24,10 +24,10 @@ Create database::
Install sale::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> sale_module, = Module.find([('name', '=', 'sale')])
>>> sale_module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
diff --git a/tryton.cfg b/tryton.cfg
index 0e9e427..04aea76 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.8.0
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 1d74e02..cdd4ba0 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_sale
============
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_sale.egg-info/SOURCES.txt b/trytond_sale.egg-info/SOURCES.txt
index 5ad4921..1bfccd0 100644
--- a/trytond_sale.egg-info/SOURCES.txt
+++ b/trytond_sale.egg-info/SOURCES.txt
@@ -33,8 +33,14 @@ tryton.cfg
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -63,8 +69,14 @@ locale/es_AR.po
locale/es_CO.po
locale/es_EC.po
locale/es_ES.po
+locale/es_MX.po
locale/fr_FR.po
+locale/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
tests/scenario_sale.rst
diff --git a/trytond_sale.egg-info/requires.txt b/trytond_sale.egg-info/requires.txt
index a18bded..8ebcbac 100644
--- a/trytond_sale.egg-info/requires.txt
+++ b/trytond_sale.egg-info/requires.txt
@@ -1,11 +1,11 @@
python-sql >= 0.4
-trytond_account >= 3.6, < 3.7
-trytond_account_invoice >= 3.6, < 3.7
-trytond_account_invoice_stock >= 3.6, < 3.7
-trytond_account_product >= 3.6, < 3.7
-trytond_company >= 3.6, < 3.7
-trytond_currency >= 3.6, < 3.7
-trytond_party >= 3.6, < 3.7
-trytond_product >= 3.6, < 3.7
-trytond_stock >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond_account >= 3.8, < 3.9
+trytond_account_invoice >= 3.8, < 3.9
+trytond_account_invoice_stock >= 3.8, < 3.9
+trytond_account_product >= 3.8, < 3.9
+trytond_company >= 3.8, < 3.9
+trytond_currency >= 3.8, < 3.9
+trytond_party >= 3.8, < 3.9
+trytond_product >= 3.8, < 3.9
+trytond_stock >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
diff --git a/view/sale_form.xml b/view/sale_form.xml
index 7a62fdb..4fe1c4f 100644
--- a/view/sale_form.xml
+++ b/view/sale_form.xml
@@ -6,12 +6,15 @@ this repository contains the full copyright notices and license terms. -->
<field name="party"/>
<label name="invoice_address"/>
<field name="invoice_address"/>
+ <label name="reference"/>
+ <field name="reference"/>
+ <label name="shipment_party"/>
+ <field name="shipment_party"/>
<label name="shipment_address"/>
<field name="shipment_address"/>
+ <newline/>
<label name="description"/>
- <field name="description" colspan="3"/>
- <label name="reference"/>
- <field name="reference"/>
+ <field name="description" colspan="5"/>
<notebook colspan="6">
<page string="Sale" id="sale">
<label name="sale_date"/>
@@ -70,10 +73,10 @@ this repository contains the full copyright notices and license terms. -->
<separator name="comment" colspan="4"/>
<field name="comment" colspan="4"/>
</page>
- <page string="Invoices" id="invoices">
+ <page name="invoices">
<field name="invoices" colspan="4"/>
</page>
- <page string="Shipments" id="shipments">
+ <page name="shipments">
<field name="moves" colspan="4"
view_ids="sale.move_view_list_shipment"/>
<field name="shipments" colspan="4"/>
diff --git a/view/sale_line_tree_sequence.xml b/view/sale_line_tree_sequence.xml
index d711e1a..48df028 100644
--- a/view/sale_line_tree_sequence.xml
+++ b/view/sale_line_tree_sequence.xml
@@ -2,6 +2,7 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tree string="Sale Lines" sequence="sequence">
+ <field name="sale"/>
<field name="type"/>
<field name="product"/>
<field name="description"/>
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list