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

1 files changed, 5 insertions, 2 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index b172b94c..f17ccee5 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -68,6 +68,7 @@ class SaleOrder(models.Model):
         ('partial_chargeback', 'Partial Chargeback'),
         ('authorize', 'Authorize'),
     ], string='Payment Status', help='Payment Gateway Status / Midtrans / Web, https://docs.midtrans.com/en/after-payment/status-cycle')
+    date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ yang terakhir, tidak berpengaruh ke Accounting")
 
     def _generate_access_token(self, limit):
         orders = self.search(['access_token', '=', False], limit=limit)
@@ -111,10 +112,9 @@ class SaleOrder(models.Model):
 
     def calculate_so_status(self):
         so_state = ['sale']
-        so_status = ['sebagian', 'menunggu']
         sales = self.env['sale.order'].search([
             ('state', 'in', so_state),
-            ('so_status', 'in', so_status),
+            ('so_status', '!=', 'terproses'),
         ])
         for sale in sales:
             sum_qty_ship = sum_qty_so = 0
@@ -222,6 +222,9 @@ class SaleOrder(models.Model):
                 raise UserError('Gudang harus Bandengan')
             if order.state == 'cancel' or order.state == 'done' or order.state == 'sale':
                 raise UserError("Status harus draft atau sent")
+            if not order.partner_invoice_id.npwp:
+                raise UserError("NPWP harus diisi di master data konsumen, jika non pkp dapat diisi 00.000.000.0-000.000")
+
             if order.partner_id.parent_id:
                 if not order.partner_id.parent_id.property_payment_term_id:
                     raise UserError("Payment Term pada Master Data Customer harus diisi")