Merge branch 'odoo-backup' into CR/form-merchant

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 9 insertions, 0 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 714d29d3..e17f68d1 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -106,6 +106,7 @@ from . import sale_monitoring_detail_v2
 from . import purchase_order_multi_update
 from . import invoice_reklas_penjualan
 from . import purchase_order_multi_confirm
+from . import purchase_order_multi_ask_approval
 from . import po_multi_cancel
 from . import logbook_sj
 from . import report_logbook_sj
@@ -138,8 +139,16 @@ from . import user_pengajuan_tempo
 from . import approval_retur_picking
 from . import va_multi_approve
 from . import va_multi_reject
+from . import vendor_sla
 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
+from . import account_payment_register
+from . import stock_inventory
+from . import approval_invoice_date