Ensure the contextual company is not None and positive before using it
Closes #13868 (grafted from 0ea68af90f3ef7059c7c9c7a33d13fa216e23bc4) --HG-- branch : 6.0
This commit is contained in:
@@ -90,7 +90,7 @@ class Journal(
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = Transaction().context.get('company')
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
digits = company.currency.digits
|
||||
else:
|
||||
|
||||
@@ -1844,7 +1844,7 @@ class TestTaxView(ModelView, TaxableMixin):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = Transaction().context.get('company')
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
return company.currency.id
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ class Configuration(metaclass=PoolMeta):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = Transaction().context.get('company')
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
return company.currency.digits
|
||||
|
||||
|
||||
@@ -379,7 +379,7 @@ class TestPaymentTermView(ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.id
|
||||
|
||||
@fields.depends('currency')
|
||||
|
||||
@@ -157,7 +157,7 @@ class Journal(metaclass=PoolMeta):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = cls.default_company()
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
return Company(company_id).party.id
|
||||
|
||||
@fields.depends('company')
|
||||
|
||||
@@ -84,7 +84,7 @@ class Agent(ModelSQL, ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company = cls.default_company()
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.id
|
||||
|
||||
@fields.depends('company', 'currency')
|
||||
|
||||
@@ -201,7 +201,7 @@ class CostPriceRevision(metaclass=PoolMeta):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = cls.default_company()
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
if company.cost_price_warehouse:
|
||||
return Transaction().context.get('warehouse')
|
||||
|
||||
@@ -396,7 +396,7 @@ class Purchase(
|
||||
def default_currency():
|
||||
Company = Pool().get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
company = Company(company)
|
||||
return company.currency.id
|
||||
|
||||
|
||||
@@ -245,7 +245,7 @@ class PurchaseRequisition(Workflow, ModelSQL, ModelView):
|
||||
def default_currency(cls):
|
||||
Company = Pool().get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.id
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -227,7 +227,7 @@ class SaleContext(ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = cls.default_company()
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
return company.currency.id
|
||||
|
||||
|
||||
@@ -410,7 +410,7 @@ class Sale(
|
||||
def default_currency():
|
||||
Company = Pool().get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.id
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -573,7 +573,7 @@ class CategoryTree(ModelSQL, ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.digits
|
||||
|
||||
|
||||
|
||||
@@ -228,7 +228,7 @@ class Subscription(Workflow, ModelSQL, ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company = cls.default_company()
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.id
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -623,7 +623,7 @@ class CategoryTree(ModelSQL, ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company = Transaction().context.get('company')
|
||||
if company:
|
||||
if company is not None and company >= 0:
|
||||
return Company(company).currency.digits
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -131,7 +131,7 @@ class Shop(DeactivableMixin, ModelSQL, ModelView):
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
company_id = cls.default_company()
|
||||
if company_id:
|
||||
if company_id is not None and company_id >= 0:
|
||||
company = Company(company_id)
|
||||
return company.currency.id
|
||||
|
||||
|
||||
Reference in New Issue
Block a user