From b0152e913e55d4061abe1a0e96c558f62a99a830 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 30 Jan 2025 13:48:19 +0700 Subject: cr on account move line and add tracking on shipping paid by and shipping covered by on sale order --- indoteknik_custom/models/account_move_line.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index a4b25109..c4a65209 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -7,6 +7,12 @@ class AccountMoveLine(models.Model): cost_centre_id = fields.Many2one('cost.centre', string='Cost Centre') is_required = fields.Boolean(string='Is Required', compute='_compute_is_required') analytic_account_ids = fields.Many2many('account.analytic.account', string='Analytic Account') + line_no = fields.Integer('No', default=0, compute='_compute_line_no') + + def _compute_line_no(self): + if self.move_id: + for index, line in enumerate(self.move_id.invoice_line_ids, start=1): + line.line_no = index @api.onchange('account_id') def _onchange_account_id(self): -- cgit v1.2.3 From de4404c4b60b0859a4cbae836cc4c99d806bf697 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 31 Jan 2025 10:01:49 +0700 Subject: fix bug --- indoteknik_custom/models/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index c4a65209..9ab9620b 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -10,7 +10,7 @@ class AccountMoveLine(models.Model): line_no = fields.Integer('No', default=0, compute='_compute_line_no') def _compute_line_no(self): - if self.move_id: + if self.move_id and self.move_id.move_type == 'out_invoice': for index, line in enumerate(self.move_id.invoice_line_ids, start=1): line.line_no = index -- cgit v1.2.3 From c131fcf6f0fd3aa8bd4d3a241aabe577bbf57137 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 31 Jan 2025 10:19:45 +0700 Subject: fix bug --- indoteknik_custom/models/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 9ab9620b..c4a65209 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -10,7 +10,7 @@ class AccountMoveLine(models.Model): line_no = fields.Integer('No', default=0, compute='_compute_line_no') def _compute_line_no(self): - if self.move_id and self.move_id.move_type == 'out_invoice': + if self.move_id: for index, line in enumerate(self.move_id.invoice_line_ids, start=1): line.line_no = index -- cgit v1.2.3 From 9b4b186d5ac43f1e823ddf37d60f37980f3e721c Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 31 Jan 2025 10:27:51 +0700 Subject: fix bug --- indoteknik_custom/models/account_move_line.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index c4a65209..568c9b85 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -9,9 +9,10 @@ class AccountMoveLine(models.Model): analytic_account_ids = fields.Many2many('account.analytic.account', string='Analytic Account') line_no = fields.Integer('No', default=0, compute='_compute_line_no') + @api.depends('move_id.invoice_line_ids') def _compute_line_no(self): - if self.move_id: - for index, line in enumerate(self.move_id.invoice_line_ids, start=1): + for move in self.mapped('move_id'): + for index, line in enumerate(move.invoice_line_ids, start=1): line.line_no = index @api.onchange('account_id') -- cgit v1.2.3 From 8cba896edb13b2b2911e487aea562553d3b17025 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 31 Jan 2025 10:34:41 +0700 Subject: trying to fix bug --- indoteknik_custom/models/account_move_line.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 568c9b85..3c352560 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -12,9 +12,12 @@ class AccountMoveLine(models.Model): @api.depends('move_id.invoice_line_ids') def _compute_line_no(self): for move in self.mapped('move_id'): - for index, line in enumerate(move.invoice_line_ids, start=1): - line.line_no = index - + if move.move_type == 'out_invoice' and move.invoice_line_ids: + for index, line in enumerate(move.invoice_line_ids, start=1): + line.line_no = index + else: + for index, line in enumerate(move.line_ids, start=1): + line.line_no = index @api.onchange('account_id') def _onchange_account_id(self): for account in self: -- cgit v1.2.3 From 57b2ce27d2892f04e0503ac4543d23245bee639e Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 31 Jan 2025 11:00:25 +0700 Subject: fix bug --- indoteknik_custom/models/account_move_line.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 3c352560..37f7c77c 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -7,17 +7,8 @@ class AccountMoveLine(models.Model): cost_centre_id = fields.Many2one('cost.centre', string='Cost Centre') is_required = fields.Boolean(string='Is Required', compute='_compute_is_required') analytic_account_ids = fields.Many2many('account.analytic.account', string='Analytic Account') - line_no = fields.Integer('No', default=0, compute='_compute_line_no') + line_no = fields.Integer('No', default=0) - @api.depends('move_id.invoice_line_ids') - def _compute_line_no(self): - for move in self.mapped('move_id'): - if move.move_type == 'out_invoice' and move.invoice_line_ids: - for index, line in enumerate(move.invoice_line_ids, start=1): - line.line_no = index - else: - for index, line in enumerate(move.line_ids, start=1): - line.line_no = index @api.onchange('account_id') def _onchange_account_id(self): for account in self: -- cgit v1.2.3 From 10c0cd096353397ce26ad13b6967a35d13072fb6 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 19 Feb 2025 09:39:25 +0700 Subject: label in move line same with ref in entries --- indoteknik_custom/models/account_move_line.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 37f7c77c..31950f4c 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -23,3 +23,11 @@ class AccountMoveLine(models.Model): else: account.is_required = False + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if 'move_id' in vals: + move = self.env['account.move'].browse(vals['move_id']) + if move.move_type == 'entry': + vals['name'] = move.ref + return super().create(vals_list) \ No newline at end of file -- cgit v1.2.3 From 45f6f270ae76b5e2d811f4ef04e9b64ba5b7f143 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 19 Feb 2025 09:41:06 +0700 Subject: fix error --- indoteknik_custom/models/account_move_line.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 31950f4c..6b394da3 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -24,10 +24,10 @@ class AccountMoveLine(models.Model): account.is_required = False @api.model_create_multi - def create(self, vals_list): - for vals in vals_list: - if 'move_id' in vals: - move = self.env['account.move'].browse(vals['move_id']) - if move.move_type == 'entry': - vals['name'] = move.ref - return super().create(vals_list) \ No newline at end of file + def create(self, vals_list): + for vals in vals_list: + if 'move_id' in vals: + move = self.env['account.move'].browse(vals['move_id']) + if move.move_type == 'entry': + vals['name'] = move.ref + return super().create(vals_list) \ No newline at end of file -- cgit v1.2.3 From bf61388fb16a59dcf954cd288c830f00c62efee5 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 19 Feb 2025 09:42:12 +0700 Subject: fix error --- indoteknik_custom/models/account_move_line.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 6b394da3..a4386157 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -21,13 +21,4 @@ class AccountMoveLine(models.Model): if account.account_id.code and account.account_id.code[0] in ['6', '7']: account.is_required = True else: - account.is_required = False - - @api.model_create_multi - def create(self, vals_list): - for vals in vals_list: - if 'move_id' in vals: - move = self.env['account.move'].browse(vals['move_id']) - if move.move_type == 'entry': - vals['name'] = move.ref - return super().create(vals_list) \ No newline at end of file + account.is_required = False \ No newline at end of file -- cgit v1.2.3 From 62636c80dcc2078eed18810e7958f41fd5b13fdc Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 19 Feb 2025 09:42:39 +0700 Subject: fix error --- indoteknik_custom/models/account_move_line.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index a4386157..6b394da3 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -21,4 +21,13 @@ class AccountMoveLine(models.Model): if account.account_id.code and account.account_id.code[0] in ['6', '7']: account.is_required = True else: - account.is_required = False \ No newline at end of file + account.is_required = False + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if 'move_id' in vals: + move = self.env['account.move'].browse(vals['move_id']) + if move.move_type == 'entry': + vals['name'] = move.ref + return super().create(vals_list) \ No newline at end of file -- cgit v1.2.3 From 66901cd03a1494e6c84893e14083dcd1fbe737a5 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 19 Feb 2025 14:01:44 +0700 Subject: fix bug account move --- indoteknik_custom/models/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/account_move_line.py') diff --git a/indoteknik_custom/models/account_move_line.py b/indoteknik_custom/models/account_move_line.py index 6b394da3..7c95d4ef 100644 --- a/indoteknik_custom/models/account_move_line.py +++ b/indoteknik_custom/models/account_move_line.py @@ -28,6 +28,6 @@ class AccountMoveLine(models.Model): for vals in vals_list: if 'move_id' in vals: move = self.env['account.move'].browse(vals['move_id']) - if move.move_type == 'entry': + if move.move_type == 'entry' and move.is_hr == True: vals['name'] = move.ref return super().create(vals_list) \ No newline at end of file -- cgit v1.2.3