[tryton-debian-vcs] tryton-modules-stock-forecast branch debian updated. debian/2.8.0-3-5-gbc0bad9
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:37:50 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-forecast.git;a=commitdiff;h=debian/2.8.0-3-5-gbc0bad9
commit bc0bad946c07a12fc71b1021c98d8d707c516acf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:35 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index dd94ebf..4ad769d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-forecast (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.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:55:24 +0100
+
tryton-modules-stock-forecast (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit d01c84733f19ac8b4ee51942d357f31bc1c459c4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:49:07 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index a3f82d4..f7e8f2a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Depends:
tryton-modules-company (>= ${version:major}),
tryton-modules-product (>= ${version:major}),
tryton-modules-stock (>= ${version:major}),
- python-dateutil, python-pkg-resources
+ python-dateutil, python-sql, python-pkg-resources
Description: Tryton Application Platform (Stock Forecast Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 8eba7f9e8f99dd875d7440a56ebd5bd2a0e86bc2
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 3e9cda9..a3f82d4 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-forecast.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 9d75dc86f7180985d53bc79db6d64a2105ca79a0
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 7b070c5..3e9cda9 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-forecast.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-forecast.git
commit dd3fddab25e67a1a65a8b2fb6ed5225d908d0632
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:24 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7b6caa6..0b32092 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/INSTALL b/INSTALL
index 4b0b4c3..b354d0a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.6 or later (http://www.python.org/)
* python-dateutil (http://labix.org/python-dateutil)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_stock (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 3e04fa5..7b3817c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_forecast
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with stock forecasts
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_forecast
=====================
@@ -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/forecast.py b/forecast.py
index f0e1738..d0d4d0a 100644
--- a/forecast.py
+++ b/forecast.py
@@ -3,10 +3,13 @@
import datetime
from dateutil.relativedelta import relativedelta
import itertools
+from sql.aggregate import Sum
+from sql.conditionals import Coalesce
+
from trytond.model import ModelView, Workflow, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateTransition, Button
from trytond.pyson import Not, Equal, Eval, Or, Bool, If
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.tools import reduce_ids
@@ -94,7 +97,9 @@ class Forecast(Workflow, ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
Location = Pool().get('stock.location')
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
table = TableHandler(cursor, cls, module_name)
migrate_warehouse = (not table.column_exist('warehouse')
@@ -114,7 +119,7 @@ class Forecast(Workflow, ModelSQL, ModelView):
return location.id
elif location.parent:
return find_warehouse(location.parent)
- cursor.execute('SELECT id, location FROM "%s"' % cls._table)
+ cursor.execute(*sql_table.select(sql_table.id, sql_table.location))
for forecast_id, location_id in cursor.fetchall():
warehouse_id = location_id # default fallback
if location_id in location2warehouse:
@@ -123,9 +128,10 @@ class Forecast(Workflow, ModelSQL, ModelView):
location = Location(location_id)
warehouse_id = find_warehouse(location) or location_id
location2warehouse[location_id] = warehouse_id
- cursor.execute('UPDATE "%s" SET warehouse = %%s '
- 'WHERE id = %%s' % cls._table,
- (warehouse_id, forecast_id))
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.warehouse],
+ values=[warehouse_id],
+ where=sql_table.id == forecast_id))
table.not_null_action('warehouse',
action=cls.warehouse.required and 'add' or 'remove')
table.drop_column('location', True)
@@ -158,22 +164,19 @@ class Forecast(Workflow, ModelSQL, ModelView):
def check_date_overlap(self):
cursor = Transaction().cursor
if self.state != 'done':
- return True
- cursor.execute('SELECT id '
- 'FROM stock_forecast '
- 'WHERE ((from_date <= %s AND to_date >= %s) '
- 'OR (from_date <= %s AND to_date >= %s) '
- 'OR (from_date >= %s AND to_date <= %s)) '
- 'AND warehouse = %s '
- 'AND destination = %s '
- 'AND state = \'done\' '
- 'AND company = %s '
- 'AND id != %s',
- (self.from_date, self.from_date,
- self.to_date, self.to_date,
- self.from_date, self.to_date,
- self.warehouse.id, self.destination.id,
- self.company.id, self.id))
+ return
+ forcast = self.__table__()
+ cursor.execute(*forcast.select(forcast.id,
+ where=(((forcast.from_date <= self.from_date)
+ & (forcast.to_date >= self.from_date))
+ | ((forcast.from_date <= self.to_date)
+ & (forcast.to_date >= self.to_date))
+ | ((forcast.from_date >= self.from_date)
+ & (forcast.to_date <= self.to_date)))
+ & (forcast.warehouse == self.warehouse.id)
+ & (forcast.destination == self.destination.id)
+ & (forcast.company == self.company.id)
+ & (forcast.id != self.id)))
forecast_id = cursor.fetchone()
if forecast_id:
second = self.__class__(forecast_id[0])
@@ -338,6 +341,11 @@ class ForecastLine(ModelSQL, ModelView):
Forecast = pool.get('stock.forecast')
LineMove = pool.get('stock.forecast.line-stock.move')
+ move = Move.__table__()
+ location_from = Location.__table__()
+ location_to = Location.__table__()
+ line_move = LineMove.__table__()
+
result = dict((x.id, 0) for x in lines)
key = lambda line: line.forecast.id
lines.sort(key=key)
@@ -347,28 +355,26 @@ class ForecastLine(ModelSQL, ModelView):
product_ids = product2line.keys()
for i in range(0, len(product_ids), cursor.IN_MAX):
sub_ids = product_ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('product', sub_ids)
- cursor.execute('SELECT m.product, '
- 'SUM(m.internal_quantity) AS quantity '
- 'FROM "' + Move._table + '" AS m '
- 'JOIN "' + Location._table + '" AS fl '
- 'ON m.from_location = fl.id '
- 'JOIN "' + Location._table + '" AS tl '
- 'ON m.to_location = tl.id '
- 'LEFT JOIN "' + LineMove._table + '" AS lm '
- 'ON m.id = lm.move '
- 'WHERE ' + red_sql + ' '
- 'AND fl.left >= %s AND fl.right <= %s '
- 'AND tl.left >= %s AND tl.right <= %s '
- 'AND m.state != %s '
- 'AND COALESCE(m.effective_date, m.planned_date) >= %s '
- 'AND COALESCE(m.effective_date, m.planned_date) <= %s '
- 'AND lm.id IS NULL '
- 'GROUP BY m.product',
- red_ids + [forecast.warehouse.left,
- forecast.warehouse.right, forecast.destination.left,
- forecast.destination.right, 'cancel',
- forecast.from_date, forecast.to_date])
+ red_sql = reduce_ids(move.product, sub_ids)
+ cursor.execute(*move.join(location_from,
+ condition=move.from_location == location_from.id
+ ).join(location_to,
+ condition=move.to_location == location_to.id
+ ).join(line_move, 'LEFT',
+ condition=move.id == line_move.move
+ ).select(move.product, Sum(move.internal_quantity),
+ where=red_sql
+ & (location_from.left >= forecast.warehouse.left)
+ & (location_from.right <= forecast.warehouse.right)
+ & (location_to.left >= forecast.destination.left)
+ & (location_to.right <= forecast.destination.right)
+ & (move.state != 'cancel')
+ & (Coalesce(move.effective_date, move.planned_date)
+ >= forecast.from_date)
+ & (Coalesce(move.effective_date, move.planned_date)
+ <= forecast.to_date)
+ & (line_move.id == None),
+ group_by=move.product))
for product_id, quantity in cursor.fetchall():
line = product2line[product_id]
result[line.id] = Uom.compute_qty(line.product.default_uom,
@@ -513,7 +519,8 @@ class ForecastComplete(Wizard):
def __setup__(cls):
super(ForecastComplete, cls).__setup__()
cls._error_messages.update({
- 'from_to_date': '"From Date" should be smaller than "To Date".',
+ 'from_to_date': (
+ '"From Date" should be smaller than "To Date".'),
})
def default_ask(self, fields):
@@ -541,7 +548,7 @@ class ForecastComplete(Wizard):
stock_date_start=self.ask.from_date,
stock_date_end=self.ask.to_date):
return Product.products_by_location([forecast.warehouse.id],
- with_childs=True, skip_zero=False)
+ with_childs=True)
def default_choose(self, fields):
"""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 4190548..3c21e70 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.forecast.complete:"
msgid "\"From Date\" should be smaller than \"To Date\"."
-msgstr "\"Desde la fecha\" debe ser más pequeña que \"Hasta la fecha\"."
+msgstr "\"Desde la fecha\" debe ser anterior a \"Hasta la fecha\"."
msgctxt "error:stock.forecast.line:"
msgid "Line quantity must be greater than the minimal quantity"
@@ -20,19 +20,19 @@ msgstr "El producto debe ser único en la previsión de stocks."
msgctxt "error:stock.forecast:"
msgid "\"To Date\" must be greater than \"From Date\""
-msgstr "\"Hasta la fecha\" debe ser más grande que \"Desde la fecha\"."
+msgstr "\"Hasta la fecha\" debe ser posterior a \"Desde la fecha\"."
msgctxt "error:stock.forecast:"
msgid ""
"Forecast \"%(first)s\" overlaps with dates of forecast \"%(second)s\" in the"
" same location."
msgstr ""
-"La previsión \"%(first)s\" se solpa con las fechas de la previsón "
+"La previsión \"%(first)s\" se solapa con las fechas de la previsón "
"%(second)s\" en la misma ubicación."
msgctxt "error:stock.forecast:"
msgid "Forecast \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar la previsión \"%s\" antes de borrar."
+msgstr "Debe cancelar la previsión \"%s\" antes de borrarla."
msgctxt "field:stock.forecast,company:"
msgid "Company"
@@ -301,11 +301,11 @@ msgstr "Restaurar a borrador"
msgctxt "wizard_button:stock.forecast.complete,ask,choose:"
msgid "Choose Products"
-msgstr "Seleccione productos"
+msgstr "Seleccionar productos"
msgctxt "wizard_button:stock.forecast.complete,ask,complete:"
msgid "Complete"
-msgstr "Completa"
+msgstr "Completar"
msgctxt "wizard_button:stock.forecast.complete,ask,end:"
msgid "Cancel"
@@ -313,11 +313,11 @@ msgstr "Cancelar"
msgctxt "wizard_button:stock.forecast.complete,choose,ask:"
msgid "Choose Dates"
-msgstr "Seleccione fechas"
+msgstr "Seleccionar fechas"
msgctxt "wizard_button:stock.forecast.complete,choose,complete:"
msgid "Complete"
-msgstr "Completa"
+msgstr "Completar"
msgctxt "wizard_button:stock.forecast.complete,choose,end:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 63df909..79240d5 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -249,14 +249,6 @@ msgid "Cancel"
msgstr "Annulé"
msgctxt "selection:stock.forecast,state:"
-msgid "Cancel"
-msgstr "Annulé"
-
-msgctxt "selection:stock.forecast,state:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "selection:stock.forecast,state:"
msgid "Done"
msgstr "Fait"
@@ -264,14 +256,6 @@ msgctxt "selection:stock.forecast,state:"
msgid "Draft"
msgstr "Brouillon"
-msgctxt "selection:stock.forecast,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "view:stock.forecast.complete.ask:"
-msgid "Choose dates"
-msgstr "Choisir les dates"
-
msgctxt "view:stock.forecast.complete.ask:"
msgid "Choose dates"
msgstr "Choisir les dates"
@@ -280,14 +264,6 @@ msgctxt "view:stock.forecast.complete.choose:"
msgid "Choose products"
msgstr "Choisissez les produits"
-msgctxt "view:stock.forecast.complete.choose:"
-msgid "Choose products"
-msgstr "Choisissez les produits"
-
-msgctxt "view:stock.forecast.line:"
-msgid "Forecast Line"
-msgstr "Ligne de prévision"
-
msgctxt "view:stock.forecast.line:"
msgid "Forecast Line"
msgstr "Ligne de prévision"
@@ -296,23 +272,11 @@ msgctxt "view:stock.forecast.line:"
msgid "Forecast Lines"
msgstr "Lignes de prévision"
-msgctxt "view:stock.forecast.line:"
-msgid "Forecast Lines"
-msgstr "Lignes de prévision"
-
msgctxt "view:stock.forecast:"
msgid "Add forecast line based on past data."
msgstr "Ajouter la ligne des prévisions fondées sur des données historiques."
msgctxt "view:stock.forecast:"
-msgid "Add forecast line based on past data."
-msgstr "Ajouter la ligne des prévisions fondées sur des données historiques."
-
-msgctxt "view:stock.forecast:"
-msgid "Cancel"
-msgstr "Annuler"
-
-msgctxt "view:stock.forecast:"
msgid "Cancel"
msgstr "Annuler"
@@ -321,14 +285,6 @@ msgid "Complete Forecast"
msgstr "Completer la prévision"
msgctxt "view:stock.forecast:"
-msgid "Complete Forecast"
-msgstr "Completer la prévision"
-
-msgctxt "view:stock.forecast:"
-msgid "Confirm"
-msgstr "Confirmer"
-
-msgctxt "view:stock.forecast:"
msgid "Confirm"
msgstr "Confirmer"
@@ -337,14 +293,6 @@ msgid "Forecast"
msgstr "Prévision"
msgctxt "view:stock.forecast:"
-msgid "Forecast"
-msgstr "Prévision"
-
-msgctxt "view:stock.forecast:"
-msgid "Forecasts"
-msgstr "Prévisions"
-
-msgctxt "view:stock.forecast:"
msgid "Forecasts"
msgstr "Prévisions"
@@ -352,10 +300,6 @@ msgctxt "view:stock.forecast:"
msgid "Reset to Draft"
msgstr "Remettre en brouillon"
-msgctxt "view:stock.forecast:"
-msgid "Reset to Draft"
-msgstr "Remettre en brouillon"
-
msgctxt "wizard_button:stock.forecast.complete,ask,choose:"
msgid "Choose Products"
msgstr "Choix des produits"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 72%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index 4190548..4f7e6a1 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -4,55 +4,55 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.forecast.complete:"
msgid "\"From Date\" should be smaller than \"To Date\"."
-msgstr "\"Desde la fecha\" debe ser más pequeña que \"Hasta la fecha\"."
+msgstr "Datum \"Od\" naj bo manjši od datuma \"Do\""
msgctxt "error:stock.forecast.line:"
msgid "Line quantity must be greater than the minimal quantity"
-msgstr "La cantidad de la línea debe ser más grande que la cantidad mínima."
+msgstr "Količina postavke mora biti večja od minimalne količine"
msgctxt "error:stock.forecast.line:"
msgid "Line quantity must be positive"
-msgstr "La cantidad de la línea debe ser positiva."
+msgstr "Količina postavke mora biti pozitivna"
msgctxt "error:stock.forecast.line:"
msgid "Product must be unique by forecast"
-msgstr "El producto debe ser único en la previsión de stocks."
+msgstr "Izdelek mora biti edinstven po napovedih"
msgctxt "error:stock.forecast:"
msgid "\"To Date\" must be greater than \"From Date\""
-msgstr "\"Hasta la fecha\" debe ser más grande que \"Desde la fecha\"."
+msgstr "Datum \"Do\" mora biti večji od datuma \"Od\""
msgctxt "error:stock.forecast:"
msgid ""
"Forecast \"%(first)s\" overlaps with dates of forecast \"%(second)s\" in the"
" same location."
msgstr ""
-"La previsión \"%(first)s\" se solpa con las fechas de la previsón "
-"%(second)s\" en la misma ubicación."
+"Napoved \"%(first)s\" se prekriva z datumi napovedi \"%(second)s\" na isti "
+"lokaciji."
msgctxt "error:stock.forecast:"
msgid "Forecast \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar la previsión \"%s\" antes de borrar."
+msgstr "Napoved \"%s\" mora biti pred brisanjem preklicana."
msgctxt "field:stock.forecast,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:stock.forecast,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:stock.forecast,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:stock.forecast,destination:"
msgid "Destination"
-msgstr "Destino"
+msgstr "Cilj"
msgctxt "field:stock.forecast,from_date:"
msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Od"
msgctxt "field:stock.forecast,id:"
msgid "ID"
@@ -60,35 +60,35 @@ msgstr "ID"
msgctxt "field:stock.forecast,lines:"
msgid "Lines"
-msgstr "Líneas"
+msgstr "Postavke"
msgctxt "field:stock.forecast,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:stock.forecast,state:"
msgid "State"
-msgstr "Estado"
+msgstr "Stanje"
msgctxt "field:stock.forecast,to_date:"
msgid "To Date"
-msgstr "Hasta la fecha"
+msgstr "Do"
msgctxt "field:stock.forecast,warehouse:"
msgid "Location"
-msgstr "Ubicación"
+msgstr "Lokacija"
msgctxt "field:stock.forecast,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:stock.forecast,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:stock.forecast.complete.ask,from_date:"
msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Od"
msgctxt "field:stock.forecast.complete.ask,id:"
msgid "ID"
@@ -96,7 +96,7 @@ msgstr "ID"
msgctxt "field:stock.forecast.complete.ask,to_date:"
msgid "To Date"
-msgstr "Hasta la fecha"
+msgstr "Do"
msgctxt "field:stock.forecast.complete.choose,id:"
msgid "ID"
@@ -104,19 +104,19 @@ msgstr "ID"
msgctxt "field:stock.forecast.complete.choose,products:"
msgid "Products"
-msgstr "Productos"
+msgstr "Izdelki"
msgctxt "field:stock.forecast.line,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:stock.forecast.line,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:stock.forecast.line,forecast:"
msgid "Forecast"
-msgstr "Previsión"
+msgstr "Napoved"
msgctxt "field:stock.forecast.line,id:"
msgid "ID"
@@ -124,55 +124,55 @@ msgstr "ID"
msgctxt "field:stock.forecast.line,minimal_quantity:"
msgid "Minimal Qty"
-msgstr "Cantidad mínima"
+msgstr "Minimalna količina"
msgctxt "field:stock.forecast.line,moves:"
msgid "Moves"
-msgstr "Movimientos"
+msgstr "Promet"
msgctxt "field:stock.forecast.line,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Izdelek"
msgctxt "field:stock.forecast.line,product_uom_category:"
msgid "Product Uom Category"
-msgstr "Categoría UdM del producto"
+msgstr "Katerogija ME izdelka"
msgctxt "field:stock.forecast.line,quantity:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr "Količina"
msgctxt "field:stock.forecast.line,quantity_executed:"
msgid "Quantity Executed"
-msgstr "Cantidades ejecutadas"
+msgstr "Izvedena količina"
msgctxt "field:stock.forecast.line,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:stock.forecast.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de la unidad"
+msgstr "Decimalke"
msgctxt "field:stock.forecast.line,uom:"
msgid "UOM"
-msgstr "UdM"
+msgstr "ME"
msgctxt "field:stock.forecast.line,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:stock.forecast.line,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:stock.forecast.line-stock.move,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:stock.forecast.line-stock.move,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:stock.forecast.line-stock.move,id:"
msgid "ID"
@@ -180,145 +180,145 @@ msgstr "ID"
msgctxt "field:stock.forecast.line-stock.move,line:"
msgid "Forecast Line"
-msgstr "Línea de previsión"
+msgstr "Postavka napovedi"
msgctxt "field:stock.forecast.line-stock.move,move:"
msgid "Move"
-msgstr "Movimiento"
+msgstr "Promet"
msgctxt "field:stock.forecast.line-stock.move,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:stock.forecast.line-stock.move,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:stock.forecast.line-stock.move,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "model:ir.action,name:act_forecast_form"
msgid "Forecasts"
-msgstr "Previsiones"
+msgstr "Napovedi"
msgctxt "model:ir.action,name:wizard_forecast_complete"
msgid "Complete Forecast"
-msgstr "Previsión completa"
+msgstr "Izpolnitev napovedi"
msgctxt "model:ir.action.act_window.domain,name:act_forecast_form_domain_all"
msgid "All"
-msgstr "Todos"
+msgstr "Vse"
msgctxt ""
"model:ir.action.act_window.domain,name:act_forecast_form_domain_draft"
msgid "Draft"
-msgstr "Borrador"
+msgstr "Osnutki"
msgctxt "model:ir.ui.menu,name:menu_forecast_form"
msgid "Forecasts"
-msgstr "Previsiones"
+msgstr "Napovedi"
msgctxt "model:res.group,name:group_stock_forecast"
msgid "Stock Forecast"
-msgstr "Previsión de stock"
+msgstr "Zaloga - napoved"
msgctxt "model:stock.forecast,name:"
msgid "Stock Forecast"
-msgstr "Previsión de stock"
+msgstr "Napoved zaloge"
msgctxt "model:stock.forecast.complete.ask,name:"
msgid "Complete Forecast"
-msgstr "Previsión completa"
+msgstr "Izpolnitev napovedi"
msgctxt "model:stock.forecast.complete.choose,name:"
msgid "Complete Forecast"
-msgstr "Elegir previsión completa"
+msgstr "Izpolnitev napovedi"
msgctxt "model:stock.forecast.line,name:"
msgid "Stock Forecast Line"
-msgstr "Línea de previsión de stock"
+msgstr "Postavka napovedi zaloge"
msgctxt "model:stock.forecast.line-stock.move,name:"
msgid "ForecastLine - Move"
-msgstr "Línea de previsión - Movimiento"
+msgstr "Postavka napovedi - Promet"
msgctxt "selection:stock.forecast,state:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Preklic"
msgctxt "selection:stock.forecast,state:"
msgid "Done"
-msgstr "Realizada"
+msgstr "Zaključeno"
msgctxt "selection:stock.forecast,state:"
msgid "Draft"
-msgstr "Borrador"
+msgstr "Osnutek"
msgctxt "view:stock.forecast.complete.ask:"
msgid "Choose dates"
-msgstr "Seleccione fechas"
+msgstr "Izberi datume"
msgctxt "view:stock.forecast.complete.choose:"
msgid "Choose products"
-msgstr "Seleccione productos"
+msgstr "Izberi izdelke"
msgctxt "view:stock.forecast.line:"
msgid "Forecast Line"
-msgstr "Línea de previsión"
+msgstr "Postavka napovedi"
msgctxt "view:stock.forecast.line:"
msgid "Forecast Lines"
-msgstr "Líneas de previsión"
+msgstr "Postavke napovedi"
msgctxt "view:stock.forecast:"
msgid "Add forecast line based on past data."
-msgstr "Añadir línea de previsión en base a datos anteriores."
+msgstr "Dodaj postavko napovedi na osnovi preteklih podatkov."
msgctxt "view:stock.forecast:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Preklic"
msgctxt "view:stock.forecast:"
msgid "Complete Forecast"
-msgstr "Previsión completa"
+msgstr "Izpolnitev napovedi"
msgctxt "view:stock.forecast:"
msgid "Confirm"
-msgstr "Confirmar"
+msgstr "Potrditev"
msgctxt "view:stock.forecast:"
msgid "Forecast"
-msgstr "Previsión"
+msgstr "Napoved"
msgctxt "view:stock.forecast:"
msgid "Forecasts"
-msgstr "Previsiones"
+msgstr "Napovedi"
msgctxt "view:stock.forecast:"
msgid "Reset to Draft"
-msgstr "Restaurar a borrador"
+msgstr "Ponastavitev"
msgctxt "wizard_button:stock.forecast.complete,ask,choose:"
msgid "Choose Products"
-msgstr "Seleccione productos"
+msgstr "Izberi izdelke"
msgctxt "wizard_button:stock.forecast.complete,ask,complete:"
msgid "Complete"
-msgstr "Completa"
+msgstr "Zaključi"
msgctxt "wizard_button:stock.forecast.complete,ask,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:stock.forecast.complete,choose,ask:"
msgid "Choose Dates"
-msgstr "Seleccione fechas"
+msgstr "Izberi datume"
msgctxt "wizard_button:stock.forecast.complete,choose,complete:"
msgid "Complete"
-msgstr "Completa"
+msgstr "Zaključi"
msgctxt "wizard_button:stock.forecast.complete,choose,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
diff --git a/setup.py b/setup.py
index e4be1e7..22bc159 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = ['python-dateutil']
+requires = ['python-dateutil', 'python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +64,7 @@ setup(name='trytond_stock_forecast',
'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 00ff08d..fe5fd50 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_forecast import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index b851483..441c882 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
company
ir
diff --git a/trytond_stock_forecast.egg-info/PKG-INFO b/trytond_stock_forecast.egg-info/PKG-INFO
index 59aeb43..293719d 100644
--- a/trytond_stock_forecast.egg-info/PKG-INFO
+++ b/trytond_stock_forecast.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-forecast
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with stock forecasts
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_forecast
=====================
@@ -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_forecast.egg-info/SOURCES.txt b/trytond_stock_forecast.egg-info/SOURCES.txt
index f1b3aa3..cd76b78 100644
--- a/trytond_stock_forecast.egg-info/SOURCES.txt
+++ b/trytond_stock_forecast.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_stock_forecast.egg-info/PKG-INFO
trytond_stock_forecast.egg-info/SOURCES.txt
trytond_stock_forecast.egg-info/dependency_links.txt
diff --git a/trytond_stock_forecast.egg-info/requires.txt b/trytond_stock_forecast.egg-info/requires.txt
index e88d788..a950d22 100644
--- a/trytond_stock_forecast.egg-info/requires.txt
+++ b/trytond_stock_forecast.egg-info/requires.txt
@@ -1,5 +1,6 @@
python-dateutil
-trytond_company >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_company >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/forecast_tree.xml b/view/forecast_tree.xml
index 39b1277..c367b9d 100644
--- a/view/forecast_tree.xml
+++ b/view/forecast_tree.xml
@@ -7,5 +7,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="from_date"/>
<field name="to_date"/>
<field name="company"/>
- <field name="create_date" tree_invisible="1"/>
</tree>
--
tryton-modules-stock-forecast
More information about the tryton-debian-vcs
mailing list