Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into feat_voucher_category

4 files changed, 17 insertions, 2 deletions

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 906985de..30de67be 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -66,6 +66,19 @@ class AccountMove(models.Model):
     other_taxes = fields.Float(string="Other Taxes", compute='compute_other_taxes')
     is_hr = fields.Boolean(string="Is HR?", default=False)
     purchase_order_id = fields.Many2one('purchase.order', string='Purchase Order')
+    length_of_payment = fields.Integer(string="Length of Payment", compute='compute_length_of_payment')
+
+    def compute_length_of_payment(self):
+        for rec in self:
+            payment_term = rec.invoice_payment_term_id.line_ids[0].days
+            terima_faktur = rec.date_terima_tukar_faktur
+            payment = self.search([('ref', '=', rec.name), ('move_type', '=', 'entry')], limit=1)
+            
+            if payment and terima_faktur:
+                date_diff = terima_faktur - payment.date
+                rec.length_of_payment = date_diff.days + payment_term
+            else:
+                rec.length_of_payment = 0
 
     def _update_line_name_from_ref(self):
         """Update all account.move.line name fields with ref from account.move"""
diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index a39abba9..d619e160 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -699,7 +699,8 @@ class SaleNotInMatchPO(models.Model):
                                 where apsm.sale_line_id not in (
                                     select distinct coalesce(posm.sale_line_id,0) 
                                     from purchase_order_sales_match posm
-                                    where posm.state not in ('cancel')
+                                    left join purchase_order po on po.id = posm.purchase_order_id
+                                    where po.state not in ('cancel')
                                 )
                             )
                             """ % self._table)
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index f99058ea..0d4fc6c3 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -297,7 +297,7 @@ class SaleOrder(models.Model):
     )
     nomor_so_pengganti = fields.Char(string='Nomor SO Pengganti', copy=False, tracking=3)
     shipping_option_id = fields.Many2one("shipping.option", string="Selected Shipping Option", domain="['|', ('sale_order_id', '=', False), ('sale_order_id', '=', id)]")
-    hold_outgoing = fields.Boolean('Hold Outgoing SO')
+    hold_outgoing = fields.Boolean('Hold Outgoing SO', tracking=3)
     state_ask_cancel = fields.Selection([
         ('hold', 'Hold'),
         ('approve', 'Approve')
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 17263c3a..46737a40 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -92,6 +92,7 @@
                     <field name="is_efaktur_exported" optional="hide"/>
                     <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
                     <field name="new_invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
+                    <field name="length_of_payment" optional="hide"/>
                     <field name="mark_upload_efaktur" optional="hide" widget="badge" 
                     decoration-danger="mark_upload_efaktur == 'belum_upload'"  
                     decoration-success="mark_upload_efaktur == 'sudah_upload'" />