summaryrefslogtreecommitdiff
path: root/indoteknik_custom/models/__init__.py
diff options
context:
space:
mode:
authorit-fixcomart <it@fixcomart.co.id>2025-05-23 09:22:27 +0700
committerit-fixcomart <it@fixcomart.co.id>2025-05-23 09:22:27 +0700
commitf6f59e660af6c4229ada54f7313d68867df1ba15 (patch)
tree9a27b4e0e6571c639ba173df5ae25a2e7014aefd /indoteknik_custom/models/__init__.py
parent68378dd2fb8d61b282a672ca0f09033d15d82283 (diff)
parent558130bbf48c33ddfa6080450c80bc8801a570f0 (diff)
Merge branch 'CR/form-merchant' into odoo-backup
# Conflicts: # indoteknik_custom/models/sale_order.py # indoteknik_custom/views/sale_order.xml
Diffstat (limited to 'indoteknik_custom/models/__init__.py')
-rwxr-xr-xindoteknik_custom/models/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 08fa9803..e17f68d1 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -144,6 +144,8 @@ from . import stock_immediate_transfer
from . import coretax_fatur
from . import public_holiday
from . import ir_actions_report
+from . import user_form_merchant
+from . import user_merchant_request
from . import barcoding_product
from . import sales_order_koli
from . import stock_backorder_confirmation