From 5ae667c09db0eaccdaff9607838c9adeb58fb069 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 26 Apr 2024 16:07:58 +0700 Subject: customer commision --- indoteknik_custom/models/commision.py | 3 ++- indoteknik_custom/models/cust_commision.py | 1 + indoteknik_custom/views/cust_commision.xml | 2 ++ indoteknik_custom/views/customer_commision.xml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py index e60fe9a7..7ec2cecc 100644 --- a/indoteknik_custom/models/commision.py +++ b/indoteknik_custom/models/commision.py @@ -152,6 +152,7 @@ class CustomerCommision(models.Model): account_name = fields.Char(string='Account Name', tracking=3) bank_account = fields.Char(string='Account No', tracking=3) note_transfer = fields.Char(string='Keterangan') + brand_ids = fields.Many2many('x_manufactures', string='Brands') # add status for type of commision, fee, rebate / cashback # include child or not? @@ -250,7 +251,7 @@ class CustomerCommision(models.Model): partners = rec.partner_ids for partner in partners: - brand = [92, 10, 89, 12, 324, 11] + brand = [int(brand) for brand in rec.brand_ids] where = [ ('move_id.move_type', '=', 'out_invoice'), ('move_id.state', '=', 'posted'), diff --git a/indoteknik_custom/models/cust_commision.py b/indoteknik_custom/models/cust_commision.py index da345f04..c3105cfd 100644 --- a/indoteknik_custom/models/cust_commision.py +++ b/indoteknik_custom/models/cust_commision.py @@ -21,6 +21,7 @@ class CustCommision(models.Model): ('cashback', 'Cashback'), ('rebate', 'Rebate'), ], string='Commision Type', required=True) + brand_ids = fields.Many2many('x_manufactures', string='Brands', help='Voucher appplied only for brand') @api.constrains('partner_id') def _check_partner_id(self): diff --git a/indoteknik_custom/views/cust_commision.xml b/indoteknik_custom/views/cust_commision.xml index be58a68c..f080bc60 100644 --- a/indoteknik_custom/views/cust_commision.xml +++ b/indoteknik_custom/views/cust_commision.xml @@ -12,6 +12,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 600ad192..4b74cd34 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -12,6 +12,7 @@ + @@ -63,6 +64,7 @@ + -- cgit v1.2.3