diff options
Diffstat (limited to 'indoteknik_custom/models')
| -rw-r--r-- | indoteknik_custom/models/account_move.py | 3 | ||||
| -rw-r--r-- | indoteknik_custom/models/advance_payment_request.py | 2 | ||||
| -rw-r--r-- | indoteknik_custom/models/commission_internal.py | 12 |
3 files changed, 13 insertions, 4 deletions
diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index e36b9920..b05ec7ff 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -330,7 +330,8 @@ class AccountMove(models.Model): grand_total = 0 for idx, inv in enumerate(invs, start=1): # numbering days_to_due = (inv.invoice_date_due - today).days if inv.invoice_date_due else 0 - grand_total += inv.amount_total + # grand_total += inv.amount_total + grand_total += inv.amount_residual invoice_table_rows += f""" <tr> <td>{idx}</td> diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py index d379eac8..f973a9da 100644 --- a/indoteknik_custom/models/advance_payment_request.py +++ b/indoteknik_custom/models/advance_payment_request.py @@ -1072,7 +1072,7 @@ class AdvancePaymentSettlement(models.Model): ], string = "Banyaknya Attachment", default='one_for_one_line') move_id = fields.Many2one('account.move', string='Journal Entries', domain=[('move_type', '=', 'entry')]) - is_cab_visible = fields.Boolean(string='Is Journal Uang Muka Visible', compute='_compute_is_cab_visible') + is_cab_visible = fields.Boolean(string='Status Jurnal', compute='_compute_is_cab_visible') user_id = fields.Many2one( 'res.users', diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py index cd6da380..840700c6 100644 --- a/indoteknik_custom/models/commission_internal.py +++ b/indoteknik_custom/models/commission_internal.py @@ -1,4 +1,4 @@ -from odoo import models, api, fields +from odoo import models, api, fields, _ from odoo.exceptions import AccessError, UserError, ValidationError from datetime import timedelta, date import logging @@ -178,6 +178,11 @@ class CommissionInternal(models.Model): # fill later TODO @stephan def calculate_commission_internal_result(self): + if self.commission_internal_result: + raise UserError('Hapus semua isi table result jika ingin di create result ulang') + + self.message_post(body=("Commission Internal Result generated by %s at %s.") % (self.env.user.name, fields.Datetime.now())) + exception = ['ONGKOS KIRIM SO/20'] query = [ ('commission_internal_id.id', '=', self.id), @@ -259,6 +264,7 @@ class CommissionInternal(models.Model): 'res_name': data['res_name'], 'res_id': data['res_id'], 'name': data['name'], + 'customer': data['customer'], 'salesperson': data['salesperson'], 'totalamt': data['amount_total'], 'uang_masuk_line_id': data['uang_masuk_line_id'], @@ -271,7 +277,6 @@ class CommissionInternal(models.Model): 'helper1': data['helper1'], 'helper2': data['helper2'] }]) - print(1) # this button / method works for train data in July 2025 def calculate_commission_internal_from_keyword(self): @@ -286,6 +291,7 @@ class CommissionInternal(models.Model): self._calculate_keyword_undefined() # execute helper2 for parse the label into INV/ or SO/ and switch SO to INV if available self._parse_label_helper2() + self.message_post(body=("Commission Internal Line calculated by %s at %s.") % (self.env.user.name, fields.Datetime.now())) def generate_commission_from_generate_ledger(self): if self.commission_internal_line: @@ -321,6 +327,7 @@ class CommissionInternal(models.Model): 'balance': ledger.balance }]) count += 1 + self.message_post(body=("Commission Internal Line generated by %s at %s") % (self.env.user.name, fields.Datetime.now())) _logger.info("Commission Internal Line generated %s" % count) @@ -390,3 +397,4 @@ class CommissionInternalResult(models.Model): helper3 = fields.Char(string='Helper3') helper4 = fields.Char(string='Helper4') helper5 = fields.Char(string='Helper5') + customer = fields.Char(string='Customer') |