summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-04-26 16:07:58 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-04-26 16:07:58 +0700
commit5ae667c09db0eaccdaff9607838c9adeb58fb069 (patch)
tree642c2094a353270f9f1c62e87246a4694072445f
parentba40250a928092e06136ac9f40c5be612b0c332e (diff)
customer commision
-rw-r--r--indoteknik_custom/models/commision.py3
-rw-r--r--indoteknik_custom/models/cust_commision.py1
-rw-r--r--indoteknik_custom/views/cust_commision.xml2
-rw-r--r--indoteknik_custom/views/customer_commision.xml2
4 files changed, 7 insertions, 1 deletions
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 @@
<field name="achieve_1st"/>
<field name="achieve_2nd"/>
<field name="commision_type"/>
+ <field name="brand_ids"/>
</tree>
</field>
</record>
@@ -31,6 +32,7 @@
<field name="achieve_1st"/>
<field name="achieve_2nd"/>
<field name="commision_type"/>
+ <field name="brand_ids"/>
</group>
</group>
</sheet>
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 @@
<field name="commision_percent"/>
<field name="commision_amt" readonly="1"/>
<field name="status" readonly="1"/>
+ <field name="brand_ids" widget="many2many_tags"/>
</tree>
</field>
</record>
@@ -63,6 +64,7 @@
</div>
<field name="date_to"/>
<field name="commision_type"/>
+ <field name="brand_ids" widget="many2many_tags"/>
<field name="notification" readonly="1"/>
<field name="status" readonly="1"/>
<field name="total_dpp"/>