diff options
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/apache_solr_queue.xml | 7 | ||||
| -rw-r--r-- | indoteknik_custom/views/cust_commision.xml | 44 | ||||
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 18 | ||||
| -rw-r--r-- | indoteknik_custom/views/ir_sequence.xml | 10 | ||||
| -rw-r--r-- | indoteknik_custom/views/promotion/promotion_monitoring.xml | 64 | ||||
| -rw-r--r-- | indoteknik_custom/views/promotion/promotion_product.xml | 45 | ||||
| -rw-r--r-- | indoteknik_custom/views/promotion/promotion_program_line.xml | 17 | ||||
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/report_logbook_sj.xml | 28 | ||||
| -rw-r--r-- | indoteknik_custom/views/role_permission/ir_model_access.xml | 16 | ||||
| -rw-r--r-- | indoteknik_custom/views/role_permission/res_groups.xml | 45 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 6 |
12 files changed, 285 insertions, 17 deletions
diff --git a/indoteknik_custom/views/apache_solr_queue.xml b/indoteknik_custom/views/apache_solr_queue.xml index 13869b4c..4c145b9f 100644 --- a/indoteknik_custom/views/apache_solr_queue.xml +++ b/indoteknik_custom/views/apache_solr_queue.xml @@ -4,11 +4,16 @@ <field name="model">apache.solr.queue</field> <field name="arch" type="xml"> <tree editable="top" default_order="create_date desc"> + <button type="object" name="open_target_record" string="" icon="fa-external-link" /> + <field name="id" readonly="1" /> <field name="display_name" readonly="1" /> <field name="res_model" readonly="1" /> <field name="res_id" readonly="1" /> <field name="function_name" readonly="1" /> - <field name="execute_status" widget="badge" readonly="1" + <field + name="execute_status" + widget="badge" + readonly="1" decoration-danger="execute_status == 'failed'" decoration-success="execute_status == 'success'" decoration-primary="execute_status == 'not_found'" diff --git a/indoteknik_custom/views/cust_commision.xml b/indoteknik_custom/views/cust_commision.xml new file mode 100644 index 00000000..dfa4adfb --- /dev/null +++ b/indoteknik_custom/views/cust_commision.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <record id="cust_commision_tree" model="ir.ui.view"> + <field name="name">cust.commision.tree</field> + <field name="model">cust.commision</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="partner_id"/> + <field name="commision_percent"/> + </tree> + </field> + </record> + + <record id="cust_commision_form" model="ir.ui.view"> + <field name="name">cust.commision.form</field> + <field name="model">cust.commision</field> + <field name="arch" type="xml"> + <form> + <sheet string="Commision"> + <group> + <group> + <field name="partner_id"/> + <field name="commision_percent"/> + </group> + </group> + </sheet> + </form> + </field> + </record> + + <record id="cust_commision_action" model="ir.actions.act_window"> + <field name="name">Commision</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">cust.commision</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem id="menu_cust_commision_sales" + name="Commision" + action="cust_commision_action" + parent="sale.product_menu_catalog" + sequence="101" + /> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 88fe1cf1..600ad192 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -8,9 +8,9 @@ <field name="number"/> <field name="date_from"/> <field name="date_to"/> - <field name="partner_ids"/> - <field name="description"/> - <field name="notification" readonly="1"/> + <field name="partner_ids" widget="many2many_tags"/> + <field name="commision_percent"/> + <field name="commision_amt" readonly="1"/> <field name="status" readonly="1"/> </tree> </field> @@ -90,10 +90,22 @@ </field> </record> + <record id="view_customer_commision_filter" model="ir.ui.view"> + <field name="name">customer.commision.list.select</field> + <field name="model">customer.commision</field> + <field name="priority" eval="15"/> + <field name="arch" type="xml"> + <search string="Search Customer Commision"> + <field name="partner_ids"/> + </search> + </field> + </record> + <record id="customer_commision_action" model="ir.actions.act_window"> <field name="name">Customer Commision</field> <field name="type">ir.actions.act_window</field> <field name="res_model">customer.commision</field> + <field name="search_view_id" ref="view_customer_commision_filter"/> <field name="view_mode">tree,form</field> </record> diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml index f276275d..d52f55ca 100644 --- a/indoteknik_custom/views/ir_sequence.xml +++ b/indoteknik_custom/views/ir_sequence.xml @@ -10,6 +10,16 @@ <field name="number_next">1</field> <field name="number_increment">1</field> </record> + + <record id="sequence_logbook_sj" model="ir.sequence"> + <field name="name">Logbook SJ</field> + <field name="code">report.logbook.sj</field> + <field name="active">TRUE</field> + <field name="prefix">LSJ/%(year)s/</field> + <field name="padding">5</field> + <field name="number_next">1</field> + <field name="number_increment">1</field> + </record> <record id="sequence_stock_picking_code" model="ir.sequence"> <field name="name">Stock Picking Code</field> diff --git a/indoteknik_custom/views/promotion/promotion_monitoring.xml b/indoteknik_custom/views/promotion/promotion_monitoring.xml new file mode 100644 index 00000000..88325c52 --- /dev/null +++ b/indoteknik_custom/views/promotion/promotion_monitoring.xml @@ -0,0 +1,64 @@ +<odoo> + <record id="promotion_monitoring_tree" model="ir.ui.view"> + <field name="name">Promotion Monitoring Tree</field> + <field name="model">promotion.monitoring</field> + <field name="arch" type="xml"> + <tree create="0"> + <field name="product_id" /> + <field name="manufacture_id" /> + <field name="price" /> + <field name="has_promo" /> + <field name="count_active" /> + <field name="count_inactive" /> + </tree> + </field> + </record> + + <record id="promotion_monitoring_form" model="ir.ui.view"> + <field name="name">Promotion Monitoring Form</field> + <field name="model">promotion.monitoring</field> + <field name="arch" type="xml"> + <form create="0" edit="0"> + <sheet> + <group> + <group> + <field name="product_id" /> + <field name="manufacture_id" /> + <field name="price" /> + <field name="has_promo" /> + <field name="count_active" /> + <field name="count_inactive" /> + </group> + </group> + </sheet> + </form> + </field> + </record> + + <record id="promotion_monitoring_view_search" model="ir.ui.view"> + <field name="name">promotion.monitoring.search</field> + <field name="model">promotion.monitoring</field> + <field name="mode">primary</field> + <field name="arch" type="xml"> + <search string="Search"> + <field name="product_id" /> + <field name="manufacture_id" /> + </search> + </field> + </record> + + <record id="promotion_monitoring_action" model="ir.actions.act_window"> + <field name="name">Promotion Monitoring</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">promotion.monitoring</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem + id="menu_promotion_monitoring" + name="Monitoring" + parent="indoteknik_custom.menu_promotion_program_parent" + sequence="3" + action="promotion_monitoring_action" + /> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/promotion/promotion_product.xml b/indoteknik_custom/views/promotion/promotion_product.xml new file mode 100644 index 00000000..eac42a45 --- /dev/null +++ b/indoteknik_custom/views/promotion/promotion_product.xml @@ -0,0 +1,45 @@ +<odoo> + <record id="promotion_product_tree" model="ir.ui.view"> + <field name="name">Promotion Product Tree</field> + <field name="model">promotion.product</field> + <field name="arch" type="xml"> + <tree> + <field name="product_id" /> + <field name="qty" /> + </tree> + </field> + </record> + + <record id="promotion_product_form" model="ir.ui.view"> + <field name="name">Promotion Product Form</field> + <field name="model">promotion.product</field> + <field name="arch" type="xml"> + <form> + <sheet> + <group> + <group> + <field name="program_line_id" /> + <field name="product_id" /> + <field name="qty" /> + </group> + </group> + </sheet> + </form> + </field> + </record> + + <record id="promotion_product_action" model="ir.actions.act_window"> + <field name="name">Promotion Product</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">promotion.product</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem + id="menu_promotion_product" + name="Product" + parent="indoteknik_custom.menu_promotion_program_parent" + sequence="3" + action="promotion_product_action" + /> +</odoo>
\ 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 index 346a08c9..025ea35a 100644 --- a/indoteknik_custom/views/promotion/promotion_program_line.xml +++ b/indoteknik_custom/views/promotion/promotion_program_line.xml @@ -22,7 +22,9 @@ <group> <group> <field name="name" /> + <field name="program_id" /> <field name="promotion_type" /> + <field name="active" readonly="1" /> </group> <group> <field name="package_limit" /> @@ -70,4 +72,19 @@ sequence="2" action="promotion_program_line_action" /> + + <data noupdate="1"> + <record id="cron_program_line_solr_flag_solr" model="ir.cron"> + <field name="name">Program Line: Solr Flag to Queue</field> + <field name="interval_number">1</field> + <field name="interval_type">hours</field> + <field name="numbercall">-1</field> + <field name="doall" eval="False"/> + <field name="model_id" ref="model_promotion_program_line"/> + <field name="code">model.solr_flag_to_queue()</field> + <field name="state">code</field> + <field name="priority">55</field> + <field name="active">True</field> + </record> + </data> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 3f7ca5a7..baff620c 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -102,7 +102,7 @@ </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_qty']" position="attributes"> - <attribute name="attrs">{'readonly': [('is_edit_product_qty', '=', False)], 'required': True}</attribute> + <attribute name="attrs">{'required': True}</attribute> </xpath> <xpath expr="//form/sheet/notebook/page[@name='purchase_delivery_invoice']" position="before"> diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml index 52e00d17..ea58aefd 100644 --- a/indoteknik_custom/views/report_logbook_sj.xml +++ b/indoteknik_custom/views/report_logbook_sj.xml @@ -6,10 +6,11 @@ <field name="arch" type="xml"> <tree create="0"> <field name="name"/> + <field name="approve_by"/> <field name="date"/> - <field name="name_picking"/> + <field name="date_approve"/> <field name="approve_by_finance"/> - <field name="partner_id"/> + <field name="state"/> </tree> </field> </record> @@ -18,12 +19,16 @@ <field name="name">report.logbook.sj.line.tree</field> <field name="model">report.logbook.sj.line</field> <field name="arch" type="xml"> - <tree> - <field name="product_id"/> - <field name="location_id"/> - <field name="product_uom_qty"/> - <field name="qty_done"/> - <field name="product_uom_id"/> + <tree editable="bottom"> + <field name="name"/> + <field name="driver_id"/> + <field name="departure_date"/> + <field name="arrival_date"/> + <field name="carrier_id"/> + <field name="tracking_no"/> + <field name="partner_id"/> + <field name="picking_id"/> + <field name="not_exist"/> </tree> </field> </record> @@ -35,7 +40,7 @@ <form> <header> <button name="approve" - string="Approve" + string="Validate" type="object" /> </header> @@ -45,11 +50,12 @@ <group> <field name="name" readonly="1"/> <field name="date" readonly="1"/> + <field name="date_approve" readonly="1"/> </group> <group> - <field name="name_picking" readonly="1"/> - <field name="partner_id" readonly="1"/> <field name="approve_by_finance" readonly="1"/> + <field name="state" readonly="1"/> + <field name="approve_by" readonly="1"/> </group> </group> <notebook> diff --git a/indoteknik_custom/views/role_permission/ir_model_access.xml b/indoteknik_custom/views/role_permission/ir_model_access.xml new file mode 100644 index 00000000..0c74d5e2 --- /dev/null +++ b/indoteknik_custom/views/role_permission/ir_model_access.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <data> + <record id="ir_model_access_tree_view_inherit" model="ir.ui.view"> + <field name="name">Access Rights</field> + <field name="model">ir.model.access</field> + <field name="inherit_id" ref="base.ir_access_view_tree_edition"/> + <field name="arch" type="xml"> + <field name="perm_unlink" position="after"> + <field name="perm_import"/> + <field name="perm_export"/> + </field> + </field> + </record> + </data> +</odoo> diff --git a/indoteknik_custom/views/role_permission/res_groups.xml b/indoteknik_custom/views/role_permission/res_groups.xml new file mode 100644 index 00000000..910469fd --- /dev/null +++ b/indoteknik_custom/views/role_permission/res_groups.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <data> + <record model="ir.module.category" id="module_category_roles"> + <field name="name">Roles</field> + <field name="sequence">70</field> + <field name="visible" eval="0" /> + </record> + + <record id="group_role_it" model="res.groups"> + <field name="name">IT</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_fat" model="res.groups"> + <field name="name">FAT</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_sales" model="res.groups"> + <field name="name">Sales</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_marketing" model="res.groups"> + <field name="name">Marketing</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_purchasing" model="res.groups"> + <field name="name">Purchasing</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_logistic" model="res.groups"> + <field name="name">Logistic</field> + <field name="category_id" ref="module_category_roles" /> + </record> + + <record id="group_role_merchandiser" model="res.groups"> + <field name="name">Merchandiser</field> + <field name="category_id" ref="module_category_roles" /> + </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 02dba7d5..aa508443 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -109,11 +109,15 @@ <field name="line_no" readonly="1" optional="hide"/> </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='qty_delivered']" position="before"> - <field name="qty_reserved" readonly="1"/> + <field name="qty_reserved" invisible="1"/> + <field name="reserved_from" 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> + <!-- <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='tax_id']" position="attributes"> + <attribute name="required">1</attribute> + </xpath> --> <field name="amount_total" position="after"> <field name="grand_total"/> <label for="amount_voucher_disc" string="Voucher" /> |