From adbc9b985f1c5fb2b2f41f79c686b3a573003e62 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 18 Sep 2023 16:20:15 +0700 Subject: Update promotion program feature --- indoteknik_custom/views/sale_order.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index f2cab699..3ea65498 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -109,6 +109,7 @@ + -- cgit v1.2.3 From dae4a3bf266ba4c19b1ba1d11c52ed9e19259b7c Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Sat, 23 Sep 2023 11:50:20 +0700 Subject: Update promotion program scheme --- .../views/promotion/promotion_program.xml | 72 ++++++++++++++++ .../promotion/promotion_program_free_item.xml | 44 ++++++++++ .../views/promotion/promotion_program_keyword.xml | 44 ++++++++++ .../views/promotion/promotion_program_line.xml | 72 ++++++++++++++++ indoteknik_custom/views/promotion_program.xml | 73 ---------------- .../views/promotion_program_free_item.xml | 44 ---------- .../views/promotion_program_keyword.xml | 44 ---------- indoteknik_custom/views/promotion_program_line.xml | 98 ---------------------- indoteknik_custom/views/sale_order.xml | 17 +++- indoteknik_custom/views/website_user_cart.xml | 12 +-- 10 files changed, 254 insertions(+), 266 deletions(-) create mode 100644 indoteknik_custom/views/promotion/promotion_program.xml create mode 100644 indoteknik_custom/views/promotion/promotion_program_free_item.xml create mode 100644 indoteknik_custom/views/promotion/promotion_program_keyword.xml create mode 100644 indoteknik_custom/views/promotion/promotion_program_line.xml delete mode 100644 indoteknik_custom/views/promotion_program.xml delete mode 100644 indoteknik_custom/views/promotion_program_free_item.xml delete mode 100644 indoteknik_custom/views/promotion_program_keyword.xml delete mode 100644 indoteknik_custom/views/promotion_program_line.xml (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion/promotion_program.xml b/indoteknik_custom/views/promotion/promotion_program.xml new file mode 100644 index 00000000..99fbd878 --- /dev/null +++ b/indoteknik_custom/views/promotion/promotion_program.xml @@ -0,0 +1,72 @@ + + + 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/promotion_program_free_item.xml b/indoteknik_custom/views/promotion/promotion_program_free_item.xml new file mode 100644 index 00000000..52d421fe --- /dev/null +++ b/indoteknik_custom/views/promotion/promotion_program_free_item.xml @@ -0,0 +1,44 @@ + + + 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/promotion_program_keyword.xml b/indoteknik_custom/views/promotion/promotion_program_keyword.xml new file mode 100644 index 00000000..fd279665 --- /dev/null +++ b/indoteknik_custom/views/promotion/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/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml new file mode 100644 index 00000000..6fdf0a9a --- /dev/null +++ b/indoteknik_custom/views/promotion/promotion_program_line.xml @@ -0,0 +1,72 @@ + + + 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 diff --git a/indoteknik_custom/views/promotion_program.xml b/indoteknik_custom/views/promotion_program.xml deleted file mode 100644 index 5dff80e6..00000000 --- a/indoteknik_custom/views/promotion_program.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - 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 deleted file mode 100644 index 52d421fe..00000000 --- a/indoteknik_custom/views/promotion_program_free_item.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 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_keyword.xml b/indoteknik_custom/views/promotion_program_keyword.xml deleted file mode 100644 index fd279665..00000000 --- a/indoteknik_custom/views/promotion_program_keyword.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 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 deleted file mode 100644 index 5963d0dd..00000000 --- a/indoteknik_custom/views/promotion_program_line.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - 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 diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 3ea65498..282e4024 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -91,7 +91,6 @@ - @@ -132,6 +131,22 @@
+ + + + + + + +
+ + + + + +
+
+
diff --git a/indoteknik_custom/views/website_user_cart.xml b/indoteknik_custom/views/website_user_cart.xml index f43c9f63..e3630363 100755 --- a/indoteknik_custom/views/website_user_cart.xml +++ b/indoteknik_custom/views/website_user_cart.xml @@ -29,12 +29,12 @@ - - - - - - + + + + + + -- cgit v1.2.3 From 50b5bd7bd984ef108e8bd324440050a222d8262f Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 25 Sep 2023 14:50:43 +0700 Subject: Fix promotion program feature --- .../views/promotion/promotion_program.xml | 1 + .../views/promotion/promotion_program_line.xml | 18 ++++++++++-------- indoteknik_custom/views/sale_order.xml | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/promotion/promotion_program.xml b/indoteknik_custom/views/promotion/promotion_program.xml index 99fbd878..f8432d8a 100644 --- a/indoteknik_custom/views/promotion/promotion_program.xml +++ b/indoteknik_custom/views/promotion/promotion_program.xml @@ -22,6 +22,7 @@ + diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml index 6fdf0a9a..db6d5252 100644 --- a/indoteknik_custom/views/promotion/promotion_program_line.xml +++ b/indoteknik_custom/views/promotion/promotion_program_line.xml @@ -5,7 +5,7 @@ - + @@ -22,30 +22,32 @@ - + - + + + - - + + - + - - + + diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 282e4024..04d4b854 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -91,6 +91,7 @@ + -- cgit v1.2.3 From d324fdd8ea3b14c966510bde610a96c8f5c3e3c5 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 26 Sep 2023 14:56:35 +0700 Subject: Update readonly condition order line on purchase order --- indoteknik_custom/views/purchase_order.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indoteknik_custom/views') diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index e7a72cd3..0ad76ae5 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -76,6 +76,11 @@ + + + + + {'readonly': ['|', ('state', 'in', ['done', 'cancel']), ('has_active_invoice', '=', True)]} -- cgit v1.2.3