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

[jftempo]

Unmerged revisions

2709. By Quentin THEURET @Amaris on 2016-01-19

US-409 [FIX] Put target filename on Periodical Forecast report

2708. By Quentin THEURET @Amaris on 2016-01-14

US-485 [IMP] Put 'Temporary' as default value for creator field on new product lists

2707. By Quentin THEURET @Amaris on 2016-01-14

US-485 [IMP] Add a new 'Temporary' option for product list creator field

2706. By Quentin THEURET @Amaris on 2016-01-13

Merge lp:~unifield-team/unifield-wm/us-485

=== modified file 'consumption_calculation/weekly_forecast_report.py'
--- consumption_calculation/weekly_forecast_report.py	2015-11-03 12:55:51 +0000
+++ consumption_calculation/weekly_forecast_report.py	2016-01-19 10:40:59 +0000
@@ -246,7 +246,10 @@
         :return Return a dictionary with the action to open the report
         :rtype dict
         """
-        datas = {'ids': ids}
+        datas = {
+            'ids': ids,
+            'target_filename': 'Periodical Forecast Report',
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'weekly.forecast.report_xls',

=== modified file 'consumption_calculation/weekly_forecast_report_view.xml'
--- consumption_calculation/weekly_forecast_report_view.xml	2014-04-11 09:24:16 +0000
+++ consumption_calculation/weekly_forecast_report_view.xml	2016-01-19 10:40:59 +0000
@@ -124,7 +124,7 @@
         </record>
 
         <record id="action_weekly_forecast_report" model="ir.actions.act_window">
-            <field name="name">Weekly forecast reports</field>
+            <field name="name">Periodical forecast reports</field>
             <field name="res_model">weekly.forecast.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

=== modified file 'msf_profile/data/patches.xml'
--- msf_profile/data/patches.xml	2015-11-30 13:53:32 +0000
+++ msf_profile/data/patches.xml	2016-01-19 10:40:59 +0000
@@ -28,5 +28,10 @@
             <field name="method">bar_action_patch</field>
         </record>
 
+        <record id="us_485_patch" model="patch.scripts">
+            <field name="model">product.list</field>
+            <field name="method">set_creator</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'product_list/product_list.py'
--- product_list/product_list.py	2015-09-08 09:32:08 +0000
+++ product_list/product_list.py	2016-01-19 10:40:59 +0000
@@ -89,6 +89,16 @@
             string='Type',
             required=True,
         ),
+        'creator': fields.selection(
+            selection=[
+                ('hq', 'HQ'),
+                ('coordo', 'Coordination'),
+                ('project', 'Project'),
+                ('temp', 'Temporary'),
+            ],
+            string='Creator',
+            required=True,
+        ),
         'description': fields.char(
             size=256,
             string='Description',
@@ -145,6 +155,7 @@
 
     _defaults = {
         'creation_date': lambda *a: time.strftime('%Y-%m-%d'),
+        'creator': lambda *a: 'temp',
     }
 
     _sql_constraints = [
@@ -221,6 +232,18 @@
             'context': context,
         }
 
+    def set_creator(self, cr, uid, *a, **b):
+        """
+        Called by the patch script - Set the creator of the existing product lists to Project
+        @param cr: Cursor to the database
+        @param uid: ID of the res.users that calls this method
+        @param a: No-named arguments
+        @param b: Named arguments
+        @return: True
+        """
+        list_ids = self.search(cr, uid, [('creator', '=', False)])
+        self.write(cr, uid, list_ids, {'creator': 'temp'})
+
 product_list()
 
 

=== modified file 'product_list/product_list_view.xml'
--- product_list/product_list_view.xml	2015-09-08 09:32:08 +0000
+++ product_list/product_list_view.xml	2016-01-19 10:40:59 +0000
@@ -64,8 +64,9 @@
                     <field name="ref" />
                     <field name="name" />
                     <field name="creation_date" />
-                    <field name="description" />
+                    <field name="creator" />
                     <field name="last_update_date" />
+                    <field name="description" colspan="4" />
                     <group colspan="2" col="5">
                         <label string="" />
                         <field name="standard_list_ok" />

=== modified file 'stock_override/wizard/stock_card_view.xml'
--- stock_override/wizard/stock_card_view.xml	2014-03-14 10:51:54 +0000
+++ stock_override/wizard/stock_card_view.xml	2016-01-19 10:40:59 +0000
@@ -50,6 +50,7 @@
                     </group>
                     <field name="perishable" invisible="1" />
                     <field name="prodlot_id" attrs="{'invisible': [('perishable', '=', False)]}" readonly="1" />
+                    <field name="expiry_date" readonly="1" attrs="{'invisible': [('perishable', '=', False)]}" />
                     <separator colspan="4" string="Period" />
                     <field name="from_date" readonly="1" />
                     <field name="to_date" readonly="1" />

=== modified file 'stock_override/wizard/stock_card_wizard.py'
--- stock_override/wizard/stock_card_wizard.py	2015-02-05 16:24:37 +0000
+++ stock_override/wizard/stock_card_wizard.py	2016-01-19 10:40:59 +0000
@@ -38,6 +38,13 @@
         'perishable': fields.boolean(string='Perishable'),
         'prodlot_id': fields.many2one('stock.production.lot',
                                       string='Batch number'),
+        'expiry_date': fields.related(
+            'prodlot_id',
+            'life_date',
+            type='date',
+            string='Expiry date',
+            readonly=True,
+        ),
         'from_date': fields.date(string='From date'),
         'to_date': fields.date(string='To date'),
         'available_stock': fields.float(digits=(16,2), string='Available stock'),