Merge lp:~unifield-team/unifield-wm/uftp-120 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/uftp-120]

2123. By Quentin THEURET @Amaris on 2014-05-02

UFTP-120 [FIX] Delete multiple wizard: Put the good on views for IR and RfQ

=== modified file 'msf_doc_import/wizard/wizard_delete_lines.py'
--- msf_doc_import/wizard/wizard_delete_lines.py	2014-01-13 16:51:04 +0000
+++ msf_doc_import/wizard/wizard_delete_lines.py	2014-05-02 09:09:28 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF 
+#    Copyright (C) 2011 TeMPO Consulting, MSF
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -43,21 +43,23 @@
     * field with the quantity for the line
     * domain to apply on lines (e.g. : only draft stock moves on picking)
 """
-DOCUMENT_DATA = {'product.list': ('product.list.line', 'list_id', 'product_ids', '', ''),
-                 'return.claim': ('claim.product.line', 'claim_id_claim_product_line', 'product_line_ids_return_claim', 'qty_claim_product_line', ''),
-                 'composition.kit': ('composition.item', 'item_kit_id', 'composition_item_ids', 'item_qty', ''),
-                 'purchase.order': ('purchase.order.line', 'order_id', 'order_line', 'product_qty', ''),
-                 'tender': ('tender.line', 'tender_id', 'tender_line_ids', 'qty', ''),
-                 'sale.order': ('sale.order.line', 'order_id', 'order_line', 'product_uom_qty', ''),
-                 'supplier.catalogue': ('supplier.catalogue.line', 'catalogue_id', 'line_ids', 'min_qty', ''),
-                 'stock.picking': ('stock.move', 'picking_id', 'move_lines', 'product_qty', '(\'state\', \'=\', \'draft\')'),
-                 'stock.warehouse.automatic.supply': ('stock.warehouse.automatic.supply.line', 'supply_id', 'line_ids', 'product_qty', ''),
-                 'stock.warehouse.order.cycle': ('stock.warehouse.order.cycle.line', 'order_cycle_id', 'product_ids', 'safety_stock', ''),
-                 'threshold.value': ('threshold.value.line', 'threshold_value_id', 'line_ids', '', ''),
-                 'stock.inventory': ('stock.inventory.line', 'inventory_id', 'inventory_line_id', 'product_qty', ''),
-                 'initial.stock.inventory': ('initial.stock.inventory.line', 'inventory_id', 'inventory_line_id', 'product_qty', ''),
-                 'real.average.consumption': ('real.average.consumption.line', 'rac_id', 'line_ids', 'consumed_qty', ''),
-                 'monthly.review.consumption': ('monthly.review.consumption.line', 'mrc_id', 'line_ids', 'fmc', ''),}
+DOCUMENT_DATA = {
+    'product.list': ('product.list.line', 'list_id', 'product_ids', '', ''),
+    'return.claim': ('claim.product.line', 'claim_id_claim_product_line', 'product_line_ids_return_claim', 'qty_claim_product_line', ''),
+    'composition.kit': ('composition.item', 'item_kit_id', 'composition_item_ids', 'item_qty', ''),
+    'purchase.order': ('purchase.order.line', 'order_id', 'order_line', 'product_qty', ''),
+    'tender': ('tender.line', 'tender_id', 'tender_line_ids', 'qty', ''),
+    'sale.order': ('sale.order.line', 'order_id', 'order_line', 'product_uom_qty', ''),
+    'supplier.catalogue': ('supplier.catalogue.line', 'catalogue_id', 'line_ids', 'min_qty', ''),
+    'stock.picking': ('stock.move', 'picking_id', 'move_lines', 'product_qty', '(\'state\', \'=\', \'draft\')'),
+    'stock.warehouse.automatic.supply': ('stock.warehouse.automatic.supply.line', 'supply_id', 'line_ids', 'product_qty', ''),
+    'stock.warehouse.order.cycle': ('stock.warehouse.order.cycle.line', 'order_cycle_id', 'product_ids', 'safety_stock', ''),
+    'threshold.value': ('threshold.value.line', 'threshold_value_id', 'line_ids', '', ''),
+    'stock.inventory': ('stock.inventory.line', 'inventory_id', 'inventory_line_id', 'product_qty', ''),
+    'initial.stock.inventory': ('initial.stock.inventory.line', 'inventory_id', 'inventory_line_id', 'product_qty', ''),
+    'real.average.consumption': ('real.average.consumption.line', 'rac_id', 'line_ids', 'consumed_qty', ''),
+    'monthly.review.consumption': ('monthly.review.consumption.line', 'mrc_id', 'line_ids', 'fmc', ''),
+}
 
 
 def brl(self, cr, uid, ids, context=None):
@@ -74,9 +76,11 @@
         if not obj[DOCUMENT_DATA.get(self._name)[2]]:
             raise osv.except_osv(_('Error'), _('No line to remove'))
 
-    context.update({'active_id': ids[0],
-                    'from_delete_wizard': True,
-                    'active_model': self._name,})
+    context.update({
+        'active_id': ids[0],
+        'from_delete_wizard': True,
+        'active_model': self._name,
+    })
 
     # Return the wizard to display lines to remove
     return {'type': 'ir.actions.act_window',
@@ -87,7 +91,7 @@
             'context': context}
 
 """
