Merge branch 'production' into CR/quotation-noPo

# Conflicts:
#	indoteknik_custom/models/user_company_request.py

1 files changed, 21 insertions, 1 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index b6427745..da4a6cb6 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -10,6 +10,16 @@ class GroupPartner(models.Model):
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
+    property_account_payable_id = fields.Many2one('account.account', company_dependent=True,
+                                                  string="Account Payable",
+                                                  domain="[('internal_type', '=', 'payable'), ('deprecated', '=', False), ('company_id', '=', current_company_id)]",
+                                                  help="This account will be used instead of the default one as the payable account for the current partner",
+                                                  default=438)
+    property_account_receivable_id = fields.Many2one('account.account', company_dependent=True,
+                                                     string="Account Receivable",
+                                                     domain="[('internal_type', '=', 'receivable'), ('deprecated', '=', False), ('company_id', '=', current_company_id)]",
+                                                     help="This account will be used instead of the default one as the receivable account for the current partner",
+                                                     default=395)
     reference_number = fields.Char(string="Reference Number")
     company_type_id = fields.Many2one('res.partner.company_type', string='Company Type')
     custom_pricelist_id = fields.Many2one('product.pricelist', string='Price Matrix')
@@ -23,7 +33,7 @@ class ResPartner(models.Model):
     counter = fields.Integer(string="Counter", default=0)
     leadtime = fields.Integer(string="Leadtime", default=0)
     digital_invoice_tax = fields.Boolean(string="Digital Invoice & Faktur Pajak")
-    is_potential = fields.Boolean(string='Potential')
+    is_not_potential = fields.Boolean(string='Not Potential')
     pakta_integritas = fields.Boolean(string='Pakta Integritas')
     
     use_so_approval = fields.Boolean(string='Use SO Approval')
@@ -54,6 +64,16 @@ class ResPartner(models.Model):
     company_type = fields.Selection(string='Company Type',
         selection=[('person', 'Individual'), ('company', 'Company')],
         compute='_compute_company_type', inverse='_write_company_type', tracking=3)
+    warning_stage = fields.Float(string='Warning Amount',
+                                 help="A warning message will appear once the "
+                                      "selected customer is crossed warning "
+                                      "amount. Set its value to 0.00 to"
+                                      " disable this feature", tracking=3)
+    blocking_stage = fields.Float(string='Blocking Amount',
+                                  help="Cannot make sales once the selected "
+                                       "customer is crossed blocking amount."
+                                       "Set its value to 0.00 to disable "
+                                       "this feature", tracking=3)
 
     @api.model
     def _default_payment_term(self):