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

[Ronald Rubi]

[FIX] Fix discount. price_unit and taxes in base_intercompany_sale

[lp:~rr.clearcorp/openobject-addons/7.0-base_intercompany_sale]

37. By Ronald Rubi on 2014-08-01

[MRG] Fix discount. price_unit and taxes in base_intercompany_sale

=== modified file 'base_intercompany_sale/purchase.py'
--- base_intercompany_sale/purchase.py	2014-02-18 12:28:09 +0000
+++ base_intercompany_sale/purchase.py	2014-08-01 16:39:58 +0000
@@ -277,6 +277,8 @@
 
     @mapping
     def price(self, record):
+        if record.price_unit:
+            return {'price_unit': record.price_unit}
         if not record.product_id:
             return {'price_unit': 0}
         sess = self.session
@@ -294,3 +296,26 @@
             record.product_id.id, record.product_qty)
         price = price_unit[int(pricelist_id)]
         return {'price_unit': price}
+    
+    @mapping
+    def discount(self, record):
+        if record.discount:
+            return {'discount': record.discount}
+        return {'discount': 0}
+    
+    @mapping
+    def taxes(self, record):
+        sess = self.session
+        backend = self._backend_to
+        ic_uid = backend.icops_uid.id
+        taxes_id = []
+        if record.order_id:
+            if record.product_id:
+                for tax in record.product_id.taxes_id:
+                    if tax.company_id.id == backend.company_id.id:
+                        taxes_id.append(tax)
+                line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)
+                line_taxs = sess.pool.get('account.tax').browse(sess.cr, ic_uid, line_tax_ids)
+                tax_id = [(6, 0, [x.id for x in line_taxs])]
+                return {'tax_id': tax_id}
+        return {'tax_id': []}

=== modified file 'base_intercompany_sale/sale.py'
--- base_intercompany_sale/sale.py	2014-02-18 12:28:09 +0000
+++ base_intercompany_sale/sale.py	2014-08-01 16:39:58 +0000
@@ -332,6 +332,8 @@
         return {'name': record.name}
 
     def _price(self, record, is_po=False):
+        if record.price_unit:
+            return {'price_unit': record.price_unit}
         if not record.product_id:
             return {'price_unit': 0}
         sess = self.session
@@ -355,6 +357,29 @@
             record.product_id.id, record.product_uom_qty)
         price = price_unit[int(pricelist_id)]
         return {'price_unit': price}
+        
+    @mapping
+    def discount(self, record):
+        if record.discount:
+            return {'discount': record.discount}
+        return {'discount': 0}
+    
+    @mapping
+    def taxes(self, record):
+        sess = self.session
+        backend = self._backend_to
+        ic_uid = backend.icops_uid.id
+        taxes_id = []
+        if record.order_id:
+            if record.product_id:
+                for tax in record.product_id.taxes_id:
+                    if tax.company_id.id == backend.company_id.id:
+                        taxes_id.append(tax)
+                line_tax_ids = sess.pool.get('account.fiscal.position').map_tax(sess.cr, ic_uid, record.order_id.fiscal_position, taxes_id)
+                line_taxs = sess.pool.get('account.tax').browse(sess.cr, ic_uid, line_tax_ids)
+                tax_id = [(6, 0, [x.id for x in line_taxs])]
+                return {'taxes_id': tax_id}
+        return {'taxes_id': []}
 
     @mapping
     def map_all(self, record):