diff options
| -rw-r--r-- | indoteknik_custom/models/commision.py | 13 | ||||
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 9 |
2 files changed, 0 insertions, 22 deletions
diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py index 3f035e2f..48f1c7f6 100644 --- a/indoteknik_custom/models/commision.py +++ b/indoteknik_custom/models/commision.py @@ -153,10 +153,6 @@ class CustomerCommision(models.Model): bank_account = fields.Char(string='Account No', tracking=3) note_transfer = fields.Char(string='Keterangan') brand_ids = fields.Many2many('x_manufactures', string='Brands') - payment_status = fields.Selection([ - ('pending', 'Pending'), - ('payment', 'Payment'), - ], string='Payment Status', copy=False, readonly=True, tracking=3, default='pending') # add status for type of commision, fee, rebate / cashback # include child or not? @@ -232,15 +228,6 @@ class CustomerCommision(models.Model): raise UserError('Harus di approved oleh yang bersangkutan') return - def action_confirm_customer_payment(self): - group_id = self.env.ref('indoteknik_custom.group_role_fat').id - users_in_group = self.env['res.users'].search([('groups_id', 'in', [group_id])]) - if self.env.user.id not in users_in_group.mapped('id'): - raise UserError('Hanya bisa dikonfirmasi oleh FAT') - else: - self.payment_status = 'payment' - return - def generate_customer_commision(self): if self.commision_lines: raise UserError('Line sudah ada, tidak bisa di generate ulang') diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 55736b0d..0b72587e 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -12,10 +12,6 @@ <field name="commision_percent"/> <field name="commision_amt" readonly="1"/> <field name="status" readonly="1"/> - <field name="payment_status" readonly="1" - decoration-success="payment_status == 'payment'" - decoration-danger="payment_status == 'pending'" - widget="badge"/> <field name="brand_ids" widget="many2many_tags"/> </tree> </field> @@ -47,10 +43,6 @@ <button name="action_confirm_customer_commision" string="Confirm" type="object" options="{}"/> - <button name="action_confirm_customer_payment" - string="Konfirmasi Pembayaran" type="object" - options="{}" - attrs="{'invisible': [('status', '!=', 'approved'),]}"/> </header> <sheet string="Customer Commision"> <div class="oe_button_box" name="button_box"/> @@ -76,7 +68,6 @@ <field name="brand_ids" widget="many2many_tags"/> <field name="notification" readonly="1"/> <field name="status" readonly="1"/> - <field name="payment_status" readonly="1" /> <field name="total_dpp"/> </group> </group> |