summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-04-01 15:07:26 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-04-01 15:07:26 +0700
commit6852040680b803a76ee2314b365fa1f0a87085d3 (patch)
treec75d8bc4d872e0eda42c9560b4ad2f7df262f4c2
parent0a1e73c2c83e14f191c1555907e49014e83eef41 (diff)
parent2db12d995a60bfdbfbdeffc0a5256ac013557222 (diff)
Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production
-rwxr-xr-xindoteknik_custom/views/product_template.xml2
-rwxr-xr-xindoteknik_custom/views/sale_order.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 92d2191e..9d9e3f81 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -7,7 +7,7 @@
<field name="inherit_id" ref="product.product_template_form_view"/>
<field name="arch" type="xml">
<field name="categ_id" position="after">
- <field name="web_tax_id"/>
+ <field name="web_tax_id" domain="[('active', '=', True)]"/>
<field name="x_manufacture"/>
<field name="x_model_product"/>
<field name="kind_of"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 91475529..c455655b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -70,7 +70,7 @@
<field name="real_shipping_id"/>
<field name="real_invoice_id"/>
<field name="approval_status" />
- <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]" required="1"/>
+ <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
<field name="carrier_id" required="1"/>
<field name="delivery_service_type" readonly="1"/>
</field>