Cédric Krier pushed to branch branch/default at Tryton / Tryton
Commits:
3b15c137 by Cédric Krier at 2023-02-05T13:21:09+01:00
Include destination name and dates to forecast record name
Closes #12064
- - - - -
3 changed files:
- modules/stock_forecast/forecast.py
- modules/stock_forecast/tests/test_module.py
- modules/stock_forecast/view/forecast_tree.xml
Changes:
=====================================
modules/stock_forecast/forecast.py
=====================================
@@ -161,7 +161,15 @@
return []
def get_rec_name(self, name):
- return self.warehouse.rec_name
+ pool = Pool()
+ Lang = pool.get('ir.lang')
+
+ lang = Lang.get()
+ from_date = lang.strftime(self.from_date)
+ to_date = lang.strftime(self.to_date)
+ return (
+ f'{self.warehouse.rec_name} → {self.destination.rec_name} @ '
+ f'[{from_date} - {to_date}]')
@classmethod
def search_rec_name(cls, name, clause):
@@ -165,7 +173,15 @@
@classmethod
def search_rec_name(cls, name, clause):
- return [('warehouse.rec_name',) + tuple(clause[1:])]
+ operator = clause[1]
+ if operator.startswith('!') or operator.startswith('not '):
+ bool_op = 'AND'
+ else:
+ bool_op = 'OR'
+ return [bool_op,
+ ('warehouse.rec_name', *clause[1:]),
+ ('destination.rec_name', *clause[1:]),
+ ]
@classmethod
def validate_fields(cls, forecasts, field_names):
=====================================
modules/stock_forecast/tests/test_module.py
=====================================
@@ -18,6 +18,31 @@
module = 'stock_forecast'
@with_transaction()
+ def test_forecast_rec_name(self):
+ pool = Pool()
+ Forecast = pool.get('stock.forecast')
+ Location = pool.get('stock.location')
+
+ customer, = Location.search([('code', '=', 'CUS')])
+ warehouse, = Location.search([('code', '=', 'WH')])
+ storage, = Location.search([('code', '=', 'STO')])
+ company = create_company()
+ with set_company(company):
+ forecast = Forecast(
+ warehouse=warehouse,
+ destination=customer,
+ from_date=datetime.date(2023, 1, 1),
+ to_date=datetime.date(2023, 3, 31),
+ )
+ forecast.save()
+ forecasts = Forecast.search([('rec_name', '=', "Warehouse")])
+
+ self.assertEqual(
+ forecast.rec_name,
+ "Warehouse → Customer @ [01/01/2023 - 03/31/2023]")
+ self.assertEqual(forecasts, [forecast])
+
+ @with_transaction()
def test_distribute(self):
'Test distribute'
pool = Pool()
=====================================
modules/stock_forecast/view/forecast_tree.xml
=====================================
@@ -4,6 +4,7 @@
<tree>
<field name="company" expand="1" optional="1"/>
<field name="warehouse" expand="2" optional="1"/>
+ <field name="destination" expand="2" optional="0"/>
<field name="from_date"/>
<field name="to_date"/>
<field name="state"/>
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/3b15c1378292b82d37725117017eac723677fe66
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/3b15c1378292b82d37725117017eac723677fe66
You're receiving this email because of your account on foss.heptapod.net.