From d67a78aa3532ebdb5b369ccd0b6f7a3ad6aa2b15 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 16 Oct 2024 17:03:30 +0700 Subject: remove note logistic selection --- indoteknik_custom/models/stock_picking.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 1b2baea7..a9eb3943 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -73,10 +73,8 @@ class StockPicking(models.Model): ('hold', 'Hold by Sales'), ('not_paid', 'Customer belum bayar'), ('partial', 'Kirim Parsial'), - ('not_complete', 'Belum Lengkap'), ('indent', 'Indent'), ('self_pickup', 'Barang belum di pickup Customer'), - ('delivery_route', 'Belum masuk rute pengiriman'), ('expedition_closed', 'Eskpedisi belum buka') ], string='Note Logistic', help='jika field ini diisi maka tidak akan dihitung ke lead time') waybill_id = fields.One2many(comodel_name='airway.bill', inverse_name='do_id', string='Airway Bill') -- cgit v1.2.3 From 29ba7afb88c676623a24b8b45503df5fd8e5c3ad Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 17 Oct 2024 10:01:28 +0700 Subject: cr approve po --- indoteknik_custom/models/purchase_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py index f8af409f..f924174a 100755 --- a/indoteknik_custom/models/purchase_order.py +++ b/indoteknik_custom/models/purchase_order.py @@ -511,7 +511,7 @@ class PurchaseOrder(models.Model): if self.total_percent_margin < self.total_so_percent_margin and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader: raise UserError("Beda Margin dengan Sales, harus approval Merchandise") if not self.from_apo: - if not self.sale_order_id and self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader: + if not self.sale_order_id and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader: raise UserError("Tidak ada link dengan SO, harus approval Merchandise") send_email = False -- cgit v1.2.3 From dd53080cb1bd9a1e6236a72dc4df09df9cda82a8 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 17 Oct 2024 14:18:03 +0700 Subject: add printed sj retur --- indoteknik_custom/models/stock_picking.py | 2 ++ indoteknik_custom/views/stock_picking.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index a9eb3943..a5482f9d 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -92,6 +92,8 @@ class StockPicking(models.Model): date_availability = fields.Datetime(string="Date Availability", copy=False, tracking=True) sale_order = fields.Char(string='Matches SO', copy=False) printed_sj = fields.Boolean('Printed Surat Jalan', help='flag which is internal use or not') + printed_sj_retur = fields.Boolean('Printed Surat Jalan Retur', help='flag which is internal use or not') + date_printed_sj_retur = fields.Datetime(string='Status Printed Surat Jalan Retur', copy=False, tracking=True) invoice_status = fields.Selection([ ('upselling', 'Upselling Opportunity'), ('invoiced', 'Fully Invoiced'), diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index af1af563..e435fa71 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -92,6 +92,8 @@ + + Date: Fri, 18 Oct 2024 13:55:42 +0700 Subject: nambahin 1 nol jadi pkp 15 --- indoteknik_api/controllers/api_v1/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py index e4f8b97f..3be874fa 100644 --- a/indoteknik_api/controllers/api_v1/user.py +++ b/indoteknik_api/controllers/api_v1/user.py @@ -95,7 +95,7 @@ class User(controller.Controller): user = request.env['res.users'].create(user_data) user.partner_id.email = email user.partner_id.customer_type = 'nonpkp' - user.partner_id.npwp = '0.000.000.0-000.000' + user.partner_id.npwp = '00.000.000.0-000.000' user.partner_id.sppkp = '-' user.partner_id.nama_wajib_pajak = user.name user.partner_id.user_id = 3222 -- cgit v1.2.3 From 330dc374a9a15e4ad41b6829ad87a2a1d8264fff Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Fri, 18 Oct 2024 14:10:45 +0700 Subject: temporary comment update contact in sales order --- indoteknik_custom/models/sale_order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 22130ac3..cb7d1782 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -1314,7 +1314,7 @@ class SaleOrder(models.Model): def create(self, vals): # Ensure partner details are updated when a sale order is created order = super(SaleOrder, self).create(vals) - order._update_partner_details() + # order._update_partner_details() return order def write(self, vals): @@ -1322,8 +1322,8 @@ class SaleOrder(models.Model): res = super(SaleOrder, self).write(vals) # Check if the update is coming from a save operation - if any(field in vals for field in ['sppkp', 'npwp', 'email', 'customer_type']): - self._update_partner_details() + # if any(field in vals for field in ['sppkp', 'npwp', 'email', 'customer_type']): + # self._update_partner_details() return res -- cgit v1.2.3 From f65c674b06d3fbe22829a599eec36b4b19c27dd2 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Sat, 19 Oct 2024 09:38:37 +0700 Subject: push --- indoteknik_custom/views/res_partner.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index 6d02a86b..b458c44c 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -65,9 +65,9 @@ - + 1 -- cgit v1.2.3 From 4146004dfa277d1e5f15ca7ed6af247f543b74bb Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Sat, 19 Oct 2024 09:41:42 +0700 Subject: push --- indoteknik_custom/views/res_partner.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index b458c44c..6d02a86b 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -65,9 +65,9 @@ - + 1 -- cgit v1.2.3 From a4006a9c7f57bbc11ba0c519e69719ded8248ad3 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Sat, 19 Oct 2024 11:25:53 +0700 Subject: add date_reserved on tree stock picking --- indoteknik_custom/views/stock_picking.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index e435fa71..d713edbc 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -16,6 +16,7 @@ + -- cgit v1.2.3 From eadc70481dd65dd7483aa2ae5c9bcc68bb274f3e Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 21 Oct 2024 09:19:50 +0700 Subject: fix bug vendor approval --- indoteknik_custom/models/sale_order.py | 3 +++ indoteknik_custom/models/vendor_approval.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index cb7d1782..891482cb 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -873,6 +873,9 @@ class SaleOrder(models.Model): }).send() def validate_different_vendor(self): + if self.vendor_approval_id and self.vendor_approval: + return False + different_vendor = self.order_line.filtered(lambda l: l.vendor_id and l.vendor_md_id and l.vendor_id.id != l.vendor_md_id.id) if self.vendor_approval_id and self.vendor_approval_id.state == 'draft': diff --git a/indoteknik_custom/models/vendor_approval.py b/indoteknik_custom/models/vendor_approval.py index e540b8fc..b0d58b85 100644 --- a/indoteknik_custom/models/vendor_approval.py +++ b/indoteknik_custom/models/vendor_approval.py @@ -29,7 +29,7 @@ class VendorApproval(models.Model): raise UserError('Hanya Merchandiser yang bisa approve') self.state = 'done' - self.order_id.update({'vendor_approval': True}) + self.order_id.vendor_approval = True self.order_id.action_confirm() message = "Vendor Approval approved by %s" % (self.env.user.name) self.order_id.message_post(body=message) -- cgit v1.2.3