Merge lp:~rr.clearcorp/openobject-addons/7.0-base_intercompany_sale into lp:~clearcorp-drivers/openobject-addons/elico-7.0-ccorp

[Ronald Rubi]

[IMP] base_intercompany_sale: Improve to automatic unlock

=== modified file 'base_intercompany_sale/purchase.py'
--- base_intercompany_sale/purchase.py	2014-08-11 20:46:51 +0000
+++ base_intercompany_sale/purchase.py	2015-08-21 16:36:45 +0000
@@ -60,7 +60,19 @@
 
     def write(self, cr, uid, ids, data, context=None):
         self._check_icops(cr, uid, ids, context=context)
-        return super(purchase_order, self).write(cr, uid, ids, data, context)
+        res = super(purchase_order, self).write(cr, uid, ids, data, context)
+        icops_record_obj = self.pool.get('icops.record')
+        sale_order_obj = self.pool.get('sale.order')
+        #Improve to unlock when the user confirm the purchase
+        if 'state' in data and data['state'] =='approved':
+            purchases = self.browse(cr, uid, ids, context=context)
+            for purchase in purchases:
+                if purchase.icops_bind_ids:
+                    for icops_bind_id in purchase.icops_bind_ids:
+                        icops_record_id = icops_record_obj.search(cr, uid, [('binding_id','=',icops_bind_id.id)], context=context)[0]
+                        icops_record =icops_record_obj.browse(cr, uid, [icops_record_id], context=context)[0]
+                        sale_order_obj.action_unlock(cr, uid, [icops_record.record_id], context=context)
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
         self._check_icops(cr, uid, ids, context=context)

=== modified file 'base_intercompany_sale/purchase_view.xml'
--- base_intercompany_sale/purchase_view.xml	2014-01-17 22:42:32 +0000
+++ base_intercompany_sale/purchase_view.xml	2015-08-21 16:36:45 +0000
@@ -6,9 +6,6 @@
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form" />
             <field name="arch" type="xml">
-                <xpath expr="//header/button[last()]" position="after">
-                    <button name="action_unlock" string="Unlock" type="object" attrs="{'invisible':[('locked', '=', False)]}" class="oe_highlight" />
-                </xpath>
                 <xpath expr="//page[last()]" position="after">
                     <page string="ICOPS">
                         <field name="locked" invisible="1" />
@@ -23,4 +20,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'base_intercompany_sale/sale.py'
--- base_intercompany_sale/sale.py	2014-08-19 17:10:55 +0000
+++ base_intercompany_sale/sale.py	2015-08-21 16:36:45 +0000
@@ -59,7 +59,19 @@
 
     def write(self, cr, uid, ids, data, context=None):
         self._check_icops(cr, uid, ids, context=context)
-        return super(sale_order, self).write(cr, uid, ids, data, context)
+        res= super(sale_order, self).write(cr, uid, ids, data, context)
+        icops_record_obj = self.pool.get('icops.record')
+        purchase_order_obj = self.pool.get('purchase.order')
+        #Improve to unlock when the user confirm the sale
+        if 'state' in data and data['state'] =='progress':
+            sales = self.browse(cr, uid, ids, context=context)
+            for sale in sales:
+                if sale.icops_bind_ids:
+                    for icops_bind_id in sale.icops_bind_ids:
+                        icops_record_id = icops_record_obj.search(cr, uid, [('binding_id','=',icops_bind_id.id)], context=context)[0]
+                        icops_record =icops_record_obj.browse(cr, uid, [icops_record_id], context=context)[0]
+                        purchase_order_obj.action_unlock(cr, 1, [icops_record.record_id], context=context)
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
         self._check_icops(cr, uid, ids, context=context)

=== modified file 'base_intercompany_sale/sale_view.xml'
--- base_intercompany_sale/sale_view.xml	2014-01-17 22:42:32 +0000
+++ base_intercompany_sale/sale_view.xml	2015-08-21 16:36:45 +0000
@@ -6,9 +6,6 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
-                <xpath expr="//header/button[last()]" position="after">
-                    <button name="action_unlock" string="Unlock" type="object" attrs="{'invisible':[('locked', '=', False)]}" class="oe_highlight" />
-                </xpath>
                 <xpath expr="//page[last()]" position="after">
                     <page string="ICOPS">
                         <field name="locked" invisible="1" />
@@ -23,4 +20,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>