From 70709e9d60728570f322e3b80ee9c72059e3b1ea Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 24 May 2021 11:53:14 -0700 Subject: [PATCH] [IMP] hr_commission: add option for tax excluded invoice total --- hr_commission/models/account.py | 3 ++- hr_commission/models/res_company.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hr_commission/models/account.py b/hr_commission/models/account.py index 0eefeab2..fcfb66e5 100644 --- a/hr_commission/models/account.py +++ b/hr_commission/models/account.py @@ -39,10 +39,11 @@ class AccountInvoice(models.Model): return res def amount_for_commission(self): - # TODO Should toggle in Config Params if hasattr(self, 'margin') and self.company_id.commission_amount_type == 'on_invoice_margin': sign = -1 if self.type in ['in_refund', 'out_refund'] else 1 return self.margin * sign + elif self.company_id.commission_amount_type == 'on_invoice_untaxed': + return self.amount_untaxed_invoice_signed return self.amount_total_company_signed @api.multi diff --git a/hr_commission/models/res_company.py b/hr_commission/models/res_company.py index 26a2acb4..febdcaf9 100644 --- a/hr_commission/models/res_company.py +++ b/hr_commission/models/res_company.py @@ -15,4 +15,5 @@ class ResCompany(models.Model): commission_amount_type = fields.Selection([ ('on_invoice_margin', 'On Invoice Margin'), ('on_invoice_total', 'On Invoice Total'), + ('on_invoice_untaxed', 'On Invoice Total Tax Excluded'), ], string='Commission Base', default='on_invoice_margin')