From 5446eefa619906ba785d1f867fd828cce0d0748c Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 29 Dec 2023 13:44:00 +0700 Subject: multi update paid status on po --- indoteknik_custom/__manifest__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 39e5cdd9..d8058bff 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -104,6 +104,7 @@ 'views/stock_warehouse_orderpoint.xml', 'views/customer_commision.xml', 'views/wati_history.xml', + 'views/purchase_order_multi_update.xml', 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', -- cgit v1.2.3 From 38b28cfb316a1abf62f192ce03f938c70f21f1fb Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Sat, 6 Jan 2024 13:12:51 +0700 Subject: multiple reklas --- indoteknik_custom/__manifest__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index d8058bff..d6e69718 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -105,6 +105,7 @@ 'views/customer_commision.xml', 'views/wati_history.xml', 'views/purchase_order_multi_update.xml', + 'views/invoice_reklas_penjualan.xml', 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', -- cgit v1.2.3 From dfd4a1617d2c62b99d4bbcb6386b477874a33ebf Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 9 Jan 2024 15:03:15 +0700 Subject: multiple confirm purchase orders --- indoteknik_custom/__manifest__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index d6e69718..c7e65b37 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -105,6 +105,7 @@ 'views/customer_commision.xml', 'views/wati_history.xml', 'views/purchase_order_multi_update.xml', + 'views/purchase_order_multi_confirm.xml', 'views/invoice_reklas_penjualan.xml', 'report/report.xml', 'report/report_banner_banner.xml', -- cgit v1.2.3 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/__manifest__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index c7e65b37..689103d8 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -107,6 +107,17 @@ 'views/purchase_order_multi_update.xml', 'views/purchase_order_multi_confirm.xml', 'views/invoice_reklas_penjualan.xml', +<<<<<<< Updated upstream +<<<<<<< Updated upstream + 'views/po_multi_cancel.xml', +======= + 'views/logbook_sj.xml', + 'views/report_logbook_sj.xml', +>>>>>>> Stashed changes +======= + 'views/logbook_sj.xml', + 'views/report_logbook_sj.xml', +>>>>>>> Stashed changes 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', -- 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/__manifest__.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indoteknik_custom/__manifest__.py') diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 689103d8..b8a5f6f8 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -107,17 +107,9 @@ 'views/purchase_order_multi_update.xml', 'views/purchase_order_multi_confirm.xml', 'views/invoice_reklas_penjualan.xml', -<<<<<<< Updated upstream -<<<<<<< Updated upstream 'views/po_multi_cancel.xml', -======= 'views/logbook_sj.xml', 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes -======= - 'views/logbook_sj.xml', - 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', -- cgit v1.2.3