From 06a4478d69975b8a6eb3d228fa88708448b40a0e Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 31 May 2023 17:14:34 +0700 Subject: Promotion program feature --- indoteknik_custom/views/promotion_program.xml | 63 ++++++++++++++++ .../views/promotion_program_free_item.xml | 45 +++++++++++ indoteknik_custom/views/promotion_program_line.xml | 86 ++++++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 indoteknik_custom/views/promotion_program.xml create mode 100644 indoteknik_custom/views/promotion_program_free_item.xml create mode 100644 indoteknik_custom/views/promotion_program_line.xml (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion_program.xml b/indoteknik_custom/views/promotion_program.xml new file mode 100644 index 00000000..e309cc29 --- /dev/null +++ b/indoteknik_custom/views/promotion_program.xml @@ -0,0 +1,63 @@ + + + Promotion Program Tree + promotion.program + + + + + + + + + + + + Promotion Program Form + promotion.program + +
+ + + + + + + + + + + + + + + + + + +
+
+
+ + + Promotion Program + ir.actions.act_window + promotion.program + tree,form + + + + + +
\ No newline at end of file diff --git a/indoteknik_custom/views/promotion_program_free_item.xml b/indoteknik_custom/views/promotion_program_free_item.xml new file mode 100644 index 00000000..c17a752d --- /dev/null +++ b/indoteknik_custom/views/promotion_program_free_item.xml @@ -0,0 +1,45 @@ + + + Promotion Program Free Item Tree + promotion.program.free_item + + + + + + + + + + Promotion Program Free Item Form + promotion.program.free_item + +
+ + + + + + + + + +
+
+
+ + + Promotion Program Free Item + ir.actions.act_window + promotion.program.free_item + tree,form + + + +
\ No newline at end of file diff --git a/indoteknik_custom/views/promotion_program_line.xml b/indoteknik_custom/views/promotion_program_line.xml new file mode 100644 index 00000000..60334d6b --- /dev/null +++ b/indoteknik_custom/views/promotion_program_line.xml @@ -0,0 +1,86 @@ + + + Promotion Program Line Tree + promotion.program.line + + + + + + + + + + + + + + + Promotion Program Line Form + promotion.program.line + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + Promotion Program Line + ir.actions.act_window + promotion.program.line + tree,form + + + +
\ No newline at end of file -- cgit v1.2.3 From db7481a490b87e3a1768112395bf096b93969562 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 7 Jun 2023 13:58:24 +0700 Subject: Add promotion program keyword and api homepage promotion --- indoteknik_custom/views/promotion_program.xml | 10 +++++ .../views/promotion_program_free_item.xml | 1 - .../views/promotion_program_keyword.xml | 44 ++++++++++++++++++++++ indoteknik_custom/views/promotion_program_line.xml | 1 - 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 indoteknik_custom/views/promotion_program_keyword.xml (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion_program.xml b/indoteknik_custom/views/promotion_program.xml index e309cc29..5dff80e6 100644 --- a/indoteknik_custom/views/promotion_program.xml +++ b/indoteknik_custom/views/promotion_program.xml @@ -21,6 +21,7 @@ + @@ -33,6 +34,15 @@ + + + + + + + + + diff --git a/indoteknik_custom/views/promotion_program_free_item.xml b/indoteknik_custom/views/promotion_program_free_item.xml index c17a752d..52d421fe 100644 --- a/indoteknik_custom/views/promotion_program_free_item.xml +++ b/indoteknik_custom/views/promotion_program_free_item.xml @@ -18,7 +18,6 @@ - diff --git a/indoteknik_custom/views/promotion_program_keyword.xml b/indoteknik_custom/views/promotion_program_keyword.xml new file mode 100644 index 00000000..fd279665 --- /dev/null +++ b/indoteknik_custom/views/promotion_program_keyword.xml @@ -0,0 +1,44 @@ + + + Promotion Program Keyword Tree + promotion.program.keyword + + + + + + + + + + Promotion Program Keyword Form + promotion.program.keyword + +
+ + + + + + + + +
+
+
+ + + Promotion Program Keyword + ir.actions.act_window + promotion.program.keyword + tree,form + + + +
\ No newline at end of file diff --git a/indoteknik_custom/views/promotion_program_line.xml b/indoteknik_custom/views/promotion_program_line.xml index 60334d6b..bb625a8f 100644 --- a/indoteknik_custom/views/promotion_program_line.xml +++ b/indoteknik_custom/views/promotion_program_line.xml @@ -23,7 +23,6 @@ - -- cgit v1.2.3 From 1f2995a85428ac4335123bd33d48ae17d3c9f36f Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 12 Jun 2023 08:22:10 +0700 Subject: Update promotion program feature --- indoteknik_custom/views/promotion_program_line.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion_program_line.xml b/indoteknik_custom/views/promotion_program_line.xml index bb625a8f..e15bb0d7 100644 --- a/indoteknik_custom/views/promotion_program_line.xml +++ b/indoteknik_custom/views/promotion_program_line.xml @@ -34,11 +34,11 @@ -- cgit v1.2.3 From bc6bc85f455c4b8bc9f73b779b521faa5fcdcf96 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 15 Jun 2023 16:48:29 +0700 Subject: Update user cart model and API --- indoteknik_custom/views/website_user_cart.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/website_user_cart.xml b/indoteknik_custom/views/website_user_cart.xml index 890d801c..fbd08acb 100755 --- a/indoteknik_custom/views/website_user_cart.xml +++ b/indoteknik_custom/views/website_user_cart.xml @@ -13,7 +13,9 @@ + + @@ -28,7 +30,9 @@ + +
-- cgit v1.2.3 From 329668e82ca9e4ebd2ee93d6670380abf6ed6377 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 22 Jun 2023 13:43:42 +0700 Subject: Add program line to order line relation, update remaining_qty response on get product promotion api, show order line on program line --- indoteknik_custom/views/promotion_program_line.xml | 15 ++++++++++++++- indoteknik_custom/views/sale_order.xml | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion_program_line.xml b/indoteknik_custom/views/promotion_program_line.xml index e15bb0d7..5963d0dd 100644 --- a/indoteknik_custom/views/promotion_program_line.xml +++ b/indoteknik_custom/views/promotion_program_line.xml @@ -58,10 +58,23 @@ + + + + + + + + + +
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index ea13c954..83278ca8 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -60,6 +60,7 @@ "/> + -- cgit v1.2.3 From 41d0bc25d569901de38f77f0ba452e33630d01f0 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 13 Jul 2023 21:11:59 +0700 Subject: tracking history due extension --- indoteknik_custom/views/account_move.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 7f7fb228..5aeff4ec 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -16,7 +16,20 @@ + + + + + + + + + + + + + -- cgit v1.2.3 From f53828b3df693a88ec7cfff8b323178f3550a9b2 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 14 Jul 2023 11:04:57 +0700 Subject: refactor tracking history due extension --- indoteknik_custom/views/account_move.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 5aeff4ec..8cc8d723 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -23,9 +23,9 @@ - - - + + + -- cgit v1.2.3 From 4170cd7bd55232de0a66880351421b054a97849b Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 17 Jul 2023 09:08:34 +0700 Subject: refactor tracking history due extension on invoice --- indoteknik_custom/views/account_move.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 8cc8d723..a1d3eaaa 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -21,7 +21,7 @@ - + -- cgit v1.2.3 From 89c04f6748c4794018b34004472f08e3f41c8e43 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 18 Jul 2023 13:31:55 +0700 Subject: add new fields on account move bills --- indoteknik_custom/views/account_move.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index a1d3eaaa..0fd6b5b5 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -10,6 +10,9 @@ + + + -- cgit v1.2.3 From 9e0f8349ef5038bc3d7a3424ff5b6cfc0d1154ae Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 18 Jul 2023 13:43:15 +0700 Subject: replace menu bill line --- indoteknik_custom/views/bill_receipt.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/bill_receipt.xml b/indoteknik_custom/views/bill_receipt.xml index cfc268b0..c73802c2 100644 --- a/indoteknik_custom/views/bill_receipt.xml +++ b/indoteknik_custom/views/bill_receipt.xml @@ -79,8 +79,8 @@ -- cgit v1.2.3 From d7148fd0267529c92fa07b0721461a6ef13c0890 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 18 Jul 2023 14:36:36 +0700 Subject: add new field to tree --- indoteknik_custom/views/account_bills.xml | 15 +++++++++++++++ indoteknik_custom/views/account_move.xml | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 indoteknik_custom/views/account_bills.xml (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_bills.xml b/indoteknik_custom/views/account_bills.xml new file mode 100644 index 00000000..cb624396 --- /dev/null +++ b/indoteknik_custom/views/account_bills.xml @@ -0,0 +1,15 @@ + + + + + Account Move + account.move + + + + + + + + + \ No newline at end of file diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 0fd6b5b5..18461d59 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -73,5 +73,16 @@ + + + Account Move + account.move + + + + + + + \ No newline at end of file -- cgit v1.2.3 From f953c7c5915e15bd499f374d49403ef2567e0071 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 18 Jul 2023 16:37:47 +0700 Subject: refactor bill receipt --- indoteknik_custom/views/bill_receipt.xml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/bill_receipt.xml b/indoteknik_custom/views/bill_receipt.xml index c73802c2..138bd0a0 100644 --- a/indoteknik_custom/views/bill_receipt.xml +++ b/indoteknik_custom/views/bill_receipt.xml @@ -6,7 +6,7 @@ - + @@ -19,16 +19,14 @@ bill.receipt.line - - - - - - - + + + + - - + + + @@ -51,7 +49,7 @@ - + -- cgit v1.2.3 From bf002b5e297db5f3021b63adf5b60cf00ff4cee8 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 18 Jul 2023 16:50:56 +0700 Subject: fix bug optional hide --- indoteknik_custom/views/account_bills.xml | 15 --------------- indoteknik_custom/views/account_move.xml | 11 ----------- 2 files changed, 26 deletions(-) delete mode 100644 indoteknik_custom/views/account_bills.xml (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/account_bills.xml b/indoteknik_custom/views/account_bills.xml deleted file mode 100644 index cb624396..00000000 --- a/indoteknik_custom/views/account_bills.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Account Move - account.move - - - - - - - - - \ No newline at end of file diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 18461d59..0fd6b5b5 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -73,16 +73,5 @@ - - - Account Move - account.move - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 4ca27c7c265bfc84578b0f56524e9f3f2b0a6aad Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 20 Jul 2023 09:18:17 +0700 Subject: Add partner, amount voucher on voucher view --- indoteknik_custom/views/voucher.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index cd42586e..17b6ffa0 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -66,6 +66,8 @@ + + -- cgit v1.2.3 From c7389ec4ab18ee7ad993f1ec4d29da9d677ee431 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 20 Jul 2023 09:18:55 +0700 Subject: Update voucher readonly on sale order --- indoteknik_custom/views/sale_order.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 7f4cc4ae..4570f43b 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -26,7 +26,7 @@ - + -- cgit v1.2.3 From ce1c11b9be9274cf281a00cc340969f094a698be Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 21 Jul 2023 10:00:16 +0700 Subject: update receipt bill --- indoteknik_custom/views/bill_receipt.xml | 57 ++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 14 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/bill_receipt.xml b/indoteknik_custom/views/bill_receipt.xml index 138bd0a0..c9ab492a 100644 --- a/indoteknik_custom/views/bill_receipt.xml +++ b/indoteknik_custom/views/bill_receipt.xml @@ -6,10 +6,13 @@ + - - - + + + + + @@ -37,29 +40,41 @@
-
- - - + + + + - + + + + + - - + + @@ -67,16 +82,30 @@ + + bill.receipt.list.select + bill.receipt + + + + + + + + + + Bill Line ir.actions.act_window bill.receipt + tree,form Date: Fri, 21 Jul 2023 11:07:06 +0700 Subject: Update voucher views --- indoteknik_custom/views/voucher.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index 17b6ffa0..d79e73f6 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -28,15 +28,7 @@ - - - - - - - - @@ -60,8 +52,20 @@ + + + + + + + + + + -- cgit v1.2.3 From d157b2340a9c257d5f061b383ad8b909cc6d1ef7 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 21 Jul 2023 14:54:41 +0700 Subject: remove faktur pajak --- indoteknik_custom/views/bill_receipt.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/bill_receipt.xml b/indoteknik_custom/views/bill_receipt.xml index c9ab492a..15d82e7b 100644 --- a/indoteknik_custom/views/bill_receipt.xml +++ b/indoteknik_custom/views/bill_receipt.xml @@ -25,7 +25,6 @@ - -- cgit v1.2.3 From bc0c9e782140d82dc2147afb4a049c37141b081a Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 21 Jul 2023 17:03:15 +0700 Subject: Add exclude voucher pricelist API --- indoteknik_custom/views/voucher.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index d79e73f6..c6741a8d 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -59,6 +59,7 @@ + -- cgit v1.2.3