diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2023-09-29 02:32:56 +0000 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2023-09-29 02:32:56 +0000 |
| commit | 78f205302c35cab2512971d64c8152aab2dcfa95 (patch) | |
| tree | 72be75ad949fe9efaf7b55c8f7f5722225538b28 /indoteknik_custom/views | |
| parent | 50b5bd7bd984ef108e8bd324440050a222d8262f (diff) | |
| parent | 0bb47005022b33c79ecfb5924d41f35ce794c5fb (diff) | |
Merged in production (pull request #126)
Production
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/account_move_line.xml | 1 | ||||
| -rw-r--r-- | indoteknik_custom/views/apache_solr_queue.xml | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/invoice_reklas.xml | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/price_group.xml | 6 | ||||
| -rwxr-xr-x | indoteknik_custom/views/product_template.xml | 1 | ||||
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 44 | ||||
| -rw-r--r-- | indoteknik_custom/views/quotation_so_multi_update.xml | 31 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 23 | ||||
| -rw-r--r-- | indoteknik_custom/views/sale_orders_multi_update.xml | 31 | ||||
| -rw-r--r-- | indoteknik_custom/views/users.xml | 1 | ||||
| -rwxr-xr-x | indoteknik_custom/views/voucher.xml | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/views/x_banner_banner.xml | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/views/x_banner_category.xml | 9 |
13 files changed, 147 insertions, 8 deletions
diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml index 5b5f73cd..02b936f1 100644 --- a/indoteknik_custom/views/account_move_line.xml +++ b/indoteknik_custom/views/account_move_line.xml @@ -11,6 +11,7 @@ </xpath> <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']/tree/field[@name='analytic_tag_ids']" position="attributes"> <attribute name="groups"/> + <attribute name="options">{'no_create': True}</attribute> </xpath> </field> </record> diff --git a/indoteknik_custom/views/apache_solr_queue.xml b/indoteknik_custom/views/apache_solr_queue.xml index 56ab2713..3861fd20 100644 --- a/indoteknik_custom/views/apache_solr_queue.xml +++ b/indoteknik_custom/views/apache_solr_queue.xml @@ -3,7 +3,7 @@ <field name="name">apache.solr.queue.tree</field> <field name="model">apache.solr.queue</field> <field name="arch" type="xml"> - <tree editable="top" default_order="execute_date desc"> + <tree editable="top" default_order="create_date desc"> <field name="display_name" readonly="1" /> <field name="res_model" readonly="1" /> <field name="res_id" readonly="1" /> diff --git a/indoteknik_custom/views/invoice_reklas.xml b/indoteknik_custom/views/invoice_reklas.xml index e807dca5..a29139ad 100644 --- a/indoteknik_custom/views/invoice_reklas.xml +++ b/indoteknik_custom/views/invoice_reklas.xml @@ -10,7 +10,7 @@ </p> <group> <field name="reklas_type"/> - <field name="reklas_id"/> + <field name="reklas_id" options="{'no_create': True}"/> <field name="pay_amt"/> </group> <footer> diff --git a/indoteknik_custom/views/price_group.xml b/indoteknik_custom/views/price_group.xml index 7ee8d422..5db8756e 100644 --- a/indoteknik_custom/views/price_group.xml +++ b/indoteknik_custom/views/price_group.xml @@ -23,6 +23,9 @@ <field name="group3"/> <field name="group4"/> <field name="group5"/> + <field name="group6"/> + <field name="group7"/> + <field name="group8"/> </tree> </field> </record> @@ -42,6 +45,9 @@ <field name="group3"/> <field name="group4"/> <field name="group5"/> + <field name="group6"/> + <field name="group7"/> + <field name="group8"/> </group> </group> </sheet> diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml index a3a23101..e09fee77 100755 --- a/indoteknik_custom/views/product_template.xml +++ b/indoteknik_custom/views/product_template.xml @@ -15,6 +15,7 @@ <field name="uom_po_id" position="after"> <field name="desc_update_solr" readonly="1" /> <field name="last_update_solr" readonly="1" /> + <field name="publish" /> </field> <page name="inventory" position="after"> <page string="Marketplace" name="marketplace"> diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 7d436c46..0ad76ae5 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -37,6 +37,7 @@ <field name="currency_id" position="after"> <field name="summary_qty_po"/> <field name="count_line_product"/> + <field name="payment_term_id"/> </field> <field name="amount_total" position="after"> <field name="total_margin"/> @@ -52,13 +53,19 @@ <field name="product_id" position="before"> <field name="line_no" attrs="{'readonly': 1}" optional="hide"/> </field> + <field name="product_id" position="attributes"> + <attribute name="options">{'no_create': True}</attribute> + </field> <field name="product_qty" position="before"> - <field name="qty_available_store"/> - <field name="suggest"/> + <field name="qty_available_store" readonly="1" /> + <field name="suggest" readonly="1" /> </field> <field name="price_unit" position="after"> <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/> </field> + <field name="price_subtotal" position="after"> + <field name="so_line_id" attrs="{'readonly': 1}" optional="hide"/> + </field> <page name="purchase_delivery_invoice" position="after"> <page name="purchase_vendor_bills" string="Vendor Bills" groups="indoteknik_custom.technical_administrator"> <group> @@ -69,11 +76,28 @@ <field name="fiscal_position_id" position="after"> <field name="note_description"/> <field name="total_so_percent_margin"/> - + <field name="has_active_invoice" invisible="1" /> + </field> + + <field name="order_line" position="attributes"> + <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute> </field> + + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes"> + <attribute name="attrs">{'readonly': [], 'required': True}</attribute> + </xpath> + + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='taxes_id']" position="attributes"> + <attribute name="attrs">{'readonly': []}</attribute> + </xpath> + + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_qty']" position="attributes"> + <attribute name="attrs">{'readonly': [], 'required': True}</attribute> + </xpath> </field> </record> </data> + <data> <record id="rfq_order_tree_view_inherit" model="ir.ui.view"> <field name="name">Purchase</field> @@ -86,6 +110,7 @@ </field> </record> </data> + <data> <record id="purchase_order_tree_view_inherit" model="ir.ui.view"> <field name="name">Purchase</field> @@ -95,6 +120,19 @@ <field name="invoice_status" position="after"> <field name="po_status"/> <field name="note_description" optional="hide"/> + <field name="sale_order_id" optional="hide"/> + </field> + </field> + </record> + </data> + <data> + <record id="purchase_order_search_inherit" model="ir.ui.view"> + <field name="name">purchase.order.select.inherit</field> + <field name="model">purchase.order</field> + <field name="inherit_id" ref="purchase.purchase_order_view_search"/> + <field name="arch" type="xml"> + <field name="name" position="after"> + <field name="sale_order_id" string="Sale Order"/> </field> </field> </record> diff --git a/indoteknik_custom/views/quotation_so_multi_update.xml b/indoteknik_custom/views/quotation_so_multi_update.xml new file mode 100644 index 00000000..d3d310d5 --- /dev/null +++ b/indoteknik_custom/views/quotation_so_multi_update.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <data> + <record id="view_quotation_so_multi_update_form" model="ir.ui.view"> + <field name="name">Quotation Multi Update</field> + <field name="model">quotation.so.multi_update</field> + <field name="arch" type="xml"> + <form> + <sheet> + <group> + <span>Apakah Anda Yakin Ingin Mengubah Status Menjadi Cancel?</span> + </group> + </sheet> + <footer> + <button name="save_multi_update_quotation" string="Update" type="object" default_focus="1" class="oe_highlight"/> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> + </footer> + </form> + </field> + </record> + + <record id="action_quotation_so_multi_update" model="ir.actions.act_window"> + <field name="name">Quotation Multi Update</field> + <field name="res_model">quotation.so.multi_update</field> + <field name="type">ir.actions.act_window</field> + <field name="view_mode">form</field> + <field name="view_id" ref="view_quotation_so_multi_update_form"/> + <field name="target">new</field> + </record> + </data> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 04d4b854..bc098f18 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -45,6 +45,7 @@ <field name="customer_type" attrs="{'required': ['|', ('create_date', '>', '2023-06-28'), ('create_date', '=', False)]}"/> <field name="npwp" placeholder='99.999.999.9-999.999' attrs="{'required': ['|', ('create_date', '>', '2023-06-28'), ('create_date', '=', False)]}"/> <field name="sppkp" attrs="{'invisible': [('customer_type','!=','pkp')], 'required': [('customer_type', '=', 'pkp')]}"/> + <field name="email" attrs="{'required': [('create_date', '>', '2023-09-28')]}"/> <field name="due_id" readonly="1"/> <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" attrs="{'required':[('create_date', '>', '2023-09-10')]}"/> </field> @@ -61,7 +62,7 @@ </field> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" position="attributes"> <attribute name="attrs"> - {'readonly': ['|', ('applied_voucher_id', '!=', False), ('state', 'in', ('done','cancel'))]} + {'readonly': [('state', 'in', ('done','cancel'))]} </attribute> </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes"> @@ -96,6 +97,9 @@ <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before"> <field name="line_no" readonly="1" optional="hide"/> </xpath> + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="attributes"> + <attribute name="options">{'no_create': True}</attribute> + </xpath> <field name="amount_total" position="after"> <field name="grand_total"/> <label for="amount_voucher_disc" string="Voucher" /> @@ -182,5 +186,22 @@ </field> </field> </record> + + <record id="sale_order_multi_update_ir_actions_server" model="ir.actions.server"> + <field name="name">Mark As Cancel</field> + <field name="model_id" ref="sale.model_sale_order"/> + <field name="binding_model_id" ref="sale.model_sale_order"/> + <field name="binding_view_types">form,list</field> + <field name="state">code</field> + <field name="code">action = records.open_form_multi_update_state()</field> + </record> + + <record id="sale_order_update_multi_actions_server" model="ir.actions.server"> + <field name="name">Mark As Completed</field> + <field name="model_id" ref="sale.model_sale_order"/> + <field name="binding_model_id" ref="sale.model_sale_order"/> + <field name="state">code</field> + <field name="code">action = records.open_form_multi_update_status()</field> + </record> </data> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/sale_orders_multi_update.xml b/indoteknik_custom/views/sale_orders_multi_update.xml new file mode 100644 index 00000000..7f8d6a04 --- /dev/null +++ b/indoteknik_custom/views/sale_orders_multi_update.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <data> + <record id="view_sale_orders_multi_update_form" model="ir.ui.view"> + <field name="name">Sale Orders Multi Update</field> + <field name="model">sale.orders.multi_update</field> + <field name="arch" type="xml"> + <form> + <sheet> + <group> + <span>Apakah Anda Yakin Ingin Mengubah Invoice Status?</span> + </group> + </sheet> + <footer> + <button name="save_multi_update_so" string="Multi Update" type="object" default_focus="1" class="oe_highlight"/> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> + </footer> + </form> + </field> + </record> + + <record id="action_sale_orders_multi_update" model="ir.actions.act_window"> + <field name="name">Sale Orders Multi Update</field> + <field name="res_model">sale.orders.multi_update</field> + <field name="type">ir.actions.act_window</field> + <field name="view_mode">form</field> + <field name="view_id" ref="view_sale_orders_multi_update_form"/> + <field name="target">new</field> + </record> + </data> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml index 25e7f90c..d67b4474 100644 --- a/indoteknik_custom/views/users.xml +++ b/indoteknik_custom/views/users.xml @@ -12,6 +12,7 @@ <field name="is_sales_manager"/> <field name="is_leader"/> <field name="is_logistic_approver"/> + <field name="is_editor_product"/> </field> </field> </record> diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index 97634d7d..a2f5557a 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -39,7 +39,7 @@ </group> <group string="Discount Settings" attrs="{'invisible': [('apply_type', '!=', 'all')]}"> <field name="min_purchase_amount" widget="monetary" required="1" /> - <field name="discount_type" required="1" /> + <field name="discount_type" attrs="{'invisible': [('apply_type','!=','all')], 'required': [('apply_type', '=', 'all')]}" /> <label for="max_discount_amount" string="Discount Amount" /> <div class="d-flex align-items-center"> diff --git a/indoteknik_custom/views/x_banner_banner.xml b/indoteknik_custom/views/x_banner_banner.xml index be9ae951..c90e718b 100755 --- a/indoteknik_custom/views/x_banner_banner.xml +++ b/indoteknik_custom/views/x_banner_banner.xml @@ -31,7 +31,7 @@ <field name="x_status_banner" /> <field name="sequence" /> <field name="group_by_week" /> - <field name="last_update_solr" /> + <field name="last_update_solr" readonly="1"/> </group> <group> <field name="background_color" /> diff --git a/indoteknik_custom/views/x_banner_category.xml b/indoteknik_custom/views/x_banner_category.xml index 45ad7940..11feb207 100755 --- a/indoteknik_custom/views/x_banner_category.xml +++ b/indoteknik_custom/views/x_banner_category.xml @@ -24,6 +24,7 @@ <field name="x_name"/> <field name="x_banner_subtitle"/> <field name="x_studio_field_KKVl4"/> + <field name="last_update_solr" readonly="1"/> </group> <group></group> </group> @@ -49,6 +50,14 @@ </field> </record> + <record id="ir_actions_server_x_banner_category_sync_to_solr" model="ir.actions.server"> + <field name="name">Sync to solr</field> + <field name="model_id" ref="indoteknik_custom.model_x_banner_category"/> + <field name="binding_model_id" ref="indoteknik_custom.model_x_banner_category"/> + <field name="state">code</field> + <field name="code">model.action_sync_to_solr()</field> + </record> + <menuitem id="menu_banner_category" name="Banner Category" |
