[tryton-debian-vcs] tryton-modules-stock-forecast branch upstream-4.2 updated. upstream/4.2.0-1-gb4faa70

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:25:36 UTC 2017


The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-forecast.git;a=commitdiff;h=upstream/4.2.0-1-gb4faa70

commit b4faa70d497074adddc5a9248a6f943a06d6fb4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:32:17 2017 +0200

    Adding upstream version 4.2.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 0c45f5f..b98dcc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Manage readonly state on Forecast Line
diff --git a/COPYRIGHT b/COPYRIGHT
index fcc5eeb..5af5413 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 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/PKG-INFO b/PKG-INFO
index 3a9db13..53498e5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_forecast
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with stock forecasts
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/forecast.py b/forecast.py
index b77ae73..360ce39 100644
--- a/forecast.py
+++ b/forecast.py
@@ -34,7 +34,6 @@ FORECAST_STATES = [
 class Forecast(Workflow, ModelSQL, ModelView):
     "Stock Forecast"
     __name__ = "stock.forecast"
-    _rec_name = 'warehouse'
     warehouse = fields.Many2One(
         'stock.location', 'Location', required=True,
         domain=[('type', '=', 'warehouse')], states={
@@ -189,6 +188,13 @@ class Forecast(Workflow, ModelSQL, ModelView):
         else:
             return []
 
+    def get_rec_name(self, name):
+        return self.warehouse.rec_name
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        return [('warehouse',) + tuple(clause[1:])]
+
     @classmethod
     def validate(cls, forecasts):
         super(Forecast, cls).validate(forecasts)
@@ -297,7 +303,6 @@ class Forecast(Workflow, ModelSQL, ModelView):
 class ForecastLine(ModelSQL, ModelView):
     'Stock Forecast Line'
     __name__ = 'stock.forecast.line'
-    _rec_name = 'product'
     _states = {
         'readonly': Eval('forecast_state') != 'draft',
         }
@@ -393,6 +398,13 @@ class ForecastLine(ModelSQL, ModelView):
         if self.forecast:
             return self.forecast.state
 
+    def get_rec_name(self, name):
+        return self.product.rec_name
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        return [('product',) + tuple(clause[1:])]
+
     @classmethod
     def get_quantity_executed(cls, lines, name):
         cursor = Transaction().connection.cursor()
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index c3113d2..a83e83a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     company
     ir
diff --git a/trytond_stock_forecast.egg-info/PKG-INFO b/trytond_stock_forecast.egg-info/PKG-INFO
index 692c2fc..00dfc75 100644
--- a/trytond_stock_forecast.egg-info/PKG-INFO
+++ b/trytond_stock_forecast.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-forecast
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with stock forecasts
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-forecast



More information about the tryton-debian-vcs mailing list