diff --git a/modules/account/journal.py b/modules/account/journal.py index 38ae0bcec7..b3730043d7 100644 --- a/modules/account/journal.py +++ b/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: diff --git a/modules/account/tax.py b/modules/account/tax.py index e41cfcaf43..5dd420f98f 100644 --- a/modules/account/tax.py +++ b/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 diff --git a/modules/account_consolidation/account.py b/modules/account_consolidation/account.py index 89e62b3815..dc47bcc1e0 100644 --- a/modules/account_consolidation/account.py +++ b/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 diff --git a/modules/account_credit_limit/account.py b/modules/account_credit_limit/account.py index 6157d4f90d..87801e4155 100644 --- a/modules/account_credit_limit/account.py +++ b/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 diff --git a/modules/account_invoice/payment_term.py b/modules/account_invoice/payment_term.py index faefc7910b..71ea959efc 100644 --- a/modules/account_invoice/payment_term.py +++ b/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') diff --git a/modules/account_payment_sepa/payment.py b/modules/account_payment_sepa/payment.py index ae8e69d20d..ce5b2a8822 100644 --- a/modules/account_payment_sepa/payment.py +++ b/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') diff --git a/modules/commission/commission.py b/modules/commission/commission.py index 46ffc9f73f..11d04e6863 100644 --- a/modules/commission/commission.py +++ b/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') diff --git a/modules/product_cost_history/product.py b/modules/product_cost_history/product.py index 0755025bcc..974b660b95 100644 --- a/modules/product_cost_history/product.py +++ b/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) diff --git a/modules/product_cost_warehouse/product.py b/modules/product_cost_warehouse/product.py index b58a637b77..5843fb620e 100644 --- a/modules/product_cost_warehouse/product.py +++ b/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') diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py index 1e6ca9a29c..50d9ebe91f 100644 --- a/modules/purchase/purchase.py +++ b/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 diff --git a/modules/purchase_blanket_agreement/purchase.py b/modules/purchase_blanket_agreement/purchase.py index 4e89bc3b6c..2b172dd7d6 100644 --- a/modules/purchase_blanket_agreement/purchase.py +++ b/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') diff --git a/modules/purchase_requisition/purchase.py b/modules/purchase_requisition/purchase.py index 7a72baefdf..574999563b 100644 --- a/modules/purchase_requisition/purchase.py +++ b/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') diff --git a/modules/sale/product.py b/modules/sale/product.py index 0c763f1718..a54b997e6a 100644 --- a/modules/sale/product.py +++ b/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 diff --git a/modules/sale/sale.py b/modules/sale/sale.py index e030330b11..d57bbfa3d6 100644 --- a/modules/sale/sale.py +++ b/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 diff --git a/modules/sale/sale_reporting.py b/modules/sale/sale_reporting.py index e2dd8d2152..6d2fbcbaf5 100644 --- a/modules/sale/sale_reporting.py +++ b/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 diff --git a/modules/sale_blanket_agreement/sale.py b/modules/sale_blanket_agreement/sale.py index 679e1edafa..4cc5845cb5 100644 --- a/modules/sale_blanket_agreement/sale.py +++ b/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') diff --git a/modules/sale_opportunity/opportunity.py b/modules/sale_opportunity/opportunity.py index 1af82b4706..e2f0105d74 100644 --- a/modules/sale_opportunity/opportunity.py +++ b/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 diff --git a/modules/sale_point/sale_reporting.py b/modules/sale_point/sale_reporting.py index 6ea721a753..7c941cc5ae 100644 --- a/modules/sale_point/sale_reporting.py +++ b/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: diff --git a/modules/sale_subscription/subscription.py b/modules/sale_subscription/subscription.py index 766012da55..ecc60a036b 100644 --- a/modules/sale_subscription/subscription.py +++ b/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 diff --git a/modules/stock/product.py b/modules/stock/product.py index c29812f981..772ad2b6a1 100644 --- a/modules/stock/product.py +++ b/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) diff --git a/modules/stock/stock_reporting_margin.py b/modules/stock/stock_reporting_margin.py index b3bc1101d4..658cb00532 100644 --- a/modules/stock/stock_reporting_margin.py +++ b/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 diff --git a/modules/web_shop/web.py b/modules/web_shop/web.py index d46cde95b2..3af19f7a94 100644 --- a/modules/web_shop/web.py +++ b/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