From 8978868864925683d02342112020e7fc047a4acf Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 2 Feb 2024 13:32:55 +0700 Subject: logbook sj and mark as cancel po --- indoteknik_custom/models/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indoteknik_custom/models/__init__.py') diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 76387ff8..4b29e71d 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -98,3 +98,14 @@ from . import purchase_order_multi_update from . import invoice_reklas_penjualan from . import purchase_order_multi_confirm from . import stock_quant +<<<<<<< Updated upstream +<<<<<<< Updated upstream +from . import po_multi_cancel +======= +from . import logbook_sj +from . import report_logbook_sj +>>>>>>> Stashed changes +======= +from . import logbook_sj +from . import report_logbook_sj +>>>>>>> Stashed changes -- cgit v1.2.3 From e8edbf3d6b2c2edd67a890a29fb6262794e730d9 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 2 Feb 2024 13:35:08 +0700 Subject: fix conflict --- indoteknik_custom/models/__init__.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'indoteknik_custom/models/__init__.py') diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 4b29e71d..9678329a 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -98,14 +98,6 @@ from . import purchase_order_multi_update from . import invoice_reklas_penjualan from . import purchase_order_multi_confirm from . import stock_quant -<<<<<<< Updated upstream -<<<<<<< Updated upstream from . import po_multi_cancel -======= from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes -======= -from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes +from . import report_logbook_sj \ No newline at end of file -- cgit v1.2.3 From f5edc62d22c9a3973261ad289a11e189f0866f52 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 2 Feb 2024 13:36:48 +0700 Subject: fix conflict --- indoteknik_custom/models/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/__init__.py') diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 9678329a..49e3567c 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -100,4 +100,4 @@ from . import purchase_order_multi_confirm from . import stock_quant from . import po_multi_cancel from . import logbook_sj -from . import report_logbook_sj \ No newline at end of file +from . import report_logbook_sj -- cgit v1.2.3