-All the following documents will call the same button_remove_lines method 
+All the following documents will call the same button_remove_lines method
 to remove some or all lines on documents.
 
 Documents which inherit from document.remove.line:
@@ -107,6 +111,7 @@
     * Monthly consumption report
 """
 
+
 class product_list(osv.osv):
     _name = 'product.list'
     _inherit = 'product.list'
@@ -130,7 +135,11 @@
     def button_remove_lines(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             if order.rfq_ok and order.tender_id:
-                raise osv.except_osv(_('Warning'), _('You cannot remove lines on a RfQ created by a tender. Leave the lines with Unit price = 0.00 if you dont\'t have answer for them.'))
+                raise osv.except_osv(
+                    _('Warning'),
+                    _('You cannot remove lines on a RfQ created by a tender. '
+                      'Leave the lines with Unit price = 0.00 if you dont\'t have answer for them.'),
+                )
 
         return brl(self, cr, uid, ids, context=context)
 
@@ -281,6 +290,7 @@
 
 """
 
+
 def delete_fields_view_get(self, cr, uid, view_id, view_type, context=None):
     '''
     Check if a view exist for the object (self) and the view type (view_type)
@@ -302,11 +312,12 @@
         view = data_obj.get_object_reference(cr, uid, 'msf_doc_import', view_name)
         if view:
             res = view[1]
-    except ValueError as e:
+    except ValueError:
         res = None
 
     return res
 
+
 def noteditable_fields_view_get(res, view_type, context=None):
     '''
     Make the list of lines not editable
@@ -319,6 +330,10 @@
         fields = root.xpath('/tree')
         for field in fields:
             root.set('noteditable', 'True')
+            if context.get('procurement_request'):
+                root.set('string', 'Internal request lines')
+            if context.get('rfq_ok'):
+                root.set('string', 'RfQ lines')
         res['arch'] = etree.tostring(root)
 
     return res
