From 080df35099b90ca3c42e07bb0c8b181f123c173e Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 12 Dec 2025 11:20:50 +0700 Subject: revisi sales ccm --- indoteknik_custom/models/stock_picking.py | 2 +- indoteknik_custom/models/tukar_guling.py | 2 +- indoteknik_custom/views/stock_picking.xml | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 602b1145..003b1f47 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -202,7 +202,7 @@ class StockPicking(models.Model): so_num = fields.Char('SO Number', compute='_get_so_num') is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3) payment_term = fields.Char('Payment Term', compute='_get_partner_payment_term') - is_rev_tg = fields.Boolean('Revisi SO', compute='_compute_is_rev_tg', store=False) + is_rev_tg = fields.Boolean('Administrasi', compute='_compute_is_rev_tg', store=False) @api.depends('tukar_guling_id.rev_tukar_guling') def _compute_is_rev_tg(self): diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py index 9bcb0988..577047be 100644 --- a/indoteknik_custom/models/tukar_guling.py +++ b/indoteknik_custom/models/tukar_guling.py @@ -87,7 +87,7 @@ class TukarGuling(models.Model): is_has_invoice = fields.Boolean('Has Invoice?', compute='_compute_is_has_invoice', readonly=True, default=False) invoice_id = fields.Many2many('account.move', string='Invoice Ref', readonly=True) - rev_tukar_guling = fields.Boolean('SO Direvisi?', default=False, tracking=3) + rev_tukar_guling = fields.Boolean('Administrasi?', default=False, tracking=3) @api.depends('origin', 'operations') def _compute_origin_so(self): diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index eeb78f3b..7748b652 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -171,7 +171,7 @@ - + @@ -358,9 +358,13 @@ bg_color="bg-danger" attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/> + -- cgit v1.2.3 From d67b6738618cacc7d3cc8cf96736c8f709ed077a Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 12 Dec 2025 13:45:58 +0700 Subject: cr renca remove domain tempo duration --- indoteknik_custom/models/user_pengajuan_tempo_request.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py index 6e8498f7..8c12a810 100644 --- a/indoteknik_custom/models/user_pengajuan_tempo_request.py +++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py @@ -46,7 +46,7 @@ class UserPengajuanTempoRequest(models.Model): user_id = fields.Many2one('res.partner', string='User') user_company_id = fields.Many2one('res.partner', string='Company') pengajuan_tempo_id = fields.Many2one('user.pengajuan.tempo', string='Form Tempo') - tempo_duration = fields.Many2one('account.payment.term', string='Durasi Tempo', tracking=3, domain=[('id', 'in', [24, 25, 29, 32])]) + tempo_duration = fields.Many2one('account.payment.term', string='Durasi Tempo', tracking=3) tempo_limit = fields.Integer(string='Limit Tempo', tracking=3) state_tempo = fields.Selection([ ('draft', 'Pengajuan Tempo'), @@ -688,4 +688,4 @@ class UserPengajuanTempoRequest(models.Model): def format_currency(self, number): number = int(number) - return "{:,}".format(number).replace(',', '.') \ No newline at end of file + return "{:,}".format(number).replace(',', '.') -- cgit v1.2.3 From 0e3fb3afe5d7d73b2f5b55e51297f122c3dd6a39 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 12 Dec 2025 15:39:41 +0700 Subject: fix ccm --- indoteknik_custom/models/stock_picking.py | 7 +------ indoteknik_custom/models/tukar_guling.py | 6 +++++- indoteknik_custom/views/stock_picking.xml | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 003b1f47..2465fa96 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -202,12 +202,7 @@ class StockPicking(models.Model): so_num = fields.Char('SO Number', compute='_get_so_num') is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3) payment_term = fields.Char('Payment Term', compute='_get_partner_payment_term') - is_rev_tg = fields.Boolean('Administrasi', compute='_compute_is_rev_tg', store=False) - - @api.depends('tukar_guling_id.rev_tukar_guling') - def _compute_is_rev_tg(self): - for record in self: - record.is_rev_tg = record.tukar_guling_id.rev_tukar_guling if record.tukar_guling_id else False + is_rev_tg = fields.Boolean('Administrasi') @api.depends('sale_id.payment_term_id') def _get_partner_payment_term(self): diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py index 577047be..682c478a 100644 --- a/indoteknik_custom/models/tukar_guling.py +++ b/indoteknik_custom/models/tukar_guling.py @@ -87,7 +87,7 @@ class TukarGuling(models.Model): is_has_invoice = fields.Boolean('Has Invoice?', compute='_compute_is_has_invoice', readonly=True, default=False) invoice_id = fields.Many2many('account.move', string='Invoice Ref', readonly=True) - rev_tukar_guling = fields.Boolean('Administrasi?', default=False, tracking=3) + rev_tukar_guling = fields.Boolean('Administrasi?', tracking=3) @api.depends('origin', 'operations') def _compute_origin_so(self): @@ -811,6 +811,7 @@ class TukarGuling(models.Model): 'tukar_guling_id': record.id, 'sale_order': record.origin, 'note': record.notes, + 'is_rev_tg': bool(record.rev_tukar_guling), }) created_returns.append(srt_picking) _logger.info(f"✅ SRT created: {srt_picking.name}") @@ -875,6 +876,7 @@ class TukarGuling(models.Model): 'driver_arrival_date': bu_out.driver_arrival_date, 'delivery_date': bu_out.delivery_date, 'note': record.notes, + 'is_rev_tg': bool(record.rev_tukar_guling), }) created_returns.append(ort_picking) @@ -921,6 +923,7 @@ class TukarGuling(models.Model): 'tukar_guling_id': record.id, 'sale_order': record.origin, 'note': record.notes, + 'is_rev_tg': bool(record.rev_tukar_guling), }) new_pick.action_assign() new_pick.action_confirm() @@ -964,6 +967,7 @@ class TukarGuling(models.Model): 'sj_return_date': bu_out.sj_return_date if record.rev_tukar_guling else False, 'driver_arrival_date': bu_out.driver_arrival_date if record.rev_tukar_guling else False, 'delivery_date': bu_out.delivery_date if record.rev_tukar_guling else False, + 'is_rev_tg': bool(record.rev_tukar_guling), }) created_returns.append(new_out) _logger.info(f"✅ BU/OUT Baru dari SRT created: {new_out.name}") diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index 7748b652..5671c9f0 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -172,6 +172,7 @@ + @@ -360,11 +361,12 @@ + attrs="{'invisible': ['|', ('tukar_guling_id','=',False), ('is_rev_tg','=', False)]}"/> + + attrs="{'invisible': ['|', ('tukar_guling_id','=',False), ('is_rev_tg','=', True)]}"/> -- cgit v1.2.3 From a09346c4e73f35b8e58b933dde8513b25a3a9ca2 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 12 Dec 2025 17:03:50 +0700 Subject: remove domain durasi tempo --- indoteknik_custom/models/user_pengajuan_tempo_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py index 8c12a810..6a553946 100644 --- a/indoteknik_custom/models/user_pengajuan_tempo_request.py +++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py @@ -91,7 +91,7 @@ class UserPengajuanTempoRequest(models.Model): website_tempo = fields.Char(string='Website', related='pengajuan_tempo_id.website_tempo', store=True, tracking=True, readonly=False) portal = fields.Boolean(string='Portal Website', related='pengajuan_tempo_id.portal', store=True, tracking=True, readonly=False) estimasi_tempo = fields.Char(string='Estimasi Pembelian Pertahun', related='pengajuan_tempo_id.estimasi_tempo', store=True, tracking=True, readonly=False) - tempo_duration_origin = fields.Many2one('account.payment.term', string='Durasi Tempo', related='tempo_duration', store=True, tracking=True, readonly=False, domain=[('id', 'in', [24, 25, 29, 32])]) + tempo_duration_origin = fields.Many2one('account.payment.term', string='Durasi Tempo', related='tempo_duration', store=True, tracking=True, readonly=False) tempo_limit_origin = fields.Char(string='Limit Tempo', related='pengajuan_tempo_id.tempo_limit' , store=True, tracking=True, readonly=False) category_produk_ids = fields.Many2many('product.public.category', string='Kategori Produk yang Digunakan', related='pengajuan_tempo_id.category_produk_ids', readonly=False) -- cgit v1.2.3 From 90060eaefd3131e63d66ad0f7c25bbfad67881a5 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Sat, 13 Dec 2025 08:56:08 +0700 Subject: add assets inventaris --- indoteknik_custom/report/purchase_report.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml index 8785a7cf..54ac6193 100644 --- a/indoteknik_custom/report/purchase_report.xml +++ b/indoteknik_custom/report/purchase_report.xml @@ -105,8 +105,8 @@
- . - + . + -- cgit v1.2.3 From 490607bded7c4bffe188a224abe5ea759ea0319e Mon Sep 17 00:00:00 2001 From: Mqdd Date: Sat, 13 Dec 2025 09:09:22 +0700 Subject: improve submit performance indoteknik delivery --- indoteknik_api/controllers/api_v1/stock_picking.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index c19812f5..50a20877 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -131,9 +131,9 @@ class StockPicking(controller.Controller): # ===== Cari picking by id / picking_code ===== picking = False if scanid.isdigit() and int(scanid) < 2147483646: - picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0) + picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=1) if not picking: - picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0) + picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=1) if not picking: return self.response(code=403, description='picking not found') @@ -306,4 +306,3 @@ class StockPicking(controller.Controller): "waybill_id": data.get("courier_waybill_id") } ) - -- cgit v1.2.3 From 6eca5f88ea835d1dbd96f53af4cfe5e6437fe47f Mon Sep 17 00:00:00 2001 From: Mqdd Date: Sat, 13 Dec 2025 09:19:34 +0700 Subject: improve submit performance indoteknik delivery --- indoteknik_api/controllers/api_v1/stock_picking.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 50a20877..19d5fe11 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -130,11 +130,21 @@ class StockPicking(controller.Controller): # ===== Cari picking by id / picking_code ===== picking = False - if scanid.isdigit() and int(scanid) < 2147483646: - picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=1) - if not picking: - picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=1) + # if scanid.isdigit() and int(scanid) < 2147483646: + # picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=1) + # if not picking: + # picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=1) + + if scanid.isdigit(): + picking = request.env['stock.picking'].browse(int(scanid)) + if not picking.exists(): + picking = False + if not picking: + picking = request.env['stock.picking'].search( + [('picking_code', '=', scanid)], + limit=1 + ) return self.response(code=403, description='picking not found') # ===== Ambil MULTIPLE SJ dari form: sj_documentations=...&sj_documentations=... ===== -- cgit v1.2.3 From 28bbc495e76b6492935f7270888872135ae4d944 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Sat, 13 Dec 2025 09:20:43 +0700 Subject: return eror response --- indoteknik_api/controllers/api_v1/stock_picking.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 19d5fe11..def55435 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -145,7 +145,8 @@ class StockPicking(controller.Controller): [('picking_code', '=', scanid)], limit=1 ) - return self.response(code=403, description='picking not found') + if not picking: + return self.response(code=403, description='picking not found') # ===== Ambil MULTIPLE SJ dari form: sj_documentations=...&sj_documentations=... ===== form = request.httprequest.form or {} -- cgit v1.2.3