[IMP] sale_margin_delivered: Add new computed field for better contro…

…l on delivery purchase price

[UPD] README.rst

[UPD] Update sale_margin_delivered.pot

Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

sale_margin_delivered/i18n/es.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* sale_margin_delivered
+# 	* sale_margin_delivered
 #
 msgid ""
 msgstr ""
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2018-10-09 10:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -20,6 +21,11 @@ msgstr ""
 msgid "% Margin"
 msgstr "% Margen"
 
+#. module: sale_margin_delivered
+#: model:ir.ui.view,arch_db:sale_margin_delivered.view_order_form
+msgid "Cost Price dlvd."
+msgstr ""
+
 #. module: sale_margin_delivered
 #: model:ir.ui.view,arch_db:sale_margin_delivered.view_order_form
 msgid "Margin"
@@ -41,6 +47,12 @@ msgstr "Porcentage de Margen de Entregados"
 msgid "Margin dlvd."
 msgstr "Margin entrg."
 
+#. module: sale_margin_delivered
+#: model:ir.model.fields,field_description:sale_margin_delivered.field_sale_order_line_purchase_price_delivery
+#, fuzzy
+msgid "Purchase Price Delivered"
+msgstr "Margin Entregados"
+
 #. module: sale_margin_delivered
 #: model:ir.model,name:sale_margin_delivered.model_sale_order_line
 msgid "Sales Order Line"
@@ -51,8 +63,5 @@ msgstr "Línea de pedido de ventas"
 msgid "Sales Orders Statistics"
 msgstr "Estadísticas pedidos de ventas"
 
-#. module: sale_margin_delivered
-#: model:ir.model,name:sale_margin_delivered.model_stock_picking
-msgid "Transfer"
-msgstr "Transferir"
-
+#~ msgid "Transfer"
+#~ msgstr "Transferir"

sale_margin_delivered/i18n/sale_margin_delivered.pot

@@ -6,8 +6,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-09 10:43+0000\n"
-"PO-Revision-Date: 2018-10-09 10:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +18,11 @@ msgstr ""
 msgid "% Margin"
 msgstr ""
 
+#. module: sale_margin_delivered
+#: model:ir.ui.view,arch_db:sale_margin_delivered.view_order_form
+msgid "Cost Price dlvd."
+msgstr ""
+
 #. module: sale_margin_delivered
 #: model:ir.ui.view,arch_db:sale_margin_delivered.view_order_form
 msgid "Margin"
@@ -41,6 +44,11 @@ msgstr ""
 msgid "Margin dlvd."
 msgstr ""
 
+#. module: sale_margin_delivered
+#: model:ir.model.fields,field_description:sale_margin_delivered.field_sale_order_line_purchase_price_delivery
+msgid "Purchase Price Delivered"
+msgstr ""
+
 #. module: sale_margin_delivered
 #: model:ir.model,name:sale_margin_delivered.model_sale_order_line
 msgid "Sales Order Line"
@@ -51,8 +59,3 @@ msgstr ""
 msgid "Sales Orders Statistics"
 msgstr ""
 
-#. module: sale_margin_delivered
-#: model:ir.model,name:sale_margin_delivered.model_stock_picking
-msgid "Transfer"
-msgstr ""
-

sale_margin_delivered/models/__init__.py

@@ -1,2 +1,2 @@
 from . import sale_margin
-from . import stock_picking
+

sale_margin_delivered/models/sale_margin.py

@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
+from odoo import tools
 
 
 class SaleOrderLine(models.Model):
@@ -19,20 +20,38 @@ class SaleOrderLine(models.Model):
         readonly=True,
         oldname='margin_delivered_percent',
     )
+    purchase_price_delivery = fields.Float(
+        string='Purchase Price Delivered',
+        compute='_compute_margin_delivered',
+        store=True,
+    )
 
     @api.depends('margin', 'qty_delivered', 'product_uom_qty')
     def _compute_margin_delivered(self):
+        rounding = self.env['decimal.precision'].precision_get('Product Price')
         for line in self.filtered('price_reduce'):
             vals = {
                 'margin_delivered': 0.0,
                 'margin_delivered_percent': 0.0,
+                'purchase_price_delivery': line.purchase_price,
             }
+            delivered_qty = 0.0
+            cost_price = 0.0
+            moves = line.move_ids.filtered(lambda x: (
+                x.state == 'done' and x.picking_code == 'outgoing'
+            ))
+            for move in moves:
+                delivered_qty += move.product_qty
+                cost_price += move.product_qty * abs(move.price_unit)
+            average_price = cost_price / (delivered_qty or 1.0)
+            vals['purchase_price_delivery'] = tools.float_round(
+                average_price, precision_rounding=rounding)
             if line.qty_delivered == line.product_uom_qty:
                 vals['margin_delivered'] = line.margin
             elif line.product_uom_qty:
                 vals['margin_delivered'] = (
                     line.qty_delivered * line.margin / line.product_uom_qty)
             vals['margin_delivered_percent'] = (
-                (line.price_reduce - line.purchase_price) /
+                (line.price_reduce - vals['purchase_price_delivery']) /
                 line.price_reduce * 100.0)
             line.update(vals)