[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch upstream created. 6ce80d6d80289fc1c1679e87a826bcc6c51ed06f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:09:27 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=6ce80d6d80289fc1c1679e87a826bcc6c51ed06f
commit 6ce80d6d80289fc1c1679e87a826bcc6c51ed06f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:06 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7beaed7..81cac82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c33284c..bf1eda9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_sale_shipment_cost
==========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/es_AR.po b/locale/es_AR.po
index cdbaac2..7399150 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -36,11 +36,11 @@ msgstr "Costo"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
-msgstr "Divisa del costo"
+msgstr "Moneda del costo"
msgctxt "field:stock.shipment.out,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Dígitos de divisa del costo"
+msgstr "Dígitos de moneda del costo"
msgctxt "field:stock.shipment.out,cost_invoice_line:"
msgid "Cost Invoice Line"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 6d1136c..db1c949 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
+msgstr "Falta la \"Cuenta de Ingresos\" del producto \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 619d7fe..bd74b36 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -12,7 +12,7 @@ msgstr "Transportista"
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
-msgstr "Método de coste envío venta"
+msgstr "Método de coste envío"
msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
@@ -48,16 +48,16 @@ msgstr "Coste de la línea de factura"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr "Al ordenar"
+msgstr "En el pedido"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr "Al enviar"
+msgstr "En el albarán"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr "Al ordenar"
+msgstr "En el pedido"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr "Al enviar"
+msgstr "En el albarán"
diff --git a/locale/es_CO.po b/locale/sl_SI.po
similarity index 74%
copy from locale/es_CO.po
copy to locale/sl_SI.po
index 6d1136c..8def492 100644
--- a/locale/es_CO.po
+++ b/locale/sl_SI.po
@@ -4,60 +4,60 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
+msgstr "Pri izdelku \"%s\" manjka prihodkovni konto."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
-msgstr "Transportadora"
+msgstr "Špediter"
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
-msgstr "Método de Costeo de Envio de Venta"
+msgstr "Obračun odpreme"
msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
-msgstr "Costo de Envío"
+msgstr "Strošek dostave"
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
-msgstr "Transportadora"
+msgstr "Špediter"
msgctxt "field:sale.sale,shipment_cost_method:"
msgid "Shipment Cost Method"
-msgstr "Método de Costeo de Envio"
+msgstr "Obračun odpreme"
msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
-msgstr "Transportadora"
+msgstr "Špediter"
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
-msgstr "Costo"
+msgstr "Strošek"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda del Costo"
+msgstr "Valuta stroška"
msgctxt "field:stock.shipment.out,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimales de Moneda del Costo"
+msgstr "Decimalke stroška"
msgctxt "field:stock.shipment.out,cost_invoice_line:"
msgid "Cost Invoice Line"
-msgstr "Línea de Factura de Costo"
+msgstr "Postavka stroška"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr "Sobre el Pedido"
+msgstr "Po nalogu"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr "Sobre el Envío"
+msgstr "Po odpremi"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr "Sobre el Pedido"
+msgstr "Po nalogu"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr "Sobre el Envío"
+msgstr "Po odpremi"
diff --git a/sale.py b/sale.py
index 1fe7254..603678c 100644
--- a/sale.py
+++ b/sale.py
@@ -19,7 +19,7 @@ class Configuration:
('shipment', 'On Shipment'),
], 'Sale Shipment Cost Method',
states={
- 'required': Bool(Eval('context', {}).get('company', 0)),
+ 'required': Bool(Eval('context', {}).get('company')),
}))
@staticmethod
diff --git a/setup.py b/setup.py
index 0b4ccea..6d5518c 100644
--- a/setup.py
+++ b/setup.py
@@ -70,6 +70,7 @@ setup(name='trytond_sale_shipment_cost',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 9c76fa1..5847e0b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_sale_shipment_cost import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_sale_shipment_cost.rst b/tests/scenario_sale_shipment_cost.rst
index 7aed2ea..bd506a9 100644
--- a/tests/scenario_sale_shipment_cost.rst
+++ b/tests/scenario_sale_shipment_cost.rst
@@ -90,7 +90,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
>>> AccountJournal = Model.get('account.journal')
- >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
>>> create_chart = Wizard('account.create_chart')
>>> create_chart.execute('account')
>>> create_chart.form.account_template = account_template
diff --git a/tryton.cfg b/tryton.cfg
index bec2242..b83c8e2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
account_invoice
carrier
diff --git a/trytond_sale_shipment_cost.egg-info/PKG-INFO b/trytond_sale_shipment_cost.egg-info/PKG-INFO
index 21024f0..3d56bea 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-cost
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_sale_shipment_cost
==========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_sale_shipment_cost.egg-info/SOURCES.txt b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
index 83c4085..7bbe4ef 100644
--- a/trytond_sale_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
tests/scenario_sale_shipment_cost.rst
trytond_sale_shipment_cost.egg-info/PKG-INFO
trytond_sale_shipment_cost.egg-info/SOURCES.txt
diff --git a/trytond_sale_shipment_cost.egg-info/requires.txt b/trytond_sale_shipment_cost.egg-info/requires.txt
index 491f267..61ff648 100644
--- a/trytond_sale_shipment_cost.egg-info/requires.txt
+++ b/trytond_sale_shipment_cost.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account_invoice >= 2.8, < 2.9
-trytond_carrier >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_sale >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_account_invoice >= 3.0, < 3.1
+trytond_carrier >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond_sale >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 5a0e4e799c872ecbe3ebdfc2c5d297190bdb916c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:42 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7324ddf..7beaed7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 36d3778..52304b0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
-Copyright (C) 2011 Bertrand Chenal.
+Copyright (C) 2011-2013 Cédric Krier.
+Copyright (C) 2011-2013 Bertrand Chenal.
Copyright (C) 2011-2012 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 478d5ff..fc0b03e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 7b41686..c33284c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_sale_shipment_cost
==========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index b6bc46c..d8c84c9 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Не е зададена \"Сметка за приходи\" за продукт \"%s\"!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr ""
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 3443e9f..8488b6c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Falta un \"Compte d'ingressos\" en el producte \"%s\"."
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr "No es troba el \"Compte a cobrar\" al producte \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 83140b8..ee9d41e 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
msgctxt "field:sale.configuration,sale_carrier:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index a95547d..6a5513c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Es ist kein Ertragskonto für Artikel \"%s\" definiert!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr "Fehlendes \"Ertragskonto\" für Artikel \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index ff16d66..cdbaac2 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "¡Falta una «cuenta de ingresos» en el producto «%s»!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr "Falta la «Cuenta de ingresos» en el producto «%s»."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
@@ -36,11 +36,11 @@ msgstr "Costo"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda del costo"
+msgstr "Divisa del costo"
msgctxt "field:stock.shipment.out,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Dígitos del costo"
+msgstr "Dígitos de divisa del costo"
msgctxt "field:stock.shipment.out,cost_invoice_line:"
msgid "Cost Invoice Line"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 03fc4ab..6d1136c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Falta una \"Cuenta de Ingresos\" para el producto \"%s\"!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr ""
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
@@ -12,7 +12,7 @@ msgstr "Transportadora"
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
-msgstr "Método de Costo de Envio de Venta"
+msgstr "Método de Costeo de Envio de Venta"
msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
@@ -24,7 +24,7 @@ msgstr "Transportadora"
msgctxt "field:sale.sale,shipment_cost_method:"
msgid "Shipment Cost Method"
-msgstr "Método de Costo de Envio"
+msgstr "Método de Costeo de Envio"
msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
@@ -48,16 +48,16 @@ msgstr "Línea de Factura de Costo"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr "Pedido"
+msgstr "Sobre el Pedido"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr "Enviado"
+msgstr "Sobre el Envío"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr "Pedido"
+msgstr "Sobre el Pedido"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr "Enviado"
+msgstr "Sobre el Envío"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index cb4fc5e..619d7fe 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Al producto \"%s\" le falta una \"Cuenta de ingresos\"."
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr "Falta la \"Cuenta a cobrar\" en el producto \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8ce45ee..8b26571 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Il manque un \"Compte de produit\" sur le produit \"%s\" !"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr "Le compte des revenus est manquant sur le tiers \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 055ca8e..ee9d41e 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,10 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
-msgstr "Grootboekrekening \"Opbrengst\" ontbreekt voor product \"%s\"!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
+msgstr ""
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 83140b8..0d2f111 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
-msgid "It misses an \"Account Revenue\" on product \"%s\"!"
+msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
msgctxt "field:sale.configuration,sale_carrier:"
@@ -30,9 +30,10 @@ msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
msgstr ""
+#, fuzzy
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Стоимость"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
diff --git a/sale.py b/sale.py
index 4fecfa2..1fe7254 100644
--- a/sale.py
+++ b/sale.py
@@ -20,8 +20,7 @@ class Configuration:
], 'Sale Shipment Cost Method',
states={
'required': Bool(Eval('context', {}).get('company', 0)),
- },
- depends=['company']))
+ }))
@staticmethod
def default_sale_shipment_cost_method():
diff --git a/sale.xml b/sale.xml
index 84883f0..dadeba1 100644
--- a/sale.xml
+++ b/sale.xml
@@ -7,19 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">sale.configuration</field>
<field name="type">form</field>
<field name="inherit" ref="sale.sale_configuration_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/field[@name='sale_shipment_method']"
- position="after">
- <label name="sale_carrier"/>
- <field name="sale_carrier"/>
- <label name="sale_shipment_cost_method"/>
- <field name="sale_shipment_cost_method"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">configuration_form</field>
</record>
<record model="ir.property" id="property_sale_shipment_cost_method">
@@ -32,38 +20,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">sale.sale</field>
<field name="type">form</field>
<field name="inherit" ref="sale.sale_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook/page[@id='sale']/field[@name='currency']"
- position="after">
- <label name="carrier"/>
- <field name="carrier"/>
- </xpath>
- <xpath
- expr="/form/notebook/page[@id='other']/field[@name='shipment_method']"
- position="after">
- <label name="shipment_cost_method"/>
- <field name="shipment_cost_method"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">sale_form</field>
</record>
<record model="ir.ui.view" id="sale_line_view_tree_sequence">
<field name="model">sale.line</field>
<field name="type">tree</field>
<field name="inherit" ref="sale.sale_line_view_tree_sequence"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree" position="inside">
- <field name="shipment_cost" tree_invisible="1"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">sale_line_tree_sequence</field>
</record>
</data>
diff --git a/setup.py b/setup.py
index 17a3e25..0b4ccea 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
tests_require = ['proteus >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1)]
@@ -43,16 +43,16 @@ setup(name='trytond_sale_shipment_cost',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.sale_shipment_cost': '.'},
packages=[
'trytond.modules.sale_shipment_cost',
'trytond.modules.sale_shipment_cost.tests',
],
package_data={
- 'trytond.modules.sale_shipment_cost': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'tests/*.rst'],
+ 'trytond.modules.sale_shipment_cost': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -63,6 +63,7 @@ setup(name='trytond_sale_shipment_cost',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/stock.py b/stock.py
index 585682c..ba6582b 100644
--- a/stock.py
+++ b/stock.py
@@ -38,9 +38,9 @@ class ShipmentOut:
def __setup__(cls):
super(ShipmentOut, cls).__setup__()
cls._error_messages.update({
- 'missing_account_revenue': 'It misses '
- 'an "Account Revenue" on product "%s"!',
- })
+ 'missing_account_revenue': ('Missing "Account Revenue" on '
+ 'product "%s".'),
+ })
if not cls.inventory_moves.on_change:
cls.inventory_moves.on_change = []
for fname in ('carrier', 'customer', 'inventory_moves'):
diff --git a/stock.xml b/stock.xml
index aa6481b..6297cb1 100644
--- a/stock.xml
+++ b/stock.xml
@@ -7,22 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">stock.shipment.out</field>
<field name="type">form</field>
<field name="inherit" ref="stock.shipment_out_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook"
- position="after">
- <label name="carrier"/>
- <field name="carrier"/>
- <label name="cost"/>
- <group col="2" id="cost">
- <field name="cost"/>
- <field name="cost_currency"/>
- </group>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">shipment_out_form</field>
</record>
</data>
</tryton>
diff --git a/tests/scenario_sale_shipment_cost.rst b/tests/scenario_sale_shipment_cost.rst
index ce35630..7aed2ea 100644
--- a/tests/scenario_sale_shipment_cost.rst
+++ b/tests/scenario_sale_shipment_cost.rst
@@ -34,10 +34,13 @@ Create company::
>>> Currency = Model.get('currency.currency')
>>> CurrencyRate = Model.get('currency.currency.rate')
>>> Company = Model.get('company.company')
+ >>> Party = Model.get('party.party')
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> company.name = 'B2CK'
+ >>> party = Party(name='B2CK')
+ >>> party.save()
+ >>> company.party = party
>>> currencies = Currency.find([('code', '=', 'EUR')])
>>> if not currencies:
... currency = Currency(name='Euro', symbol=u'€', code='EUR',
@@ -128,36 +131,45 @@ Create category::
Create product::
>>> ProductUom = Model.get('product.uom')
+ >>> ProductTemplate = Model.get('product.template')
>>> Product = Model.get('product.product')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
>>> product = Product()
- >>> product.name = 'Product'
- >>> product.category = category
- >>> product.default_uom = unit
- >>> product.type = 'goods'
- >>> product.salable = True
- >>> product.delivery_time = 0
- >>> product.list_price = Decimal('20')
- >>> product.cost_price = Decimal('8')
- >>> product.account_revenue = revenue
+ >>> template = ProductTemplate()
+ >>> template.name = 'Product'
+ >>> template.category = category
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.salable = True
+ >>> template.delivery_time = 0
+ >>> template.list_price = Decimal('20')
+ >>> template.cost_price = Decimal('8')
+ >>> template.account_revenue = revenue
+ >>> template.save()
+ >>> product.template = template
>>> product.save()
>>> carrier_product = Product()
- >>> carrier_product.name = 'Carrier Product'
- >>> carrier_product.category = category
- >>> carrier_product.default_uom = unit
- >>> carrier_product.type = 'service'
- >>> carrier_product.salable = True
- >>> carrier_product.delivery_time = 0
- >>> carrier_product.list_price = Decimal('3')
- >>> carrier_product.cost_price = Decimal(0)
- >>> carrier_product.account_revenue = revenue
+ >>> carrier_template = ProductTemplate()
+ >>> carrier_template.name = 'Carrier Product'
+ >>> carrier_template.category = category
+ >>> carrier_template.default_uom = unit
+ >>> carrier_template.type = 'service'
+ >>> carrier_template.salable = True
+ >>> carrier_template.delivery_time = 0
+ >>> carrier_template.list_price = Decimal('3')
+ >>> carrier_template.cost_price = Decimal(0)
+ >>> carrier_template.account_revenue = revenue
+ >>> carrier_template.save()
+ >>> carrier_product.template = carrier_template
>>> carrier_product.save()
Create carrier::
>>> Carrier = Model.get('carrier')
>>> carrier = Carrier()
- >>> carrier.name = 'Carrier'
+ >>> party = Party(name='Carrier')
+ >>> party.save()
+ >>> carrier.party = party
>>> carrier.carrier_product = carrier_product
>>> carrier.save()
diff --git a/tryton.cfg b/tryton.cfg
index 2130e93..bec2242 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
account_invoice
carrier
diff --git a/trytond_sale_shipment_cost.egg-info/PKG-INFO b/trytond_sale_shipment_cost.egg-info/PKG-INFO
index 631612d..21024f0 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-sale-shipment-cost
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_sale_shipment_cost
==========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_sale_shipment_cost.egg-info/SOURCES.txt b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
index 37aef4c..83c4085 100644
--- a/trytond_sale_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
@@ -31,4 +31,8 @@ trytond_sale_shipment_cost.egg-info/dependency_links.txt
trytond_sale_shipment_cost.egg-info/entry_points.txt
trytond_sale_shipment_cost.egg-info/not-zip-safe
trytond_sale_shipment_cost.egg-info/requires.txt
-trytond_sale_shipment_cost.egg-info/top_level.txt
\ No newline at end of file
+trytond_sale_shipment_cost.egg-info/top_level.txt
+view/configuration_form.xml
+view/sale_form.xml
+view/sale_line_tree_sequence.xml
+view/shipment_out_form.xml
\ No newline at end of file
diff --git a/trytond_sale_shipment_cost.egg-info/requires.txt b/trytond_sale_shipment_cost.egg-info/requires.txt
index 2a156f7..491f267 100644
--- a/trytond_sale_shipment_cost.egg-info/requires.txt
+++ b/trytond_sale_shipment_cost.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account_invoice >= 2.6, < 2.7
-trytond_carrier >= 2.6, < 2.7
-trytond_currency >= 2.6, < 2.7
-trytond_sale >= 2.6, < 2.7
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account_invoice >= 2.8, < 2.9
+trytond_carrier >= 2.8, < 2.9
+trytond_currency >= 2.8, < 2.9
+trytond_sale >= 2.8, < 2.9
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000..ad3d99e
--- /dev/null
+++ b/view/configuration_form.xml
@@ -0,0 +1,11 @@
+<?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/field[@name='sale_shipment_method']" position="after">
+ <label name="sale_carrier"/>
+ <field name="sale_carrier"/>
+ <label name="sale_shipment_cost_method"/>
+ <field name="sale_shipment_cost_method"/>
+ </xpath>
+</data>
diff --git a/view/sale_form.xml b/view/sale_form.xml
new file mode 100644
index 0000000..3f16667
--- /dev/null
+++ b/view/sale_form.xml
@@ -0,0 +1,16 @@
+<?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/page[@id='sale']/field[@name='currency']"
+ position="after">
+ <label name="carrier"/>
+ <field name="carrier"/>
+ </xpath>
+ <xpath
+ expr="/form/notebook/page[@id='other']/field[@name='shipment_method']"
+ position="after">
+ <label name="shipment_cost_method"/>
+ <field name="shipment_cost_method"/>
+ </xpath>
+</data>
diff --git a/view/sale_line_tree_sequence.xml b/view/sale_line_tree_sequence.xml
new file mode 100644
index 0000000..07430f1
--- /dev/null
+++ b/view/sale_line_tree_sequence.xml
@@ -0,0 +1,8 @@
+<?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="/tree" position="inside">
+ <field name="shipment_cost" tree_invisible="1"/>
+ </xpath>
+</data>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
new file mode 100644
index 0000000..1f0a8a6
--- /dev/null
+++ b/view/shipment_out_form.xml
@@ -0,0 +1,14 @@
+<?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="after">
+ <label name="carrier"/>
+ <field name="carrier"/>
+ <label name="cost"/>
+ <group col="2" id="cost">
+ <field name="cost"/>
+ <field name="cost_currency"/>
+ </group>
+ </xpath>
+</data>
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list