From a328bb9febe69fc58eb7c5a24edb9df294c0878c Mon Sep 17 00:00:00 2001
From: gregoire <gregoire@page-karma.com>
Date: Sat, 21 May 2016 12:56:33 +0200
Subject: [PATCH] fix display unit, add seller id, fix xml

---
 beesdoo_product/models/beesdoo_product.py | 14 ++++++++--
 beesdoo_product/views/beesdoo_product.xml | 33 ++++++++++++++---------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/beesdoo_product/models/beesdoo_product.py b/beesdoo_product/models/beesdoo_product.py
index f83ddc2..202552d 100644
--- a/beesdoo_product/models/beesdoo_product.py
+++ b/beesdoo_product/models/beesdoo_product.py
@@ -19,11 +19,14 @@ class BeesdooProduct(models.Model):
 
     total_with_vat_by_unit = fields.Float(compute='get_total_with_vat_by_unit')
 
+    main_seller_id = fields.Many2one('res.partner', compute='_compute_main_seller_id', store=True)
+
+
     @api.one
     @api.depends('weight', 'display_unit')
     def get_display_weight(self):
         if self.display_unit:
-            self.display_weight = self.weight / self.display_unit.factor
+            self.display_weight = self.weight * self.display_unit.factor
 
     @api.one
     def get_total_with_vat(self):
@@ -36,7 +39,14 @@ class BeesdooProduct(models.Model):
     @api.one
     def get_total_with_vat_by_unit(self):
         if self.display_weight > 0:
-            self.total_with_vat_by_unit = self.total_with_vat/self.display_weight
+            self.total_with_vat_by_unit = self.total_with_vat / self.weight
+
+    @api.one
+    @api.depends('seller_ids', 'seller_ids.date_start')
+    def _compute_main_seller_id(self):
+        # Calcule le vendeur associé qui a la date de début la plus récente et plus petite qu’aujourd’hui
+        sellers_ids = self.seller_ids.sorted(key=lambda seller: seller.date_start, reverse=True)
+        self.main_seller_id = sellers_ids and sellers_ids[0].name or False
 
 
 class BeesdooProductLabel(models.Model):
diff --git a/beesdoo_product/views/beesdoo_product.xml b/beesdoo_product/views/beesdoo_product.xml
index 980ffa0..604aec3 100644
--- a/beesdoo_product/views/beesdoo_product.xml
+++ b/beesdoo_product/views/beesdoo_product.xml
@@ -7,21 +7,28 @@
         <field name="arch" type="xml">
             <xpath expr="//group[@name='inventory']/.." position="after">
                 <page string="Price tag">
-                    <group name="label">
-                        <field name="total_with_vat"/>
-                        <field name="total_with_vat_by_unit"/>
-                        <field name="default_reference_unit"/>
-                        <field name="display_weight"/>
-                    </group>
-                    <group>
-                        <field name="eco_label"/>
-                        <field name="local_label"/>
-                        <field name="fair_label"/>
-                        <field name="origin_label"/>
+                    <group name="label" col="4">
+                        <group col="2">
+                            <separator string="Amount" colspan="4"/>
+                            <field name="display_weight"/>
+                            <field name="display_unit"/>
+                            <field name="default_reference_unit"/>
+                            <separator string="Price" colspan="4"/>
+                            <field name="total_with_vat"/>
+                            <field name="total_with_vat_by_unit"/>
+                        </group>
+                        <group col="2">
+                            <separator string="Bobo-level" colspan="4"/>
+                            <field name="eco_label"/>
+                            <field name="local_label"/>
+                            <field name="fair_label"/>
+                            <field name="origin_label"/>
+                            <separator string="Origin" colspan="4"/>
+                            <field name="main_seller_id"/>
+                        </group>
                     </group>
                 </page>
             </xpath>
         </field>
     </record>
-
-</odoo>
\ No newline at end of file
+</odoo>