Merge branch 'nathan-dev' of bitbucket.org:altafixco/indoteknik-addons into nathan-dev

2 files changed, 29 insertions, 2 deletions

diff --git a/indoteknik_custom/models/delivery_order.py b/indoteknik_custom/models/delivery_order.py
index 3f8da384..be5fd2e0 100644
--- a/indoteknik_custom/models/delivery_order.py
+++ b/indoteknik_custom/models/delivery_order.py
@@ -74,6 +74,7 @@ class DeliveryOrderLine(models.TransientModel):
     carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method')
     tracking_no = fields.Char(string='Tracking No')
     delivery_order_id = fields.Many2one('delivery.order', string='Delivery Order')
+    partner_id = fields.Many2one('res.partner', string='Customer')
 
     @api.onchange('name')
     def onchange_name(self):
@@ -98,6 +99,8 @@ class DeliveryOrderLine(models.TransientModel):
 
                 self.tracking_no = picking.delivery_tracking_no
 
+                self.partner_id = picking.partner_id
+
                 delivery_type = self.get_delivery_type(picking.driver_departure_date, picking.driver_arrival_date)
                 if delivery_type != 'departure':
                     self.departure_date = picking.driver_departure_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S')
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index bf415dbb..c5169420 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -85,7 +85,14 @@ class SaleOrder(models.Model):
     ])
     sppkp = fields.Char(string="SPPKP")
     npwp = fields.Char(string="NPWP")
+    purchase_total = fields.Monetary(string='Purchase Total', compute='_compute_purchase_total')
 
+    def _compute_purchase_total(self):
+        for order in self:
+            total = 0
+            for line in order.order_line:
+                total += line.vendor_subtotal
+            order.purchase_total = total
 
     def generate_payment_link_midtrans_sales_order(self):
         # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox
@@ -342,7 +349,7 @@ class SaleOrder(models.Model):
                 # must add product can sell validation
                 if not line.product_id.product_tmpl_id.sale_ok:
                     raise UserError('Product %s belum bisa dijual, harap hubungi finance' % line.product_id.display_name)
-                if line.product_id.id == 232383:
+                if line.product_id.id == 224484:
                     raise UserError(_('Tidak bisa Confirm menggunakan Produk Sementara'))
                 if not line.vendor_id or not line.purchase_price:
                     raise UserError(_('Isi Vendor dan Harga Beli sebelum Request Approval'))
@@ -575,7 +582,7 @@ class SaleOrderLine(models.Model):
         'res.partner', string='Vendor', readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
         change_default=True, index=True, tracking=1,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", )
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",)
     purchase_price = fields.Float('Purchase', required=True, digits='Product Price', default=0.0)
     purchase_tax_id = fields.Many2one('account.tax', string='Tax',
                                       domain=['|', ('active', '=', False), ('active', '=', True)])
@@ -583,6 +590,23 @@ class SaleOrderLine(models.Model):
     fee_third_party_line = fields.Float('FeeThirdPartyLine', compute='compute_fee_third_party_line', default=0)
     line_no = fields.Integer('No', default=0, copy=False)
     note_procurement = fields.Char(string='Note', help="Harap diisi jika ada keterangan tambahan dari Procurement, agar dapat dimonitoring")
+    vendor_subtotal = fields.Float(string='Vendor Subtotal', compute="_compute_vendor_subtotal")
+    
+    def _compute_vendor_subtotal(self):
+        for line in self:
+            if line.purchase_price > 0 and line.product_uom_qty > 0:
+                # product = line.product_id
+
+                # if product:
+                #     vendor_price = line.purchase_price
+                # if line.purchase_tax_id.price_include: 
+                #     vendor_price = line.purchase_price
+                # else:
+                #     vendor_price = line.purchase_price + (line.purchase_price*11/100)
+                subtotal = line.purchase_price * line.product_uom_qty
+                line.vendor_subtotal = subtotal
+            else:
+                line.vendor_subtotal = 0
 
     def compute_item_margin(self):
         for line in self: