Ensure the contextual company is not None and positive before using it

Closes #13868
(grafted from 0ea68af90f3ef7059c7c9c7a33d13fa216e23bc4)

--HG--
branch : 7.0

modules/account/journal.py

@@ -94,7 +94,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)
             currency_id = company.currency.id
         else:

modules/account/tax.py

@@ -1924,7 +1924,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
 
@@ -1933,7 +1933,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:
             return Company(company_id)
 
     @property

modules/account_consolidation/account.py

@@ -322,7 +322,7 @@ class ConsolidationBalanceSheetContext(ModelView):
         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:
             return Company(company_id).currency.id
 
     @classmethod
@@ -406,7 +406,7 @@ class ConsolidationIncomeStatementContext(ModelView):
         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:
             return Company(company_id).currency.id
 
     @classmethod

modules/account_credit_limit/account.py

@@ -25,7 +25,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
 

modules/account_invoice/payment_term.py

@@ -332,7 +332,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('payment_term', 'date', 'amount', 'currency', 'result')

modules/account_payment_sepa/payment.py

@@ -160,7 +160,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')

modules/commission/commission.py

@@ -85,7 +85,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')

modules/product_cost_history/product.py

@@ -25,7 +25,7 @@ class Product(metaclass=PoolMeta):
             datetime = context['_datetime']
             company = pattern.get(
                 'company', Transaction().context.get('company'))
-            if company:
+            if company is not None and company >= 0:
                 company = Company(company)
                 if company.timezone:
                     timezone = tz.ZoneInfo(company.timezone)

modules/product_cost_warehouse/product.py

@@ -221,7 +221,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')

modules/purchase/purchase.py

@@ -381,7 +381,7 @@ class Purchase(
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @classmethod

modules/purchase_blanket_agreement/purchase.py

@@ -259,7 +259,7 @@ class BlanketAgreement(Workflow, ModelSQL, ModelView):
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @fields.depends('company', 'supplier', 'lines')

modules/purchase_requisition/purchase.py

@@ -229,7 +229,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
 
     @fields.depends('lines', 'currency')

modules/sale/product.py

@@ -256,7 +256,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
 

modules/sale/sale.py

@@ -436,7 +436,7 @@ class Sale(
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @classmethod

modules/sale/sale_reporting.py

@@ -553,7 +553,7 @@ class CustomerCategoryTree(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.id
 
 
@@ -800,7 +800,7 @@ class ProductCategoryTree(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.id
 
 
@@ -927,7 +927,7 @@ class RegionTree(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.id
 
 

modules/sale_blanket_agreement/sale.py

@@ -260,7 +260,7 @@ class BlanketAgreement(Workflow, ModelSQL, ModelView):
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @fields.depends('company', 'customer', 'lines')

modules/sale_opportunity/opportunity.py

@@ -253,7 +253,7 @@ class SaleOpportunity(
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @staticmethod

modules/sale_point/sale_reporting.py

@@ -20,7 +20,7 @@ class AbstractMixin:
         line = Line.__table__()
         point = Point.__table__()
         sale = Sale.__table__()
-        if company_id is not None:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             currency_id = company.currency.id
         else:

modules/sale_subscription/subscription.py

@@ -239,7 +239,7 @@ class Subscription(Workflow, ModelSQL, ModelView):
         company = pattern.get('company')
         if not company:
             company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @classmethod

modules/stock/product.py

@@ -233,7 +233,7 @@ class Product(StockMixin, object, metaclass=PoolMeta):
             context['_datetime'] = datetime.datetime.combine(
                 trans_context['stock_date_end'], datetime.time.max)
             company = trans_context.get('company')
-            if company:
+            if company is not None and company >= 0:
                 company = Company(company)
                 if company.timezone:
                     timezone = tz.ZoneInfo(company.timezone)

modules/stock/stock_reporting_margin.py

@@ -637,7 +637,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.id
 
     @classmethod

modules/web_shop/web.py

@@ -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