[tryton-debian-vcs] tryton-modules-sale-extra branch debian updated. debian/3.6.3-1-1-ge1a5c3b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:27:40 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-extra.git;a=commitdiff;h=debian/3.6.3-1-1-ge1a5c3b
commit e1a5c3b6a0f5ffe68e41791821e38eb0aac17277
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:17 2015 +0100
Merging upstream version 3.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8c6f37d..3cfd747 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,8 @@
-Version 3.6.3 - 2015-09-13
-* Bug fixes (see mercurial logs for details)
-
-Version 3.6.2 - 2015-07-13
-* Bug fixes (see mercurial logs for details)
-
-Version 3.6.1 - 2015-05-22
+Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
+* Add start/end date criteria
+* Remove required on price list
+* Change modification right to sale administrator group
Version 3.6.0 - 2015-04-20
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 7c29647..0cc7601 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_extra
-Version: 3.6.3
+Version: 3.8.0
Summary: Tryton module for sale extra
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_extra
==================
@@ -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/__init__.py b/__init__.py
index ee99601..ed1107d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,7 +3,6 @@
from trytond.pool import Pool
from .sale import *
-from .price_list import *
def register():
@@ -12,5 +11,4 @@ def register():
SaleExtraLine,
Sale,
SaleLine,
- PriceList,
module='sale_extra', type_='model')
diff --git a/doc/index.rst b/doc/index.rst
index c050704..31b9e19 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -11,9 +11,11 @@ The criteria are defined by the *Sale Extras* of the *Price List*.
Sale Extra
**********
-Each matching *Sale Extra* of the *Price List* is evaluated to add an extra
-line. The criteria are the fields:
+Each matching *Sale Extra* is evaluated to add an extra line.
+The criteria are the fields:
+- *Price List*
+- *Start/End Date*
- *Sale Amount*: If untaxed sale amount is greater or equal
(in the price list company currency).
diff --git a/locale/sl_SI.po b/locale/bg_BG.po
similarity index 60%
copy from locale/sl_SI.po
copy to locale/bg_BG.po
index cbdaaa0..d4f493a 100644
--- a/locale/sl_SI.po
+++ b/locale/bg_BG.po
@@ -2,151 +2,189 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
+#, fuzzy
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr "Активен"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr "Създадено на"
+#, fuzzy
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr "Създадено от"
+#, fuzzy
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr "Цифри за валута"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
+
+#, fuzzy
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr "Транзакции"
+#, fuzzy
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Условие за плащане"
+#, fuzzy
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr "Ценова листа"
+#, fuzzy
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Условие за плащане"
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
+
+#, fuzzy
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Променено на"
+#, fuzzy
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Променено от"
+#, fuzzy
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr "Създадено на"
+#, fuzzy
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr "Създадено от"
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr "Свободен"
+#, fuzzy
msgctxt "field:sale.extra.line,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr "Продукт"
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr "Количество"
+#, fuzzy
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Условие за плащане"
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr "Последователност"
+#, fuzzy
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr "Единица"
+#, fuzzy
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr "Десетични единици"
+#, fuzzy
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Променено на"
+#, fuzzy
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Променено от"
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index d578328..4103201 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extres de venda"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Actiu"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimals de la moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Data final"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Import de la venda"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Data inicial"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Data modificació"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extres"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Extres de venda"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extres"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Extra de venda"
diff --git a/locale/sl_SI.po b/locale/cs_CZ.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/cs_CZ.po
index cbdaaa0..0d1b701 100644
--- a/locale/sl_SI.po
+++ b/locale/cs_CZ.po
@@ -2,151 +2,166 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr ""
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr ""
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr ""
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr ""
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr ""
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr ""
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr ""
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr ""
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index bc02043..51473d3 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Verkaufsextras"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Aktiv"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Nachkommastellen Währung"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Enddatum"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Verkaufsbetrag"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Zuletzt geändert"
@@ -76,15 +84,15 @@ msgstr "ID"
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Artikel"
+msgstr "Variante"
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorie Maßeinheit"
+msgstr "Maßeinheitenkategorie"
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Menge"
+msgstr "Anzahl"
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Verkaufsextras"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Verkaufsextra"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 03c88b2..88e0deb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Activo"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Importe de venta"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Extras de venta"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Extra de venta"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d3dfbd8..f22f480 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de Venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Activo"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de Moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Valor"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Fecha de Modificación"
@@ -120,8 +128,16 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Extras de Venta"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 511ef56..5563c21 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -2,26 +2,30 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Activo"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Importe de venta"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Fecha de modificación"
@@ -56,11 +64,11 @@ msgstr "Modificado por usuario"
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Extras de venta"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Extra de venta"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 0240304..7e5bffa 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Activo"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Importe de la venta"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Extras de venta"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Extra de venta"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 87%
copy from locale/es_ES.po
copy to locale/es_MX.po
index 0240304..ed714cd 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Activo"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la moneda"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Importe de la venta"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -119,8 +127,16 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Extras de venta"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
@@ -132,20 +148,20 @@ msgstr "Línea extra de venta"
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Línea extra"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Líneas extra"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Línea de venta"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Extra"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Extras"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 1e05e2c..4623569 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de vente"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Actif"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Société"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Décimales de la devise"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Date de fin"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Montant de la vente"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Date de début"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Date de mise à jour"
@@ -119,9 +127,17 @@ msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Extras de vente"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Extra de vente"
diff --git a/locale/sl_SI.po b/locale/hu_HU.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/hu_HU.po
index cbdaaa0..0d1b701 100644
--- a/locale/sl_SI.po
+++ b/locale/hu_HU.po
@@ -2,151 +2,166 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr ""
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr ""
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr ""
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr ""
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr ""
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr ""
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr ""
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr ""
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/sl_SI.po b/locale/it_IT.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/it_IT.po
index cbdaaa0..0d1b701 100644
--- a/locale/sl_SI.po
+++ b/locale/it_IT.po
@@ -2,151 +2,166 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr ""
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr ""
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr ""
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr ""
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr ""
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr ""
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr ""
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr ""
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/sl_SI.po b/locale/ja_JP.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/ja_JP.po
index cbdaaa0..0d1b701 100644
--- a/locale/sl_SI.po
+++ b/locale/ja_JP.po
@@ -2,151 +2,166 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr ""
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr ""
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr ""
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr ""
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr ""
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr ""
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr ""
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr ""
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/sl_SI.po b/locale/lt_LT.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/lt_LT.po
index cbdaaa0..0d1b701 100644
--- a/locale/sl_SI.po
+++ b/locale/lt_LT.po
@@ -2,151 +2,166 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr ""
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr ""
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr ""
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr ""
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr ""
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr ""
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr ""
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr ""
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr ""
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/sl_SI.po b/locale/nl_NL.po
similarity index 70%
copy from locale/sl_SI.po
copy to locale/nl_NL.po
index cbdaaa0..29ef9eb 100644
--- a/locale/sl_SI.po
+++ b/locale/nl_NL.po
@@ -2,151 +2,177 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
+#, fuzzy
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr "Actief"
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr "Valuta decimalen"
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
msgctxt "field:sale.extra,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr "Transacties"
+#, fuzzy
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Naam bijlage"
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Naam bijlage"
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr ""
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr ""
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr ""
msgctxt "field:sale.extra.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr "Producten"
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr "Hoeveelheid"
+#, fuzzy
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Naam bijlage"
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr "Reeks"
+#, fuzzy
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr "Eenheid"
+#, fuzzy
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr "Decimalen eenheid"
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr ""
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr ""
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/pt_BR.po
similarity index 67%
copy from locale/es_EC.po
copy to locale/pt_BR.po
index 511ef56..16bd123 100644
--- a/locale/es_EC.po
+++ b/locale/pt_BR.po
@@ -2,25 +2,29 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Extras de venta"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Ativo"
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Empresa"
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Data de criação"
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Criado por"
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de moneda"
+msgstr "Dígitos Decimais da Moeda"
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Data Final"
msgctxt "field:sale.extra,id:"
msgid "ID"
@@ -28,39 +32,43 @@ msgstr "ID"
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Líneas"
+msgstr "Linhas"
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Lista de Preços"
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Importe de venta"
+msgstr "Montande de Venda"
+
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Data inicial"
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Fecha de modificación"
+msgstr "Data de edição"
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr "Editado por"
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Data de criação"
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Criado por"
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
@@ -76,71 +84,79 @@ msgstr "ID"
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Produto"
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Cateogría de UdM de producto"
+msgstr "Categoria da UDM do Produto"
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr "Quantidade"
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Importe de venta"
+msgstr "Montante da Venda"
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Secuencia"
+msgstr "Sequência"
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "Unidad"
+msgstr "Unidade"
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de unidad"
+msgstr "Dígitos Decimais da Unidade"
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Fecha de modificación"
+msgstr "Data de edição"
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr "Editado por"
msgctxt "field:sale.line,extra:"
msgid "Extra"
msgstr "Extra"
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr "Extras"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Extras de venta"
+msgstr "Extras de Venda"
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Extras"
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Extra de venta"
+msgstr "Extra de Venda"
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Línea extra de venta"
+msgstr "Linha Extra de Venda"
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Línea extra"
+msgstr "Linha Extra"
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Líneas extra"
+msgstr "Linas Extra"
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Línea de venta"
+msgstr "Linha de Venda"
msgctxt "view:sale.extra:"
msgid "Extra"
diff --git a/locale/sl_SI.po b/locale/ru_RU.po
similarity index 59%
copy from locale/sl_SI.po
copy to locale/ru_RU.po
index cbdaaa0..1f1691a 100644
--- a/locale/sl_SI.po
+++ b/locale/ru_RU.po
@@ -2,151 +2,188 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
+#, fuzzy
msgctxt "field:sale.extra,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr "Действующий"
+
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:sale.extra,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimalke"
+msgstr "Кол-во цифр валюты"
+
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:sale.extra,lines:"
msgid "Lines"
-msgstr "Postavke"
+msgstr "Строки"
+#, fuzzy
msgctxt "field:sale.extra,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Правило оплаты"
msgctxt "field:sale.extra,price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Правило оплаты"
msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr ""
+
+#, fuzzy
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:sale.extra,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Изменено пользователем"
+#, fuzzy
msgctxt "field:sale.extra.line,create_date:"
msgid "Create Date"
-msgstr "Izdelano"
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:sale.extra.line,create_uid:"
msgid "Create User"
-msgstr "Izdelal"
+msgstr "Создано пользователем"
msgctxt "field:sale.extra.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,free:"
msgid "Free"
-msgstr "Prosto"
+msgstr "Свободно"
+#, fuzzy
msgctxt "field:sale.extra.line,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:sale.extra.line,product:"
msgid "Product"
-msgstr "Izdelek"
+msgstr "Товарно материальные ценности (ТМЦ)"
msgctxt "field:sale.extra.line,product_uom_category:"
msgid "Product UoM Category"
-msgstr "Kategorije EM izdelka"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,quantity:"
msgid "Quantity"
-msgstr "Količina"
+msgstr "Кол-во"
+#, fuzzy
msgctxt "field:sale.extra.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Правило оплаты"
msgctxt "field:sale.extra.line,sale_amount:"
msgid "Sale Amount"
-msgstr "Znesek prodaje"
+msgstr ""
+#, fuzzy
msgctxt "field:sale.extra.line,sequence:"
msgid "Sequence"
-msgstr "Zap.št."
+msgstr "Последовательность"
+#, fuzzy
msgctxt "field:sale.extra.line,unit:"
msgid "Unit"
-msgstr "enota"
+msgstr "Штука"
+#, fuzzy
msgctxt "field:sale.extra.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimalke"
+msgstr "Кол-во цифр после запятой"
+#, fuzzy
msgctxt "field:sale.extra.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:sale.extra.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Изменено пользователем"
msgctxt "field:sale.line,extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Extras"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
-msgstr "Dodatno"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr ""
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "model:sale.extra.line,name:"
msgid "Sale Extra Line"
-msgstr "Dodatna prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Line"
-msgstr "Dodatna postavka"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Extra Lines"
-msgstr "Dodatne postavke"
+msgstr ""
msgctxt "view:sale.extra.line:"
msgid "Sale Line"
-msgstr "Prodajna postavka"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extra"
-msgstr "Dodatno"
+msgstr ""
msgctxt "view:sale.extra:"
msgid "Extras"
-msgstr "Dodatno"
+msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index cbdaaa0..fe8cd36 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -2,14 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.price_list,sale_extras:"
-msgid "Sale Extras"
-msgstr "Prodajni dodatki"
-
msgctxt "field:sale.extra,active:"
msgid "Active"
msgstr "Aktivno"
+msgctxt "field:sale.extra,company:"
+msgid "Company"
+msgstr "Družba"
+
msgctxt "field:sale.extra,create_date:"
msgid "Create Date"
msgstr "Izdelano"
@@ -22,6 +22,10 @@ msgctxt "field:sale.extra,currency_digits:"
msgid "Currency Digits"
msgstr "Decimalke"
+msgctxt "field:sale.extra,end_date:"
+msgid "End Date"
+msgstr "Končni datum"
+
msgctxt "field:sale.extra,id:"
msgid "ID"
msgstr "ID"
@@ -46,6 +50,10 @@ msgctxt "field:sale.extra,sale_amount:"
msgid "Sale Amount"
msgstr "Znesek prodaje"
+msgctxt "field:sale.extra,start_date:"
+msgid "Start Date"
+msgstr "Začetni datum"
+
msgctxt "field:sale.extra,write_date:"
msgid "Write Date"
msgstr "Zapisano"
@@ -118,11 +126,18 @@ msgctxt "field:sale.line,extra:"
msgid "Extra"
msgstr "Dodatno"
-#, fuzzy
msgctxt "model:ir.action,name:act_extra_form"
+msgid "Dodatno"
+msgstr "Dodatno"
+
+msgctxt "model:ir.action,name:act_extra_relate"
msgid "Sale Extras"
msgstr "Dodatno"
+msgctxt "model:ir.ui.menu,name:menu_extra"
+msgid "Extras"
+msgstr "Dodatno"
+
msgctxt "model:sale.extra,name:"
msgid "Sale Extra"
msgstr "Dodatno"
diff --git a/price_list.py b/price_list.py
deleted file mode 100644
index dcca69d..0000000
--- a/price_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is part of Tryton. The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-from trytond.pool import PoolMeta
-from trytond.model import fields
-
-__all__ = ['PriceList']
-__metaclass__ = PoolMeta
-
-
-class PriceList:
- __name__ = 'product.price_list'
-
- sale_extras = fields.One2Many('sale.extra', 'price_list', 'Sale Extras')
diff --git a/price_list.xml b/price_list.xml
deleted file mode 100644
index 00f316a..0000000
--- a/price_list.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tryton>
- <data>
- <record model="ir.ui.view" id="price_list_view_form">
- <field name="model">product.price_list</field>
- <field name="inherit" ref="product_price_list.price_list_view_form"/>
- <field name="name">price_list_form</field>
- </record>
- </data>
-</tryton>
diff --git a/sale.py b/sale.py
index 8060cdc..80a84ae 100644
--- a/sale.py
+++ b/sale.py
@@ -1,10 +1,15 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
+import datetime
from decimal import Decimal
+from sql import Null
+
from trytond.pool import PoolMeta, Pool
from trytond.model import ModelSQL, ModelView, MatchMixin, Workflow, fields
-from trytond.pyson import Eval
+from trytond.pyson import Eval, If
+from trytond.transaction import Transaction
+from trytond import backend
__all__ = ['Sale', 'SaleLine',
'SaleExtra', 'SaleExtraLine']
@@ -18,18 +23,23 @@ class Sale:
@ModelView.button
@Workflow.transition('quotation')
def quote(cls, sales):
+ pool = Pool()
+ Line = pool.get('sale.line')
+
super(Sale, cls).quote(sales)
+
+ lines_to_delete = []
for sale in sales:
- sale.set_extra()
+ sale.set_extra(lines_to_delete)
+ if lines_to_delete:
+ Line.delete(lines_to_delete)
cls.save(sales)
- def set_extra(self):
- 'Set extra lines'
+ def set_extra(self, lines_to_delete):
+ 'Set extra lines and fill lines_to_delete'
pool = Pool()
Extra = pool.get('sale.extra')
- Line = pool.get('sale.line')
- lines_to_delete = []
extra_lines = Extra.get_lines(self)
extra2lines = {line.extra: line for line in extra_lines}
lines = list(self.lines)
@@ -45,8 +55,6 @@ class Sale:
if extra2lines:
lines.extend(extra2lines.values())
self.lines = lines
- if lines_to_delete:
- Line.delete(lines_to_delete)
class SaleLine:
@@ -60,9 +68,38 @@ class SaleExtra(ModelSQL, ModelView, MatchMixin):
__name__ = 'sale.extra'
name = fields.Char('Name', translate=True, required=True)
+ company = fields.Many2One('company.company', 'Company', required=True,
+ states={
+ 'readonly': Eval('id', 0) > 0,
+ },
+ domain=[
+ ('id', If(Eval('context', {}).contains('company'), '=', '!='),
+ Eval('context', {}).get('company', -1)),
+ ],
+ select=True)
active = fields.Boolean('Active')
+ start_date = fields.Date('Start Date',
+ domain=['OR',
+ ('start_date', '<=', If(~Eval('end_date', None),
+ datetime.date.max,
+ Eval('end_date', datetime.date.max))),
+ ('start_date', '=', None),
+ ],
+ depends=['end_date'])
+ end_date = fields.Date('End Date',
+ domain=['OR',
+ ('end_date', '>=', If(~Eval('start_date', None),
+ datetime.date.min,
+ Eval('start_date', datetime.date.min))),
+ ('end_date', '=', None),
+ ],
+ depends=['start_date'])
price_list = fields.Many2One('product.price_list', 'Price List',
- required=True, ondelete='CASCADE')
+ ondelete='CASCADE',
+ domain=[
+ ('company', '=', Eval('company', -1)),
+ ],
+ depends=['company'])
sale_amount = fields.Numeric('Sale Amount',
digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits'])
@@ -70,25 +107,69 @@ class SaleExtra(ModelSQL, ModelView, MatchMixin):
'on_change_with_currency_digits')
lines = fields.One2Many('sale.extra.line', 'extra', 'Lines')
+ @classmethod
+ def __register__(cls, module_name):
+ pool = Pool()
+ PriceList = pool.get('product.price_list')
+ TableHandler = backend.get('TableHandler')
+ cursor = Transaction().cursor
+ sql_table = cls.__table__()
+ price_list = PriceList.__table__()
+
+ super(SaleExtra, cls).__register__(module_name)
+
+ table = TableHandler(cursor, cls, module_name)
+ # Migration from 3.6: price_list not required and new company
+ table.not_null_action('price_list', 'remove')
+ query = sql_table.join(price_list,
+ condition=sql_table.price_list == price_list.id
+ ).select(sql_table.id, price_list.company,
+ where=sql_table.company == Null)
+ cursor.execute(*query)
+ for extra_id, company_id in cursor.fetchall():
+ query = sql_table.update([sql_table.company], [company_id],
+ where=sql_table.id == extra_id)
+ cursor.execute(*query)
+
+ @staticmethod
+ def default_company():
+ return Transaction().context.get('company')
+
@staticmethod
def default_active():
return True
- @fields.depends('price_list')
+ @fields.depends('company')
def on_change_with_currency_digits(self, name=None):
- if self.price_list.company:
- return self.price_list.company.currency.digits
+ if self.company:
+ return self.company.currency.digits
return 2
@classmethod
+ def _extras_domain(cls, sale):
+ return [
+ ['OR',
+ ('start_date', '<=', sale.sale_date),
+ ('start_date', '=', None),
+ ],
+ ['OR',
+ ('end_date', '=', None),
+ ('end_date', '>=', sale.sale_date),
+ ],
+ ['OR',
+ ('price_list', '=', None),
+ ('price_list', '=',
+ sale.price_list.id if sale.price_list else None),
+ ],
+ ('company', '=', sale.company.id),
+ ]
+
+ @classmethod
def get_lines(cls, sale, pattern=None):
- 'Return extra sale lines'
+ 'Yield extra sale lines'
pool = Pool()
Currency = pool.get('currency.currency')
-
- if not sale.price_list:
- return []
-
+ extras = cls.search(cls._extras_domain(sale))
if pattern is None:
pattern = {}
else:
@@ -96,14 +177,19 @@ class SaleExtra(ModelSQL, ModelView, MatchMixin):
pattern['sale_amount'] = Currency.compute(sale.currency,
sale.untaxed_amount, sale.company.currency)
- lines = []
- for extra in sale.price_list.sale_extras:
- if extra.match(pattern):
+ for extra in extras:
+ epattern = pattern.copy()
+ epattern.update(extra.get_pattern(sale))
+ if extra.match(epattern):
for line in extra.lines:
- if line.match(pattern):
- lines.append(line.get_line(sale))
+ lpattern = epattern.copy()
+ lpattern.update(line.get_pattern(sale))
+ if line.match(lpattern):
+ yield line.get_line(sale)
break
- return lines
+
+ def get_pattern(self, sale):
+ return {}
def match(self, pattern):
pattern = pattern.copy()
@@ -169,6 +255,9 @@ class SaleExtraLine(ModelSQL, ModelView, MatchMixin):
def default_free():
return False
+ def get_pattern(self, sale):
+ return {}
+
def match(self, pattern):
pattern = pattern.copy()
sale_amount = pattern.pop('sale_amount')
diff --git a/sale.xml b/sale.xml
index a30c3ce..d7277a7 100644
--- a/sale.xml
+++ b/sale.xml
@@ -16,10 +16,11 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.action.act_window" id="act_extra_form">
- <field name="name">Sale Extras</field>
+ <field name="name">Extras</field>
<field name="res_model">sale.extra</field>
- <field name="domain"
- eval="[('price_list', 'in', Eval('active_ids'))]"
+ <field name="domain"></field>
+ <field name="search_value"
+ eval="['OR', ('end_date', '>=', Date()), ('end_date', '=', None)]"
pyson="1"/>
</record>
<record model="ir.action.act_window.view" id="act_extra_form_view1">
@@ -32,10 +33,23 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="extra_view_form"/>
<field name="act_window" ref="act_extra_form"/>
</record>
- <record model="ir.action.keyword" id="act_extra_keyword1">
+ <menuitem parent="sale.menu_configuration" action="act_extra_form"
+ id="menu_extra"/>
+
+ <record model="ir.action.act_window" id="act_extra_relate">
+ <field name="name">Sale Extras</field>
+ <field name="res_model">sale.extra</field>
+ <field name="domain"
+ eval="[('price_list', 'in', Eval('active_ids', []))]"
+ pyson="1"/>
+ <field name="search_value"
+ eval="['OR', ('end_date', '>=', Date()), ('end_date', '=', None)]"
+ pyson="1"/>
+ </record>
+ <record model="ir.action.keyword" id="act_extra_relate_keyword1">
<field name="keyword">form_relate</field>
<field name="model">product.price_list,-1</field>
- <field name="action" ref="act_extra_form"/>
+ <field name="action" ref="act_extra_relate"/>
</record>
<record model="ir.rule.group" id="rule_group_extra">
@@ -44,7 +58,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.rule" id="rule_extra1">
<field name="domain"
- eval="[('price_list.company', '=', Eval('user', {}).get('company', None))]"
+ eval="[('company', '=', Eval('user', {}).get('company', None))]"
pyson="1"/>
<field name="rule_group" ref="rule_group_extra"/>
</record>
@@ -56,9 +70,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
- <record model="ir.model.access" id="access_extra_product_admin">
+ <record model="ir.model.access" id="access_extra_sale_admin">
<field name="model" search="[('model', '=', 'sale.extra')]"/>
- <field name="group" ref="product.group_product_admin"/>
+ <field name="group" ref="sale.group_sale_admin"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
@@ -91,7 +105,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.rule" id="rule_extra_line1">
<field name="domain"
- eval="[('extra.price_list.company', '=', Eval('user', {}).get('company', None))]"
+ eval="[('extra.company', '=', Eval('user', {}).get('company', None))]"
pyson="1"/>
<field name="rule_group" ref="rule_group_extra_line"/>
</record>
@@ -103,9 +117,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
- <record model="ir.model.access" id="access_extra_line_product_admin">
+ <record model="ir.model.access" id="access_extra_line_sale_admin">
<field name="model" search="[('model', '=', 'sale.extra.line')]"/>
- <field name="group" ref="product.group_product_admin"/>
+ <field name="group" ref="sale.group_sale_admin"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
diff --git a/setup.py b/setup.py
index ba8b443..58141ec 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ if minor_version % 2:
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
-requires = []
+requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
@@ -86,6 +86,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_extra.rst b/tests/scenario_sale_extra.rst
index 3fbd299..f864826 100644
--- a/tests/scenario_sale_extra.rst
+++ b/tests/scenario_sale_extra.rst
@@ -23,12 +23,12 @@ Configure::
Install sale_extra::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> module, = Module.find([
... ('name', '=', 'sale_extra'),
... ])
>>> module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
@@ -94,8 +94,11 @@ Create payment term::
Create Extra::
>>> PriceList = Model.get('product.price_list')
+ >>> Extra = Model.get('sale.extra')
>>> price_list = PriceList(name='Default')
- >>> extra = price_list.sale_extras.new(name='Free Extra')
+ >>> price_list.save()
+ >>> extra = Extra(name='Free Extra')
+ >>> extra.price_list = price_list
>>> line = extra.lines.new()
>>> line.sale_amount = Decimal('100')
>>> line.product = extra_product
@@ -105,7 +108,7 @@ Create Extra::
>>> line.sale_amount = Decimal('50')
>>> line.product = extra_product
>>> line.quantity = 1
- >>> price_list.save()
+ >>> extra.save()
Sale for 100, 2 free extra added::
diff --git a/tryton.cfg b/tryton.cfg
index 3935e26..c54b814 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.3
+version=3.8.0
depends:
company
ir
@@ -10,4 +10,3 @@ depends:
sale_price_list
xml:
sale.xml
- price_list.xml
diff --git a/trytond_sale_extra.egg-info/PKG-INFO b/trytond_sale_extra.egg-info/PKG-INFO
index 269d745..9cd2596 100644
--- a/trytond_sale_extra.egg-info/PKG-INFO
+++ b/trytond_sale_extra.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-extra
-Version: 3.6.3
+Version: 3.8.0
Summary: Tryton module for sale extra
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_extra
==================
@@ -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_extra.egg-info/SOURCES.txt b/trytond_sale_extra.egg-info/SOURCES.txt
index f471639..e97526c 100644
--- a/trytond_sale_extra.egg-info/SOURCES.txt
+++ b/trytond_sale_extra.egg-info/SOURCES.txt
@@ -4,23 +4,30 @@ INSTALL
LICENSE
MANIFEST.in
README
-price_list.xml
sale.xml
setup.py
tryton.cfg
./__init__.py
-./price_list.py
-./price_list.xml
./sale.py
./sale.xml
./tryton.cfg
+./locale/bg_BG.po
./locale/ca_ES.po
+./locale/cs_CZ.po
./locale/de_DE.po
./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/__init__.py
./tests/scenario_sale_extra.rst
@@ -30,15 +37,24 @@ tryton.cfg
./view/extra_line_list.xml
./view/extra_line_list_sequence.xml
./view/extra_list.xml
-./view/price_list_form.xml
doc/index.rst
+locale/bg_BG.po
locale/ca_ES.po
+locale/cs_CZ.po
locale/de_DE.po
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_extra.rst
trytond_sale_extra.egg-info/PKG-INFO
@@ -52,5 +68,4 @@ view/extra_form.xml
view/extra_line_form.xml
view/extra_line_list.xml
view/extra_line_list_sequence.xml
-view/extra_list.xml
-view/price_list_form.xml
\ No newline at end of file
+view/extra_list.xml
\ No newline at end of file
diff --git a/trytond_sale_extra.egg-info/requires.txt b/trytond_sale_extra.egg-info/requires.txt
index 5500efd..5a3dafb 100644
--- a/trytond_sale_extra.egg-info/requires.txt
+++ b/trytond_sale_extra.egg-info/requires.txt
@@ -1,6 +1,7 @@
-trytond_company >= 3.6, < 3.7
-trytond_product >= 3.6, < 3.7
-trytond_product_price_list >= 3.6, < 3.7
-trytond_sale >= 3.6, < 3.7
-trytond_sale_price_list >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+python-sql
+trytond_company >= 3.8, < 3.9
+trytond_product >= 3.8, < 3.9
+trytond_product_price_list >= 3.8, < 3.9
+trytond_sale >= 3.8, < 3.9
+trytond_sale_price_list >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
diff --git a/view/extra_form.xml b/view/extra_form.xml
index 43642d0..aa5daf8 100644
--- a/view/extra_form.xml
+++ b/view/extra_form.xml
@@ -6,9 +6,15 @@ this repository contains the full copyright notices and license terms. -->
<field name="name"/>
<label name="active"/>
<field name="active"/>
+ <label name="start_date"/>
+ <field name="start_date"/>
+ <label name="end_date"/>
+ <field name="end_date"/>
+ <label name="company"/>
+ <field name="company"/>
<label name="price_list"/>
<field name="price_list"/>
- <newline/>
+ <separator id="pattern" colspan="4"/>
<label name="sale_amount"/>
<field name="sale_amount"/>
<field name="lines" colspan="4"
diff --git a/view/extra_list.xml b/view/extra_list.xml
index af7bea4..dc8fd2d 100644
--- a/view/extra_list.xml
+++ b/view/extra_list.xml
@@ -4,6 +4,9 @@ this repository contains the full copyright notices and license terms. -->
<tree string="Extras">
<field name="price_list"/>
<field name="name"/>
+ <field name="start_date"/>
+ <field name="end_date"/>
+ <field name="company"/>
<field name="sale_amount"/>
<field name="active" tree_invisible="1"/>
</tree>
diff --git a/view/price_list_form.xml b/view/price_list_form.xml
deleted file mode 100644
index 421dfab..0000000
--- a/view/price_list_form.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<data>
- <xpath expr="/form/notebook" position="inside">
- <page name="sale_extras">
- <field name="sale_extras" colspan="4"/>
- </page>
- </xpath>
-</data>
--
tryton-modules-sale-extra
More information about the tryton-debian-vcs
mailing list