[tryton-debian-vcs] tryton-modules-stock-supply-production branch debian updated. debian/2.8.0-2-4-gb20f1b9
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:38:45 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply-production.git;a=commitdiff;h=debian/2.8.0-2-4-gb20f1b9
commit b20f1b90b65044471193b9047eb4bd99d1132d40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:41 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 3777c50..58d4dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-supply-production (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:48 +0100
+
tryton-modules-stock-supply-production (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit 619fbc48501bcb4bc9d12821649635b4e6250ea3
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 b7684f7..cb3c125 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-stock-supply-production.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 0b25136378811d5b4cc6656027e4b105174a73f3
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 67191d5..b7684f7 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-stock-supply-production.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-supply-production.git
commit ca25c2f5aec329c9ef4321282fd1c8f29da3bab8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:46 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index a038a0f..2863f4a 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 6000935..38828a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_production
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for stock supply of production
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_stock_supply_production
===============================
@@ -60,6 +60,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/de_DE.po b/locale/de_DE.po
index c427127..0e33002 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -24,7 +24,7 @@ msgstr "Produktionsanforderung erstellen"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr "Produktionsanforderungen Erstellen"
+msgstr "Erstellen von Produktionsanforderungen"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 238f284..85f2597 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 "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Período de Provisión"
+msgstr "Período de Abastecimiento"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
@@ -12,11 +12,11 @@ msgstr "ID"
msgctxt "help:production.configuration,supply_period:"
msgid "In number of days"
-msgstr "En número de días."
+msgstr "En número de días"
msgctxt "model:ir.action,name:act_production_request"
msgid "Request Productions"
-msgstr ""
+msgstr "Órdenes de Producción"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 687e3f2..3074d11 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -20,7 +20,7 @@ msgstr "Demandes de production"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
-msgstr "Créer des demandes de production"
+msgstr "Créer les demandes de production"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
@@ -28,11 +28,11 @@ msgstr "Générer les demandes de production"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
-msgstr "Créer des demandes de production"
+msgstr "Créer les demandes de production"
msgctxt "model:production.create_request.start,name:"
msgid "Create Production Request"
-msgstr "Créer des demandes de production"
+msgstr "Créer les demandes de production"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Production Request"
@@ -44,11 +44,11 @@ msgstr "Production"
msgctxt "view:production.create_request.start:"
msgid "Create Production Request"
-msgstr "Créer des demandes de production"
+msgstr "Créer les demandes de production"
msgctxt "view:production.create_request.start:"
msgid "Create Production Request?"
-msgstr "Créer des demandes de production ?"
+msgstr "Créer les demandes de production ?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
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 238f284..00f312a 100644
--- a/locale/es_CO.po
+++ b/locale/sl_SI.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Período de Provisión"
+msgstr "Obdobje dobave"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
@@ -12,48 +12,48 @@ msgstr "ID"
msgctxt "help:production.configuration,supply_period:"
msgid "In number of days"
-msgstr "En número de días."
+msgstr "V dnevih"
msgctxt "model:ir.action,name:act_production_request"
msgid "Request Productions"
-msgstr ""
+msgstr "Proizvodni zahtevki"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
-msgstr "Crear Ordenes de Producción"
+msgstr "Izdelava proizvodnih zahtevkov"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr "Generar Ordenes de Producción"
+msgstr "Izdelava proizvodnih zahtevkov"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
-msgstr "Crear Ordenes de Producción"
+msgstr "Izdelava proizvodnih zahtevkov"
msgctxt "model:production.create_request.start,name:"
msgid "Create Production Request"
-msgstr "Crear Orden de Producción"
+msgstr "Izdelava proizvodnega zahtevka"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Production Request"
-msgstr "Cron Orden de Producción"
+msgstr "Razporejevalnik proizvodnih zahtevkov"
msgctxt "selection:stock.order_point,type:"
msgid "Production"
-msgstr "Producción"
+msgstr "Proizvodni nalog"
msgctxt "view:production.create_request.start:"
msgid "Create Production Request"
-msgstr "Crear Orden de Producción"
+msgstr "Izdelava proizvodnega zahtevka"
msgctxt "view:production.create_request.start:"
msgid "Create Production Request?"
-msgstr "¿Crear Orden de Producción?"
+msgstr "Izdelava proizvodnega zahtevka?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
-msgstr "Crear"
+msgstr "Ustvari"
msgctxt "wizard_button:production.create_request,start,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
diff --git a/production.py b/production.py
index 00f982b..13682a3 100644
--- a/production.py
+++ b/production.py
@@ -79,14 +79,14 @@ class Production:
with Transaction().set_context(forecast=True,
stock_date_end=today):
pbl = Product.products_by_location(warehouse_ids,
- product_ids, with_childs=True, skip_zero=False)
+ product_ids, with_childs=True)
# order product by supply period
products_period = sorted([(p.get_supply_period(), p)
for p in products[i:i + cursor.IN_MAX]])
for warehouse in warehouses:
- quantities = dict((x, pbl.pop((warehouse.id, x)))
+ quantities = dict((x, pbl.pop((warehouse.id, x), 0))
for x in product_ids)
shortages = cls.get_shortage(warehouse.id, product_ids, today,
quantities, products_period, product2ops)
@@ -176,7 +176,7 @@ class Production:
with Transaction().set_context(stock_date_start=current_date,
stock_date_end=current_date):
pbl = Product.products_by_location([location_id],
- product_ids, with_childs=True, skip_zero=False)
+ product_ids, with_childs=True)
for key, qty in pbl.iteritems():
_, product_id = key
current_qties[product_id] += qty
diff --git a/setup.py b/setup.py
index d204d1c..5bdf686 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_stock_supply_production',
'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 1b9dc63..9c8d55e 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_stock_supply_production import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index bdab2c0..00e751d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
product
diff --git a/trytond_stock_supply_production.egg-info/PKG-INFO b/trytond_stock_supply_production.egg-info/PKG-INFO
index 0ebf9df..d3dd9e4 100644
--- a/trytond_stock_supply_production.egg-info/PKG-INFO
+++ b/trytond_stock_supply_production.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-supply-production
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for stock supply of production
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_stock_supply_production
===============================
@@ -60,6 +60,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_stock_supply_production.egg-info/SOURCES.txt b/trytond_stock_supply_production.egg-info/SOURCES.txt
index 6e8f3eb..31a2da8 100644
--- a/trytond_stock_supply_production.egg-info/SOURCES.txt
+++ b/trytond_stock_supply_production.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
trytond_stock_supply_production.egg-info/PKG-INFO
trytond_stock_supply_production.egg-info/SOURCES.txt
trytond_stock_supply_production.egg-info/dependency_links.txt
diff --git a/trytond_stock_supply_production.egg-info/requires.txt b/trytond_stock_supply_production.egg-info/requires.txt
index c2bb6ad..ec13481 100644
--- a/trytond_stock_supply_production.egg-info/requires.txt
+++ b/trytond_stock_supply_production.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_product >= 2.8, < 2.9
-trytond_production >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond_stock_supply >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_product >= 3.0, < 3.1
+trytond_production >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond_stock_supply >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-stock-supply-production
More information about the tryton-debian-vcs
mailing list