[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch debian updated. debian/2.8.0-2-4-ga85b01d
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:37:24 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=debian/2.8.0-2-4-ga85b01d
commit a85b01d0b868f124c18ce200ccbc0035d86a2bef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:26 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index fccf751..b920b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale-shipment-cost (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:55:13 +0100
+
tryton-modules-sale-shipment-cost (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit 4bc9d51d71b059691a8cedec7387d2551db288bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index af2d4e6..64db210 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale-shipment-cost.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 6d08478d30ea8627751dbbf99e20e680ed4a3611
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 4bd8223..af2d4e6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale-shipment-cost.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-sale-shipment-cost.git
commit c26e28115b4281fa0bea0adc899e26840e8413d8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:16 2013 +0100
Merging 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
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list