diff -Nru tryton-modules-sale-extra-3.6.3/CHANGELOG tryton-modules-sale-extra-3.8.0/CHANGELOG --- tryton-modules-sale-extra-3.6.3/CHANGELOG 2015-09-13 21:57:26.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/CHANGELOG 2015-11-02 15:15:17.000000000 +0000 @@ -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 -Nru tryton-modules-sale-extra-3.6.3/debian/changelog tryton-modules-sale-extra-3.8.0/debian/changelog --- tryton-modules-sale-extra-3.6.3/debian/changelog 2015-09-20 18:19:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/debian/changelog 2015-11-12 18:13:47.000000000 +0000 @@ -1,3 +1,10 @@ +tryton-modules-sale-extra (3.8.0-1) unstable; urgency=medium + + * Merging upstream version 3.8.0. + * Updating Depends and Recommends for 3.8. + + -- Mathias Behrle Thu, 12 Nov 2015 19:13:47 +0100 + tryton-modules-sale-extra (3.6.3-1) unstable; urgency=medium * Improving description why we can not run the module test suites. diff -Nru tryton-modules-sale-extra-3.6.3/debian/control tryton-modules-sale-extra-3.8.0/debian/control --- tryton-modules-sale-extra-3.6.3/debian/control 2015-09-20 18:18:19.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/debian/control 2015-11-12 15:11:54.000000000 +0000 @@ -18,6 +18,7 @@ Architecture: all Depends: python-pkg-resources, + python-sql, tryton-modules-company (>= ${version:major}), tryton-modules-product (>= ${version:major}), tryton-modules-product-price-list (>= ${version:major}), diff -Nru tryton-modules-sale-extra-3.6.3/doc/index.rst tryton-modules-sale-extra-3.8.0/doc/index.rst --- tryton-modules-sale-extra-3.6.3/doc/index.rst 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/doc/index.rst 2015-05-28 20:55:18.000000000 +0000 @@ -11,9 +11,11 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/__init__.py tryton-modules-sale-extra-3.8.0/__init__.py --- tryton-modules-sale-extra-3.6.3/__init__.py 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/__init__.py 2015-05-28 20:55:18.000000000 +0000 @@ -3,7 +3,6 @@ from trytond.pool import Pool from .sale import * -from .price_list import * def register(): @@ -12,5 +11,4 @@ SaleExtraLine, Sale, SaleLine, - PriceList, module='sale_extra', type_='model') diff -Nru tryton-modules-sale-extra-3.6.3/locale/bg_BG.po tryton-modules-sale-extra-3.8.0/locale/bg_BG.po --- tryton-modules-sale-extra-3.6.3/locale/bg_BG.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/bg_BG.po 2015-10-31 09:53:20.000000000 +0000 @@ -0,0 +1,190 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +#, fuzzy +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "Активен" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "Създадено на" + +#, fuzzy +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "Създадено от" + +#, fuzzy +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +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 "Транзакции" + +#, fuzzy +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "Условие за плащане" + +#, fuzzy +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "Ценова листа" + +#, fuzzy +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "Условие за плащане" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "Променено на" + +#, fuzzy +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "Променено от" + +#, fuzzy +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "Създадено на" + +#, fuzzy +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "Създадено от" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "Свободен" + +#, fuzzy +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "Продукт" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "Количество" + +#, fuzzy +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "Условие за плащане" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "Последователност" + +#, fuzzy +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "Единица" + +#, fuzzy +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "Десетични единици" + +#, fuzzy +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "Променено на" + +#, fuzzy +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "Променено от" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/ca_ES.po tryton-modules-sale-extra-3.8.0/locale/ca_ES.po --- tryton-modules-sale-extra-3.6.3/locale/ca_ES.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/ca_ES.po 2015-10-31 09:53:34.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/cs_CZ.po tryton-modules-sale-extra-3.8.0/locale/cs_CZ.po --- tryton-modules-sale-extra-3.6.3/locale/cs_CZ.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/cs_CZ.po 2015-10-31 09:53:46.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/de_DE.po tryton-modules-sale-extra-3.8.0/locale/de_DE.po --- tryton-modules-sale-extra-3.6.3/locale/de_DE.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/de_DE.po 2015-10-31 09:53:58.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/es_AR.po tryton-modules-sale-extra-3.8.0/locale/es_AR.po --- tryton-modules-sale-extra-3.6.3/locale/es_AR.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/es_AR.po 2015-10-31 09:54:09.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/es_CO.po tryton-modules-sale-extra-3.8.0/locale/es_CO.po --- tryton-modules-sale-extra-3.6.3/locale/es_CO.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/es_CO.po 2015-10-31 09:54:44.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/es_EC.po tryton-modules-sale-extra-3.8.0/locale/es_EC.po --- tryton-modules-sale-extra-3.6.3/locale/es_EC.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/es_EC.po 2015-10-31 09:54:21.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/es_ES.po tryton-modules-sale-extra-3.8.0/locale/es_ES.po --- tryton-modules-sale-extra-3.6.3/locale/es_ES.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/es_ES.po 2015-10-31 09:54:32.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/es_MX.po tryton-modules-sale-extra-3.8.0/locale/es_MX.po --- tryton-modules-sale-extra-3.6.3/locale/es_MX.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/es_MX.po 2015-10-31 09:55:53.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +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" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +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" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "Líneas" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "Tarifa" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "Nombre" + +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" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "Fecha creación" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "Extra" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "Gratis" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "Producto" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "Categoría UdM del producto" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "Cantidad" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "Importe de la venta" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "Secuencia" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "Unidad" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "Decimales de la unidad" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "Fecha modificación" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "field:sale.line,extra:" +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 "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "Extra de venta" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "Línea extra de venta" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/fr_FR.po tryton-modules-sale-extra-3.8.0/locale/fr_FR.po --- tryton-modules-sale-extra-3.6.3/locale/fr_FR.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/fr_FR.po 2015-10-31 09:54:55.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/locale/hu_HU.po tryton-modules-sale-extra-3.8.0/locale/hu_HU.po --- tryton-modules-sale-extra-3.6.3/locale/hu_HU.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/hu_HU.po 2015-10-31 09:56:26.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/it_IT.po tryton-modules-sale-extra-3.8.0/locale/it_IT.po --- tryton-modules-sale-extra-3.6.3/locale/it_IT.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/it_IT.po 2015-10-31 09:56:37.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/ja_JP.po tryton-modules-sale-extra-3.8.0/locale/ja_JP.po --- tryton-modules-sale-extra-3.6.3/locale/ja_JP.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/ja_JP.po 2015-10-31 09:55:44.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/lt_LT.po tryton-modules-sale-extra-3.8.0/locale/lt_LT.po --- tryton-modules-sale-extra-3.6.3/locale/lt_LT.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/lt_LT.po 2015-10-31 09:55:06.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/nl_NL.po tryton-modules-sale-extra-3.8.0/locale/nl_NL.po --- tryton-modules-sale-extra-3.6.3/locale/nl_NL.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/nl_NL.po 2015-10-31 09:55:17.000000000 +0000 @@ -0,0 +1,178 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +#, fuzzy +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "Actief" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +msgstr "Valuta decimalen" + +msgctxt "field:sale.extra,end_date:" +msgid "End Date" +msgstr "" + +msgctxt "field:sale.extra,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "Transacties" + +#, fuzzy +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "Naam bijlage" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "Naam bijlage" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "Producten" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "Hoeveelheid" + +#, fuzzy +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "Naam bijlage" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "Reeks" + +#, fuzzy +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "Eenheid" + +#, fuzzy +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "Decimalen eenheid" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/pt_BR.po tryton-modules-sale-extra-3.8.0/locale/pt_BR.po --- tryton-modules-sale-extra-3.6.3/locale/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/pt_BR.po 2015-10-31 09:56:12.000000000 +0000 @@ -0,0 +1,167 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "Ativo" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "Empresa" + +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "Data de criação" + +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "Criado por" + +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +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" +msgstr "ID" + +msgctxt "field:sale.extra,lines:" +msgid "Lines" +msgstr "Linhas" + +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "Nome" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "Lista de Preços" + +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "Nome" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +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 "Data de edição" + +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "Editado por" + +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "Data de criação" + +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "Criado por" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "Extra" + +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "Gratuito" + +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "Produto" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "Categoria da UDM do Produto" + +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "Quantidade" + +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "Nome" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "Montante da Venda" + +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "Sequência" + +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "Unidade" + +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "Dígitos Decimais da Unidade" + +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "Data de edição" + +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +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 Venda" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "Extras" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "Extra de Venda" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "Linha Extra de Venda" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "Linha Extra" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "Linas Extra" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "Linha de Venda" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "Extra" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "Extras" diff -Nru tryton-modules-sale-extra-3.6.3/locale/ru_RU.po tryton-modules-sale-extra-3.8.0/locale/ru_RU.po --- tryton-modules-sale-extra-3.6.3/locale/ru_RU.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/ru_RU.po 2015-10-31 09:55:28.000000000 +0000 @@ -0,0 +1,189 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +#, fuzzy +msgctxt "field:sale.extra,active:" +msgid "Active" +msgstr "Действующий" + +msgctxt "field:sale.extra,company:" +msgid "Company" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,create_date:" +msgid "Create Date" +msgstr "Дата создания" + +#, fuzzy +msgctxt "field:sale.extra,create_uid:" +msgid "Create User" +msgstr "Создано пользователем" + +#, fuzzy +msgctxt "field:sale.extra,currency_digits:" +msgid "Currency Digits" +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 "Строки" + +#, fuzzy +msgctxt "field:sale.extra,name:" +msgid "Name" +msgstr "Правило оплаты" + +msgctxt "field:sale.extra,price_list:" +msgid "Price List" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,rec_name:" +msgid "Name" +msgstr "Правило оплаты" + +msgctxt "field:sale.extra,sale_amount:" +msgid "Sale Amount" +msgstr "" + +msgctxt "field:sale.extra,start_date:" +msgid "Start Date" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra,write_date:" +msgid "Write Date" +msgstr "Дата изменения" + +#, fuzzy +msgctxt "field:sale.extra,write_uid:" +msgid "Write User" +msgstr "Изменено пользователем" + +#, fuzzy +msgctxt "field:sale.extra.line,create_date:" +msgid "Create Date" +msgstr "Дата создания" + +#, fuzzy +msgctxt "field:sale.extra.line,create_uid:" +msgid "Create User" +msgstr "Создано пользователем" + +msgctxt "field:sale.extra.line,extra:" +msgid "Extra" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,free:" +msgid "Free" +msgstr "Свободно" + +#, fuzzy +msgctxt "field:sale.extra.line,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:sale.extra.line,product:" +msgid "Product" +msgstr "Товарно материальные ценности (ТМЦ)" + +msgctxt "field:sale.extra.line,product_uom_category:" +msgid "Product UoM Category" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,quantity:" +msgid "Quantity" +msgstr "Кол-во" + +#, fuzzy +msgctxt "field:sale.extra.line,rec_name:" +msgid "Name" +msgstr "Правило оплаты" + +msgctxt "field:sale.extra.line,sale_amount:" +msgid "Sale Amount" +msgstr "" + +#, fuzzy +msgctxt "field:sale.extra.line,sequence:" +msgid "Sequence" +msgstr "Последовательность" + +#, fuzzy +msgctxt "field:sale.extra.line,unit:" +msgid "Unit" +msgstr "Штука" + +#, fuzzy +msgctxt "field:sale.extra.line,unit_digits:" +msgid "Unit Digits" +msgstr "Кол-во цифр после запятой" + +#, fuzzy +msgctxt "field:sale.extra.line,write_date:" +msgid "Write Date" +msgstr "Дата изменения" + +#, fuzzy +msgctxt "field:sale.extra.line,write_uid:" +msgid "Write User" +msgstr "Изменено пользователем" + +msgctxt "field:sale.line,extra:" +msgid "Extra" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_form" +msgid "Extras" +msgstr "" + +msgctxt "model:ir.action,name:act_extra_relate" +msgid "Sale Extras" +msgstr "" + +msgctxt "model:ir.ui.menu,name:menu_extra" +msgid "Extras" +msgstr "" + +msgctxt "model:sale.extra,name:" +msgid "Sale Extra" +msgstr "" + +msgctxt "model:sale.extra.line,name:" +msgid "Sale Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Line" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Extra Lines" +msgstr "" + +msgctxt "view:sale.extra.line:" +msgid "Sale Line" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extra" +msgstr "" + +msgctxt "view:sale.extra:" +msgid "Extras" +msgstr "" diff -Nru tryton-modules-sale-extra-3.6.3/locale/sl_SI.po tryton-modules-sale-extra-3.8.0/locale/sl_SI.po --- tryton-modules-sale-extra-3.6.3/locale/sl_SI.po 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/locale/sl_SI.po 2015-10-31 09:55:39.000000000 +0000 @@ -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 @@ 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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/PKG-INFO tryton-modules-sale-extra-3.8.0/PKG-INFO --- tryton-modules-sale-extra-3.6.3/PKG-INFO 2015-09-13 21:57:35.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/PKG-INFO 2015-11-02 15:15:32.000000000 +0000 @@ -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@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 :: 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 -Nru tryton-modules-sale-extra-3.6.3/price_list.py tryton-modules-sale-extra-3.8.0/price_list.py --- tryton-modules-sale-extra-3.6.3/price_list.py 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/price_list.py 1970-01-01 00:00:00.000000000 +0000 @@ -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 -Nru tryton-modules-sale-extra-3.6.3/price_list.xml tryton-modules-sale-extra-3.8.0/price_list.xml --- tryton-modules-sale-extra-3.6.3/price_list.xml 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/price_list.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ - - - - - - product.price_list - - price_list_form - - - diff -Nru tryton-modules-sale-extra-3.6.3/sale.py tryton-modules-sale-extra-3.8.0/sale.py --- tryton-modules-sale-extra-3.6.3/sale.py 2015-07-13 21:49:19.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/sale.py 2015-07-16 17:19:24.000000000 +0000 @@ -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 @@ @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 @@ if extra2lines: lines.extend(extra2lines.values()) self.lines = lines - if lines_to_delete: - Line.delete(lines_to_delete) class SaleLine: @@ -60,9 +68,38 @@ __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 @@ '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 @@ 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 @@ 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 -Nru tryton-modules-sale-extra-3.6.3/sale.xml tryton-modules-sale-extra-3.8.0/sale.xml --- tryton-modules-sale-extra-3.6.3/sale.xml 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/sale.xml 2015-05-28 20:55:18.000000000 +0000 @@ -16,10 +16,11 @@ - Sale Extras + Extras sale.extra - + @@ -32,10 +33,23 @@ - + + + + Sale Extras + sale.extra + + + + form_relate product.price_list,-1 - + @@ -44,7 +58,7 @@ @@ -56,9 +70,9 @@ - + - + @@ -91,7 +105,7 @@ @@ -103,9 +117,9 @@ - + - + diff -Nru tryton-modules-sale-extra-3.6.3/setup.py tryton-modules-sale-extra-3.8.0/setup.py --- tryton-modules-sale-extra-3.6.3/setup.py 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/setup.py 2015-09-04 09:58:49.000000000 +0000 @@ -41,7 +41,7 @@ '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 @@ '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 -Nru tryton-modules-sale-extra-3.6.3/tests/scenario_sale_extra.rst tryton-modules-sale-extra-3.8.0/tests/scenario_sale_extra.rst --- tryton-modules-sale-extra-3.6.3/tests/scenario_sale_extra.rst 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/tests/scenario_sale_extra.rst 2015-05-28 20:55:18.000000000 +0000 @@ -23,12 +23,12 @@ 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 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 @@ >>> 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 -Nru tryton-modules-sale-extra-3.6.3/tryton.cfg tryton-modules-sale-extra-3.8.0/tryton.cfg --- tryton-modules-sale-extra-3.6.3/tryton.cfg 2015-07-13 18:34:38.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/tryton.cfg 2015-11-02 15:15:10.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=3.6.3 +version=3.8.0 depends: company ir @@ -10,4 +10,3 @@ sale_price_list xml: sale.xml - price_list.xml diff -Nru tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/PKG-INFO tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/PKG-INFO --- tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/PKG-INFO 2015-09-13 21:57:34.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/PKG-INFO 2015-11-02 15:15:23.000000000 +0000 @@ -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@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 :: 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 -Nru tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/requires.txt tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/requires.txt --- tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/requires.txt 2015-09-13 21:57:34.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/requires.txt 2015-11-02 15:15:23.000000000 +0000 @@ -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 -Nru tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/SOURCES.txt tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/SOURCES.txt --- tryton-modules-sale-extra-3.6.3/trytond_sale_extra.egg-info/SOURCES.txt 2015-09-13 21:57:34.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/trytond_sale_extra.egg-info/SOURCES.txt 2015-11-02 15:15:24.000000000 +0000 @@ -4,23 +4,30 @@ 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 @@ ./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_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 -Nru tryton-modules-sale-extra-3.6.3/view/extra_form.xml tryton-modules-sale-extra-3.8.0/view/extra_form.xml --- tryton-modules-sale-extra-3.6.3/view/extra_form.xml 2015-04-20 20:58:51.000000000 +0000 +++ tryton-modules-sale-extra-3.8.0/view/extra_form.xml 2015-05-28 20:55:18.000000000 +0000 @@ -6,9 +6,15 @@