Merge branch 'production' into purchasing-job

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/automatic_purchase.py
#	indoteknik_custom/models/purchase_order_line.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/automatic_purchase.xml
#	indoteknik_custom/views/purchase_order.xml

1 files changed, 9 insertions, 2 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index f1d0a6cf..720a4f91 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -81,12 +81,12 @@ from . import po_sync_price
 from . import base_import_import
 from . import product_attribute
 from . import mrp_production
+from . import promotion
 from . import solr
 from . import cost_centre
 from . import account_account
 from . import account_move_line
 from . import stock_scheduler_compute
-from . import promotion
 from . import sale_orders_multi_update
 from . import quotation_so_multi_update
 from . import product_monitoring
@@ -98,4 +98,11 @@ from . import purchasing_job
 from . import purchasing_job_multi_update
 from . import purchase_order_sales_match
 from . import sales_order_purchase_match
-from . import sale_monitoring_detail_v2
\ No newline at end of file
+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 stock_quant
+from . import po_multi_cancel
+from . import logbook_sj
+from . import report_logbook_sj