unifield-wm

Merge lp:~unifield-team/unifield-wm/us-409 into lp:unifield-wm

  1. us-409
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2717
Proposed branch: lp:~unifield-team/unifield-wm/us-409
Merge into: lp:unifield-wm
Diff against target: 58 lines (+13/-2)
4 files modified
consumption_calculation/weekly_forecast_report.py (+4/-1)
consumption_calculation/weekly_forecast_report_view.xml (+1/-1)
stock_override/wizard/stock_card_view.xml (+1/-0)
stock_override/wizard/stock_card_wizard.py (+7/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-409
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283513@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'consumption_calculation/weekly_forecast_report.py'
2--- consumption_calculation/weekly_forecast_report.py 2015-11-03 12:55:51 +0000
3+++ consumption_calculation/weekly_forecast_report.py 2016-01-21 17:09:47 +0000
4@@ -246,7 +246,10 @@
5 :return Return a dictionary with the action to open the report
6 :rtype dict
7 """
8- datas = {'ids': ids}
9+ datas = {
10+ 'ids': ids,
11+ 'target_filename': 'Periodical Forecast Report.xls',
12+ }
13 return {
14 'type': 'ir.actions.report.xml',
15 'report_name': 'weekly.forecast.report_xls',
16
17=== modified file 'consumption_calculation/weekly_forecast_report_view.xml'
18--- consumption_calculation/weekly_forecast_report_view.xml 2014-04-11 09:24:16 +0000
19+++ consumption_calculation/weekly_forecast_report_view.xml 2016-01-21 17:09:47 +0000
20@@ -124,7 +124,7 @@
21 </record>
22
23 <record id="action_weekly_forecast_report" model="ir.actions.act_window">
24- <field name="name">Weekly forecast reports</field>
25+ <field name="name">Periodical forecast reports</field>
26 <field name="res_model">weekly.forecast.report</field>
27 <field name="view_type">form</field>
28 <field name="view_mode">tree,form</field>
29
30=== modified file 'stock_override/wizard/stock_card_view.xml'
31--- stock_override/wizard/stock_card_view.xml 2014-03-14 10:51:54 +0000
32+++ stock_override/wizard/stock_card_view.xml 2016-01-21 17:09:47 +0000
33@@ -50,6 +50,7 @@
34 </group>
35 <field name="perishable" invisible="1" />
36 <field name="prodlot_id" attrs="{'invisible': [('perishable', '=', False)]}" readonly="1" />
37+ <field name="expiry_date" readonly="1" attrs="{'invisible': [('perishable', '=', False)]}" />
38 <separator colspan="4" string="Period" />
39 <field name="from_date" readonly="1" />
40 <field name="to_date" readonly="1" />
41
42=== modified file 'stock_override/wizard/stock_card_wizard.py'
43--- stock_override/wizard/stock_card_wizard.py 2015-02-05 16:24:37 +0000
44+++ stock_override/wizard/stock_card_wizard.py 2016-01-21 17:09:47 +0000
45@@ -38,6 +38,13 @@
46 'perishable': fields.boolean(string='Perishable'),
47 'prodlot_id': fields.many2one('stock.production.lot',
48 string='Batch number'),
49+ 'expiry_date': fields.related(
50+ 'prodlot_id',
51+ 'life_date',
52+ type='date',
53+ string='Expiry date',
54+ readonly=True,
55+ ),
56 'from_date': fields.date(string='From date'),
57 'to_date': fields.date(string='To date'),
58 'available_stock': fields.float(digits=(16,2), string='Available stock'),

Subscribers

People subscribed via source and target branches