@@ -346,6 +361,12 @@
     _inherit = 'purchase.order.line'
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+
+        if context.get('initial_doc_id', False) and context.get('initial_doc_type', False) == 'purchase.order':
+            rfq_ok = self.pool.get('purchase.order').browse(cr, uid, context.get('initial_doc_id'), context=context).rfq_ok
+            context['rfq_ok'] = rfq_ok
         view_id = delete_fields_view_get(self, cr, uid, view_id, view_type, context=context)
         res = super(purchase_order_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
         return noteditable_fields_view_get(res, view_type, context)
@@ -373,6 +394,13 @@
     _inherit = 'sale.order.line'
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+
+        if context.get('initial_doc_id', False) and context.get('initial_doc_type', False) == 'sale.order':
+            proc_request = self.pool.get('sale.order').browse(cr, uid, context.get('initial_doc_id'), context=context).procurement_request
+            context['procurement_request'] = proc_request
+
         view_id = delete_fields_view_get(self, cr, uid, view_id, view_type, context=context)
         res = super(sale_order_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
         return noteditable_fields_view_get(res, view_type, context)
@@ -518,19 +546,13 @@
             res['linked_field_name'] = DOCUMENT_DATA.get(context.get('active_model'))[1]
             res['qty_field'] = DOCUMENT_DATA.get(context.get('active_model'))[3]
 
-        if 'active_id' in context and 'active_model' in context and context.get('active_model') in DOCUMENT_DATA:
-            line_field = DOCUMENT_DATA.get(context.get('active_model'))[2]
-            lines = self.pool.get(res['initial_doc_type']).read(cr, uid, res['initial_doc_id'], [line_field], context=context)
-            res['line_ids'] = lines[line_field]
+#        if 'active_id' in context and 'active_model' in context and context.get('active_model') in DOCUMENT_DATA:
+#            line_field = DOCUMENT_DATA.get(context.get('active_model'))[2]
+#            lines = self.pool.get(res['initial_doc_type']).read(cr, uid, res['initial_doc_id'], [line_field], context=context)
+#            res['line_ids'] = lines[line_field]
 
         return res
 
-    def remove_empty_lines(self, cr, uid, ids, context=None):
-        '''
-        Remove only empty lines
-        '''
-        return self.remove_all_lines(cr, uid, ids, context=context, remove_only_empty=True)
-
     def remove_selected_lines(self, cr, uid, ids, context=None):
         '''
         Remove only the selected lines
@@ -547,37 +569,52 @@
             for line in wiz.line_ids:
                 for l in line[2]:
                     line_ids.append(l)
-            
+
             context['noraise'] = True
             line_obj.unlink(cr, uid, line_ids, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def remove_all_lines(self, cr, uid, ids, context=None, remove_only_empty=False):
-        '''
-        Remove all lines of the initial document
+    def select_empty_lines(self, cr, uid, ids, context=None):
+        '''
+        Add empty lines
+        '''
+        return self.select_all_lines(cr, uid, ids, context=context, select_only_empty=True)
+
+    def select_all_lines(self, cr, uid, ids, context=None, select_only_empty=False):
+        '''
+        Select all lines of the initial document
         '''
         context = context is None and {} or context
         if isinstance(ids, (int, long)):
             ids = [ids]
 
         for wiz in self.browse(cr, uid, ids, context=context):
-            if remove_only_empty and not wiz.qty_field:
-                raise osv.except_osv(_('Error'), _('The remove empty lines is not available for this document'))
+            if select_only_empty and not wiz.qty_field:
+                raise osv.except_osv(_('Error'), _('The select empty lines is not available for this document'))
 
             line_obj = self.pool.get(wiz.to_remove_type)
-            if remove_only_empty:
+            if select_only_empty:
                 line_ids = line_obj.search(cr, uid, [(wiz.linked_field_name, '=', wiz.initial_doc_id), (wiz.qty_field, '=', 0.00)], context=context)
             else:
                 line_ids = line_obj.search(cr, uid, [(wiz.linked_field_name, '=', wiz.initial_doc_id)], context=context)
-            line_obj.unlink(cr, uid, line_ids, context=context)
-
-        return {'type': 'ir.actions.act_window_close'}
+
+            self.write(cr, uid, [wiz.id], {'line_ids': line_ids}, context=context)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_id': ids and wiz.id or False,
+            'context': context,
+            'target': 'new',
+        }
 
     def fields_get(self, cr, uid, fields=None, context=None):
         '''
         On this fields_get method, we build the line_ids field.
-        The line_ids field is defined as a text field but, for users, this 
+        The line_ids field is defined as a text field but, for users, this
         field should be displayed as a many2many that allows us to select
         lines of document to remove.
         The line_ids field is changed to a many2many field according to the
@@ -594,13 +631,13 @@
                 domain = "[('%s', '=', initial_doc_id)]" % ddata[1]
             else:
                 domain = "[%s, ('%s', '=', initial_doc_id)]" % (ddata[4], ddata[1])
-            res.update(line_ids={'related_columns': ['wiz_id', 'line_id'], 
-                                 'relation': line_obj, 
-                                 'string': 'Lines to remove', 
-                                 'context': context, 
-                                 'third_table': '%sto_remove' % line_obj.replace('.', '_'), 
-                                 'selectable': True, 
-                                 'type': 'many2many', 
+            res.update(line_ids={'related_columns': ['wiz_id', 'line_id'],
+                                 'relation': line_obj,
+                                 'string': 'Lines to remove',
+                                 'context': context,
+                                 'third_table': '%sto_remove' % line_obj.replace('.', '_'),
+                                 'selectable': True,
+                                 'type': 'many2many',
                                  'domain': "%s" % domain})
 
         return res

=== modified file 'msf_doc_import/wizard/wizard_delete_lines_view.xml'
--- msf_doc_import/wizard/wizard_delete_lines_view.xml	2014-01-02 13:14:45 +0000
+++ msf_doc_import/wizard/wizard_delete_lines_view.xml	2014-05-02 09:09:28 +0000
@@ -14,13 +14,13 @@
                     <field name="linked_field_name" invisible="True" />
                     <field name="qty_field" invisible="True" />
                     <separator colspan="4" string="Lines to remove" />
-                    <field name="line_ids" colspan="4" nolabel="1" context="{'from_delete_wizard': True}" mode="tree" />
+                    <button name="select_all_lines" type="object" icon="gtk-go-down" string="Select all lines" colspan="2" />
+                    <button name="select_empty_lines" type="object" icon="gtk-go-down" string="Select Qty=0 lines" attrs="{'invisible': [('qty_field', '=', False)]}" colspan="2" />
+                    <field name="line_ids" colspan="4" nolabel="1" context="{'from_delete_wizard': True, 'initial_doc_id': initial_doc_id, 'initial_doc_type': initial_doc_type}" mode="tree" />
                     <separator colspan="4" string="Actions" />
                     <group colspan="4" col="4" >
-                        <button special="cancel" icon="gtk-cancel" string="Close window" />
-                        <button name="remove_selected_lines" type="object" icon="gtk-execute" string="Remove selected lines" />
-                        <button name="remove_all_lines" type="object" icon="gtk-execute" string="Remove all lines" confirm="Are you sure that you want to remove all lines?" />
-                        <button name="remove_empty_lines" type="object" icon="gtk-execute" string="Remove Qty=0 lines" attrs="{'invisible': [('qty_field', '=', False)]}" />
+                        <button special="cancel" icon="gtk-cancel" string="Close window" colspan="2" />
+                        <button name="remove_selected_lines" type="object" icon="gtk-execute" string="Remove selected lines" colspan="2" />
                     </group>
                 </form>
             </field>