Merge lp:~unifield-team/unifield-wm/us_404 into lp:unifield-wm

[jftempo]

Unmerged revisions

2543. By Stephane Codazzi <email address hidden> on 2015-06-25

US_404: Deduplicate cashbox line

=== modified file 'msf_instance/add_instance.py'
--- msf_instance/add_instance.py	2015-04-02 15:09:28 +0000
+++ msf_instance/add_instance.py	2015-07-06 10:22:07 +0000
@@ -417,6 +417,22 @@
         'instance_id': fields.many2one('msf.instance', 'Proprietary Instance'),
     }
 
+    #us-404: Remove all duplicated lines
+    def remove_duplicates(self, cr, uid, context=None):
+        domain = [('starting_id', '>', 0)]
+        ids = self.search(cr, uid, domain, order="id DESC", context=context)
+        objs = self.browse(cr, uid, ids, context=context)
+        unlink_ids = []
+        for obj in objs:
+            if obj.id not in unlink_ids:
+                duplicate_domain = [('starting_id', '=', obj.starting_id),
+                                    ('pieces', '=', obj.pieces),
+                                    ('id', '<', obj.id)]
+                duplicate_ids = self.search(cr, uid, duplicate_domain,
+                                            context=context)
+                unlink_ids = unlink_ids + duplicate_ids
+        return self.unlink(cr, uid, unlink_ids, context=context)
+
     def create(self, cr, uid, vals, context=None):
         if 'starting_id' in vals:
             register = self.pool.get('account.bank.statement').read(cr, uid, vals['starting_id'], ['instance_id'], context=context)
@@ -424,7 +440,17 @@
         elif 'ending_id' in vals:
             register = self.pool.get('account.bank.statement').read(cr, uid, vals['ending_id'], ['instance_id'], context=context)
             vals['instance_id'] = register.get('instance_id')[0]
-        return super(account_cashbox_line, self).create(cr, uid, vals, context=context)
+        # US-404: If line already exist with the same starting_id and piece
+        ids = None
+        if 'starting_id' in vals and 'pieces' in vals:
+            domain = [('starting_id', '=', vals['starting_id']),
+                      ('pieces', '=', vals['pieces'])]
+            ids = self.search(cr, uid, domain, context=context)
+        if ids:
+            return self.write(cr, uid, ids[0], vals, context=context)
+        else:
+            return super(account_cashbox_line, self).create(cr, uid, vals,
+                                                            context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if 'starting_id' in vals:
 
=== modified file 'msf_profile/data/patches.xml'
--- msf_profile/data/patches.xml	2015-05-22 14:25:13 +0000
+++ msf_profile/data/patches.xml	2015-07-06 10:22:07 +0000
@@ -6,5 +6,9 @@
             <field name="method">update_us_133</field>
         </record>
 
+        <record id="us_404_patch" model="patch.scripts">
+            <field name="method">update_us_404</field>
+        </record>
+
     </data>
 </openerp>
 
=== modified file 'msf_profile/msf_profile.py'
--- msf_profile/msf_profile.py	2015-05-27 10:34:50 +0000
+++ msf_profile/msf_profile.py	2015-07-06 10:22:07 +0000
@@ -51,6 +51,11 @@
             getattr(model_obj, method)(cr, uid, *a, **b)
             self.write(cr, uid, [ps['id']], {'run': True})
 
+    def update_us_404(self, cr, uid, *a, **b):
+        obj = self.pool.get('account.cashbox.line')
+        print "starting patch"
+        obj.remove_duplicates(cr, uid, context={})
+
     def update_us_133(self, cr, uid, *a, **b):
         p_obj = self.pool.get('res.partner')
         po_obj = self.pool.get('purchase.order')
 
=== modified file 'register_accounting/report/cash_inventory.rml'
--- register_accounting/report/cash_inventory.rml	2014-10-03 12:40:50 +0000
+++ register_accounting/report/cash_inventory.rml	2015-07-06 10:22:07 +0000
@@ -399,7 +399,7 @@
       <font color="white"> </font>
     </para>
 
-    <blockTable style="Table100">  
+    <blockTable style="Table100">
 		<tr>
 		    <td>
 				<para style="P7">Comments:</para>