fix fulfillment so

4 files changed, 15 insertions, 6 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 8d9141dd..be971307 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -63,6 +63,12 @@ class PurchaseOrder(models.Model):
                 'name': self.name,
                 'partner_id': self.partner_id.id
             })
+        
+        if self.sale_order_id:
+            sale_order = self.sale_order_id
+        else:
+            sale_order = self.sale_order
+
         if not self.partner_id.property_stock_supplier.id:
             raise UserError(_("You must set a Vendor Location for this partner %s", self.partner_id.name))
         return {
@@ -74,7 +80,7 @@ class PurchaseOrder(models.Model):
             'location_dest_id': self._get_destination_location(),
             'location_id': self.partner_id.property_stock_supplier.id,
             'company_id': self.company_id.id,
-            'sale_order': self.sale_order,
+            'sale_order': sale_order,
         }
 
     @api.model
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 6e32ca79..620953b9 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -99,14 +99,14 @@ class SaleOrder(models.Model):
     
     def _compute_fullfillment(self):
         for rec in self:
-            for fullfillment in rec.fullfillment_line:
-                fullfillment.unlink()
-            
+            rec.fullfillment_line.unlink()
+
             for line in rec.order_line:
                 line._compute_reserved_from()
-            
+
             rec.compute_fullfillment = True
 
+
     def _compute_eta_date(self):
         max_leadtime = 0
 
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 43b3bfad..d98a2c82 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -84,7 +84,7 @@ class StockPicking(models.Model):
     ], string='Printed?', copy=False)
     date_unreserve = fields.Datetime(string="Date Unreserved", copy=False, tracking=True)
     date_availability = fields.Datetime(string="Date Availability", copy=False, tracking=True)
-    sale_order = fields.Char(string='Sale Order')
+    sale_order = fields.Char(string='Matches SO', copy=False)
 
     def do_unreserve(self):
         res = super(StockPicking, self).do_unreserve()
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 3ecccf29..2cc406ea 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -187,6 +187,9 @@
                     <page string="Matches PO" name="page_matches_po" invisible="1">
                         <field name="order_sales_match_line" readonly="1"/>
                     </page>
+                    <page string="Fullfillment" name="page_sale_order_fullfillment">
+                        <field name="fullfillment_line" readonly="1"/>
+                    </page>
                 </page>
             </field>
         </record>