diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2025-05-23 02:11:28 +0000 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2025-05-23 02:11:28 +0000 |
| commit | 957004adc73e524667800457f3db9fb6793edeac (patch) | |
| tree | 1824b9ee589f2b54657ab75f539b2f7d02224e7c /indoteknik_custom/views | |
| parent | 92b6da28414fed56732f86e1f04ea2fac3464d7d (diff) | |
| parent | 558130bbf48c33ddfa6080450c80bc8801a570f0 (diff) | |
Merged in CR/form-merchant (pull request #310)odoo-production
odoo quotation view & merchant view
Diffstat (limited to 'indoteknik_custom/views')
27 files changed, 1346 insertions, 431 deletions
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 17263c3a..46737a40 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -92,6 +92,7 @@ <field name="is_efaktur_exported" optional="hide"/> <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/> <field name="new_invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/> + <field name="length_of_payment" optional="hide"/> <field name="mark_upload_efaktur" optional="hide" widget="badge" decoration-danger="mark_upload_efaktur == 'belum_upload'" decoration-success="mark_upload_efaktur == 'sudah_upload'" /> diff --git a/indoteknik_custom/views/approval_invoice_date.xml b/indoteknik_custom/views/approval_invoice_date.xml new file mode 100644 index 00000000..31f346e7 --- /dev/null +++ b/indoteknik_custom/views/approval_invoice_date.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <record id="approval_invoice_date_tree" model="ir.ui.view"> + <field name="name">approval.invoice.date.tree</field> + <field name="model">approval.invoice.date</field> + <field name="arch" type="xml"> + <tree> + <field name="number"/> + <field name="picking_id"/> + <field name="partner_id"/> + <field name="sale_id"/> + <field name="date_doc_do"/> + <field name="date_invoice"/> + <field name="state" widget="badge" decoration-danger="state == 'cancel'" + decoration-success="state == 'done'" + decoration-info="state == 'draft'"/> + <field name="approve_date"/> + <field name="approve_by"/> + <field name="create_uid"/> + </tree> + </field> + </record> + + <record id="approval_invoice_date_form" model="ir.ui.view"> + <field name="name">approval.invoice.date.form</field> + <field name="model">approval.invoice.date</field> + <field name="arch" type="xml"> + <form> + <header> + <button name="button_approve" + string="Approve" + type="object" + attrs="{'invisible': [('state', '=', 'done')]}" + /> + <button name="button_cancel" + string="Cancel" + type="object" + attrs="{'invisible': [('state', '=', 'cancel')]}" + /> + <field name="state" widget="statusbar" + statusbar_visible="draft,cancel,done" + statusbar_colors='{"cancel":"red", "done":"green"}'/> + </header> + <sheet string="Approval Invoice Date"> + <group> + <group> + <field name="number"/> + <field name="picking_id"/> + <field name="partner_id"/> + <field name="sale_id"/> + <field name="move_id"/> + <field name="date_doc_do"/> + <field name="date_invoice"/> + <field name="approve_date"/> + <field name="approve_by"/> + <field name="create_uid"/> + <field name="note" attrs="{'invisible': [('state', '!=', 'cancel')]}"/> + </group> + </group> + </sheet> + </form> + </field> + </record> + + <record id="view_approval_invoice_date_filter" model="ir.ui.view"> + <field name="name">approval.invoice.date.list.select</field> + <field name="model">approval.invoice.date</field> + <field name="priority" eval="15"/> + <field name="arch" type="xml"> + <search string="Search Approval Invoice Date"> + <field name="number"/> + <field name="partner_id"/> + <field name="picking_id"/> + <field name="sale_id"/> + </search> + </field> + </record> + + <record id="approval_invoice_date_action" model="ir.actions.act_window"> + <field name="name">Approval Invoice Date</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">approval.invoice.date</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem id="menu_approval_invoice_date" name="Approval Invoice Date" + parent="account.menu_finance_receivables" + action="approval_invoice_date_action" + sequence="100" + /> + +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/barcoding_product.xml b/indoteknik_custom/views/barcoding_product.xml index c7473d39..55876580 100644 --- a/indoteknik_custom/views/barcoding_product.xml +++ b/indoteknik_custom/views/barcoding_product.xml @@ -34,12 +34,13 @@ <group> <field name="product_id" required="1"/> <field name="type" required="1"/> - <field name="quantity" attrs="{'invisible': [['type', 'in', ('barcoding')]], 'required': [['type', 'not in', ('barcoding')]]}"/> + <field name="quantity" attrs="{'invisible': [['type', 'in', ('barcoding','barcoding_box')]], 'required': [['type', 'not in', ('barcoding')]]}"/> <field name="barcode" attrs="{'invisible': [['type', 'in', ('print')]], 'required': [['type', 'not in', ('print')]]}"/> + <field name="qty_pcs_box" attrs="{'invisible': [['type', 'in', ('print','barcoding')]], 'required': [['type', 'not in', ('print', 'barcoding')]]}"/> </group> </group> <notebook> - <page string="Line" attrs="{'invisible': [['type', 'in', ('barcoding')]]}"> + <page string="Line" attrs="{'invisible': [['type', 'in', ('barcoding','barcoding_box')]]}"> <field name="barcoding_product_line"/> </page> </notebook> diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 51172b1c..37df16ff 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -11,12 +11,15 @@ <field name="partner_ids" widget="many2many_tags"/> <field name="commision_percent"/> <field name="commision_amt" readonly="1"/> - <field name="status" readonly="1"/> + <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" + optional="show"/> <field name="payment_status" readonly="1" - decoration-success="payment_status == 'payment'" - decoration-danger="payment_status == 'pending'" - widget="badge"/> + decoration-success="payment_status == 'payment'" + decoration-danger="payment_status == 'pending'" + widget="badge"/> <field name="brand_ids" widget="many2many_tags"/> + <field name="grouped_so_number" readonly="1" optional="hide"/> + <field name="grouped_invoice_number" readonly="1" optional="hide"/> </tree> </field> </record> @@ -28,10 +31,12 @@ <tree editable="top" create="false"> <field name="partner_id" readonly="1"/> <field name="invoice_id" readonly="1"/> + <field name="sale_order_id" readonly="1"/> <field name="state" readonly="1"/> <field name="product_id" readonly="1" optional="hide"/> <field name="dpp" readonly="1"/> <field name="total_percent_margin" readonly="1"/> + <field name="total_margin_excl_third_party" readonly="1"/> <field name="tax" readonly="1" optional="hide"/> <field name="total" readonly="1" optional="hide"/> </tree> @@ -43,65 +48,112 @@ <field name="model">customer.commision</field> <field name="arch" type="xml"> <form> + <!-- attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"--> <header> - <button name="action_confirm_customer_commision" - string="Confirm" type="object" - options="{}"/> + <button name="action_confirm_customer_commision" + string="Confirm" type="object" + attrs="{'invisible': [('status', 'in', ['approved','reject'])]}" + options="{}"/> + <button name="action_reject" + string="Reject" + attrs="{'invisible': [('status', 'in', ['approved','reject'])]}" + type="object"/> + <button name="button_draft" + string="Reset to Draft" + attrs="{'invisible': [('status', '!=', 'reject')]}" + type="object"/> <button name="action_confirm_customer_payment" - string="Konfirmasi Pembayaran" type="object" - options="{}" - attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/> + string="Konfirmasi Pembayaran" type="object" + options="{}" + attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/> + <field name="status" widget="statusbar" + statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved" + statusbar_colors='{"reject":"red"}'/> </header> <sheet string="Customer Commision"> - <div class="oe_button_box" name="button_box"/> + <div class="oe_button_box" name="button_box"/> + <group> <group> + <field name="number"/> + <field name="date_from"/> + <field name="partner_ids" widget="many2many_tags"/> + <field name="description"/> + <field name="commision_percent"/> + <field name="commision_amt"/> + <field name="commision_amt_text"/> + <field name="grouped_so_number" readonly="1"/> + <field name="grouped_invoice_number" readonly="1"/> + <field name="approved_by" readonly="1"/> + </group> + <group> + <div> + <button name="generate_customer_commision" + string="Generate Line" + type="object" + class="mr-2 oe_highlight" + /> + </div> + <field name="date_to"/> + <field name="sales_id"/> + <field name="commision_type"/> + <field name="brand_ids" widget="many2many_tags"/> + <field name="notification" readonly="1"/> + <!-- <field name="status" readonly="1"/>--> + <field name="payment_status" readonly="1"/> + <field name="total_dpp"/> + </group> + </group> + <notebook> + <page string="Lines"> + <field name="commision_lines"/> + </page> + <page string="Other Info" name="customer_commision_info"> <group> - <field name="number"/> - <field name="date_from"/> - <field name="partner_ids" widget="many2many_tags"/> - <field name="description"/> - <field name="commision_percent"/> - <field name="commision_amt"/> + <field name="bank_name"/> + <field name="account_name"/> + <field name="bank_account"/> + <field name="note_transfer"/> </group> + </page> + <page string="Finance Notes"> <group> - <div> - <button name="generate_customer_commision" - string="Generate Line" - type="object" - class="mr-2 oe_highlight" - /> - </div> - <field name="date_to"/> - <field name="commision_type"/> - <field name="brand_ids" widget="many2many_tags"/> - <field name="notification" readonly="1"/> - <field name="status" readonly="1"/> - <field name="payment_status" readonly="1" /> - <field name="total_dpp"/> + <field name="note_finnance"/> </group> - </group> - <notebook> - <page string="Lines"> - <field name="commision_lines"/> - </page> - <page string="Other Info" name="customer_commision_info"> - <group> - <field name="bank_name"/> - <field name="account_name"/> - <field name="bank_account"/> - <field name="note_transfer"/> - </group> - </page> - </notebook> - </sheet> - <div class="oe_chatter"> - <field name="message_follower_ids" widget="mail_followers"/> - <field name="message_ids" widget="mail_thread"/> - </div> + </page> + </notebook> + </sheet> + <div class="oe_chatter"> + <field name="message_follower_ids" widget="mail_followers"/> + <field name="message_ids" widget="mail_thread"/> + </div> </form> </field> </record> + <!-- Wizard for Reject Reason --> + <record id="view_reject_reason_wizard_form" model="ir.ui.view"> + <field name="name">reject.reason.commision.form</field> + <field name="model">reject.reason.commision</field> + <field name="arch" type="xml"> + <form string="Reject Reason"> + <group> + <field name="reason_reject" widget="text"/> + </group> + <footer> + <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> + </footer> + </form> + </field> + </record> + + <record id="action_reject_reason_wizard" model="ir.actions.act_window"> + <field name="name">Reject Reason</field> + <field name="res_model">reject.reason.commision</field> + <field name="view_mode">form</field> + <field name="target">new</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> @@ -109,7 +161,12 @@ <field name="arch" type="xml"> <search string="Search Customer Commision"> <field name="partner_ids"/> - </search> + <group expand="0" string="Group By"> + <filter string="Partner" name="group_partner" + domain="[]" + context="{'group_by':'partner_ids'}"/> + </group> + </search> </field> </record> @@ -122,17 +179,17 @@ </record> <menuitem id="menu_customer_commision_acct" - name="Customer Commision" - action="customer_commision_action" - parent="account.menu_finance_entries" - sequence="113" + name="Customer Commision" + action="customer_commision_action" + parent="account.menu_finance_entries" + sequence="113" /> <menuitem id="menu_customer_commision_sales" - name="Customer Commision" - action="customer_commision_action" - parent="sale.product_menu_catalog" - sequence="101" + name="Customer Commision" + action="customer_commision_action" + parent="sale.product_menu_catalog" + sequence="101" /> <record id="customer_rebate_tree" model="ir.ui.view"> @@ -166,34 +223,34 @@ <field name="arch" type="xml"> <form> <sheet string="Customer Rebate"> - <div class="oe_button_box" name="button_box"/> + <div class="oe_button_box" name="button_box"/> + <group> <group> - <group> - <field name="date_from"/> - <field name="partner_id"/> - <field name="target_1st"/> - <field name="target_2nd"/> - <field name="dpp_q1"/> - <field name="dpp_q2"/> - <field name="dpp_q3"/> - <field name="dpp_q4"/> - </group> - <group> - <field name="date_to"/> - <field name="description"/> - <field name="achieve_1"/> - <field name="achieve_2"/> - <field name="status_q1"/> - <field name="status_q2"/> - <field name="status_q3"/> - <field name="status_q4"/> - </group> + <field name="date_from"/> + <field name="partner_id"/> + <field name="target_1st"/> + <field name="target_2nd"/> + <field name="dpp_q1"/> + <field name="dpp_q2"/> + <field name="dpp_q3"/> + <field name="dpp_q4"/> + </group> + <group> + <field name="date_to"/> + <field name="description"/> + <field name="achieve_1"/> + <field name="achieve_2"/> + <field name="status_q1"/> + <field name="status_q2"/> + <field name="status_q3"/> + <field name="status_q4"/> </group> - </sheet> - <div class="oe_chatter"> - <field name="message_follower_ids" widget="mail_followers"/> - <field name="message_ids" widget="mail_thread"/> - </div> + </group> + </sheet> + <div class="oe_chatter"> + <field name="message_follower_ids" widget="mail_followers"/> + <field name="message_ids" widget="mail_thread"/> + </div> </form> </field> </record> @@ -206,16 +263,16 @@ </record> <menuitem id="menu_customer_rebate_acct" - name="Customer Rebate" - action="customer_rebate_action" - parent="account.menu_finance_entries" - sequence="114" + name="Customer Rebate" + action="customer_rebate_action" + parent="account.menu_finance_entries" + sequence="114" /> <menuitem id="menu_customer_rebate_sales" - name="Customer Rebate" - action="customer_rebate_action" - parent="sale.product_menu_catalog" - sequence="102" + name="Customer Rebate" + action="customer_rebate_action" + parent="sale.product_menu_catalog" + sequence="102" /> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml index dfb56100..97bf40bb 100644 --- a/indoteknik_custom/views/ir_sequence.xml +++ b/indoteknik_custom/views/ir_sequence.xml @@ -21,6 +21,16 @@ <field name="number_increment">1</field> </record> + <record id="sequence_invoice_date" model="ir.sequence"> + <field name="name">Approval Invoice Date</field> + <field name="code">approval.invoice.date</field> + <field name="active">TRUE</field> + <field name="prefix">AID/%(year)s/</field> + <field name="padding">5</field> + <field name="number_next">1</field> + <field name="number_increment">1</field> + </record> + <record id="sequence_vendor_approval" model="ir.sequence"> <field name="name">Vendor Approval</field> <field name="code">vendor.approval</field> @@ -55,7 +65,7 @@ <field name="name">Shipment Group</field> <field name="code">shipment.group</field> <field name="active">TRUE</field> - <field name="prefix">SG/%(year)s/</field> + <field name="prefix">SGR/%(year)s/</field> <field name="padding">5</field> <field name="number_next">1</field> <field name="number_increment">1</field> diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml index f81d65e8..3de52a08 100644 --- a/indoteknik_custom/views/mrp_production.xml +++ b/indoteknik_custom/views/mrp_production.xml @@ -5,9 +5,38 @@ <field name="model">mrp.production</field> <field name="inherit_id" ref="mrp.mrp_production_form_view" /> <field name="arch" type="xml"> + <button name="button_mark_done" position="after"> + <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': ['|', ('state', '!=', 'confirmed'), ('is_po', '=', True)]}"/> + </button> <field name="bom_id" position="after"> <field name="desc"/> + <field name="sale_order"/> + <field name="is_po"/> </field> + <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before"> + <field name="vendor_id"/> + </xpath> + <xpath expr="//form/sheet/notebook/page[@name='miscellaneous']" position="after"> + <page string="Purchase Match" name="purchase_order_lines_indent"> + <field name="production_purchase_match"/> + </page> + <page string="Check Product" name="check_bom_product"> + <field name="check_bom_product_lines"/> + </page> + </xpath> + </field> + </record> + + <record id="check_bom_product_tree" model="ir.ui.view"> + <field name="name">check.bom.product.tree</field> + <field name="model">check.bom.product</field> + <field name="arch" type="xml"> + <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'"> + <field name="code_product"/> + <field name="product_id"/> + <field name="quantity"/> + <field name="status" readonly="1"/> + </tree> </field> </record> @@ -18,7 +47,24 @@ <field name="arch" type="xml"> <field name="product_id" position="after"> <field name="desc"/> + <field name="sale_order"/> + </field> + <field name="state" position="after"> + <field name="state_reserve" optional="hide"/> + <field name="date_reserved" optional="hide"/> </field> </field> </record> + + <record id="production_purchase_match_tree" model="ir.ui.view"> + <field name="name">production.purchase.match.tree</field> + <field name="model">production.purchase.match</field> + <field name="arch" type="xml"> + <tree> + <field name="order_id" readonly="1"/> + <field name="vendor" readonly="1"/> + <field name="total" readonly="1"/> + </tree> + </field> + </record> </odoo> diff --git a/indoteknik_custom/views/product_pricelist.xml b/indoteknik_custom/views/product_pricelist.xml index 6eff0153..3c2b8b8d 100644 --- a/indoteknik_custom/views/product_pricelist.xml +++ b/indoteknik_custom/views/product_pricelist.xml @@ -20,6 +20,7 @@ <field name="banner_top" widget="image" /> <field name="start_date" attrs="{'required': [('is_flash_sale', '=', True)]}" /> <field name="end_date" attrs="{'required': [('is_flash_sale', '=', True)]}" /> + <field name="number" required="1" /> </group> </group> </page> diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml index 71748e44..b214dc87 100644 --- a/indoteknik_custom/views/product_product.xml +++ b/indoteknik_custom/views/product_product.xml @@ -31,6 +31,14 @@ <field name="code">model.action_sync_to_solr()</field> </record> + <record id="ir_actions_server_product_sla_generate" model="ir.actions.server"> + <field name="name">Generate Product SLA</field> + <field name="model_id" ref="product.model_product_product"/> + <field name="binding_model_id" ref="product.model_product_product"/> + <field name="state">code</field> + <field name="code">model.generate_product_sla()</field> + </record> + <data noupdate="1"> <record id="cron_variant_solr_flag_solr" model="ir.cron"> <field name="name">Sync Variant To Solr: Solr Flag 2</field> diff --git a/indoteknik_custom/views/product_sla.xml b/indoteknik_custom/views/product_sla.xml index 8b0e874b..9179730f 100644 --- a/indoteknik_custom/views/product_sla.xml +++ b/indoteknik_custom/views/product_sla.xml @@ -6,7 +6,9 @@ <field name="arch" type="xml"> <tree create="false"> <field name="product_variant_id"/> - <field name="avg_leadtime"/> + <field name="sla_vendor_id" string="Name Vendor"/> + <field name="sla_vendor_duration" string="SLA Vendor"/> + <field name="sla_logistic_duration_unit" string="SLA Logistic"/> <field name="sla"/> </tree> </field> @@ -21,7 +23,8 @@ <group> <group> <field name="product_variant_id"/> - <field name="avg_leadtime"/> + <field name="sla_logistic"/> + <field name="sla_logistic_unit"/> <field name="sla"/> <field name="version"/> </group> diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml index af21984a..8f9d1190 100755 --- a/indoteknik_custom/views/product_template.xml +++ b/indoteknik_custom/views/product_template.xml @@ -53,6 +53,21 @@ <field name="supplier_taxes_id" position="after"> <field name="supplier_url" widget="url"/> </field> + <notebook position="inside"> + <page string="Image Carousel"> + <field name="image_carousel_lines"/> + </page> + </notebook> + </field> + </record> + + <record id="image_carousel_tree" model="ir.ui.view"> + <field name="name">image.carousel.tree</field> + <field name="model">image.carousel</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="image" widget="image" width="80"/> + </tree> </field> </record> @@ -62,6 +77,8 @@ <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> <field name="last_update_solr" position="after"> + <field name="barcode_box" /> + <field name="qty_pcs_box" /> <field name="clean_website_description" /> <field name="qr_code_variant" widget="image" readonly="True"/> </field> diff --git a/indoteknik_custom/views/project_views.xml b/indoteknik_custom/views/project_views.xml new file mode 100644 index 00000000..3023fa18 --- /dev/null +++ b/indoteknik_custom/views/project_views.xml @@ -0,0 +1,13 @@ +<odoo> + <record id="view_task_kanban_inherit" model="ir.ui.view"> + <field name="name">project.task.kanban.inherit</field> + <field name="model">project.task</field> + <field name="inherit_id" ref="project.view_task_kanban"/> + <field name="arch" type="xml"> + <!-- Target field user_id di bagian kanban_bottom_right --> + <xpath expr="//div[@class='oe_kanban_bottom_right']/field[@name='user_id']" position="attributes"> + <attribute name="widget" remove="many2one_avatar_user" /> + </xpath> + </field> + </record> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/public_holiday.xml b/indoteknik_custom/views/public_holiday.xml new file mode 100644 index 00000000..146c5b0b --- /dev/null +++ b/indoteknik_custom/views/public_holiday.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<odoo> + <data> + <!-- Security Access Rights --> + <record id="model_hr_public_holiday_access" model="ir.model.access"> + <field name="name">hr.public.holiday access</field> + <field name="model_id" ref="model_hr_public_holiday"/> + <field name="group_id" eval="False"/> + <field name="perm_read" eval="True"/> + <field name="perm_write" eval="True"/> + <field name="perm_create" eval="True"/> + <field name="perm_unlink" eval="True"/> + </record> + + <!-- Public Holiday Form View --> + <record id="view_hr_public_holiday_form" model="ir.ui.view"> + <field name="name">hr.public.holiday.form</field> + <field name="model">hr.public.holiday</field> + <field name="arch" type="xml"> + <form string="Public Holiday"> + <sheet> + <group> + <field name="name"/> + <field name="start_date"/> + </group> + </sheet> + </form> + </field> + </record> + + <record id="view_hr_public_holiday_tree" model="ir.ui.view"> + <field name="name">hr.public.holiday.tree</field> + <field name="model">hr.public.holiday</field> + <field name="arch" type="xml"> + <tree string="Public Holidays"> + <field name="name"/> + <field name="start_date"/> + </tree> + </field> + </record> + <record id="action_hr_public_holiday" model="ir.actions.act_window"> + <field name="name">Public Holidays</field> + <field name="res_model">hr.public.holiday</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem + id="hr_public_holiday" + name="Public Holiday" + parent="website_sale.menu_orders" + sequence="1" + action="action_hr_public_holiday" + /> + </data> +</odoo> diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 36c0db13..b58139c6 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -65,6 +65,7 @@ <field name="payment_term_id"/> <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/> <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/> + <field name="product_bom_id"/> </field> <field name="amount_total" position="after"> <field name="total_margin"/> @@ -139,7 +140,7 @@ </field> <field name="order_line" position="attributes"> - <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute> + <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['purchase', '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"> @@ -307,6 +308,7 @@ <field name="margin_item" optional="hide"/> <field name="delivery_amt" optional="hide"/> <field name="margin_deduct" optional="hide"/> + <field name="hold_outgoing_so" optional="hide"/> <field name="margin_so"/> </tree> </field> diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml index 16f1bedd..bb1c7643 100644 --- a/indoteknik_custom/views/purchasing_job.xml +++ b/indoteknik_custom/views/purchasing_job.xml @@ -17,6 +17,7 @@ <field name="status_apo" invisible="1"/> <field name="action"/> <field name="note"/> + <field name="date_po"/> </tree> </field> </record> diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index af5e0db3..5160523f 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -131,6 +131,7 @@ <group string="Pengiriman" colspan="4"> <group> <field name="pic_name"/> + <field name="pic_mobile"/> <field name="street_pengiriman"/> <field name="state_id_pengiriman"/> <field name="city_id_pengiriman"/> @@ -140,6 +141,7 @@ </group> <group> <field name="invoice_pic"/> + <field name="invoice_pic_mobile"/> <field name="street_invoice"/> <field name="state_id_invoice"/> <field name="city_id_invoice"/> @@ -150,6 +152,7 @@ <group> <field name="tukar_invoice"/> <field name="jadwal_bayar"/> + <field name="dokumen_prosedur" /> <field name="dokumen_pengiriman"/> <field name="dokumen_pengiriman_input"/> <field name="dokumen_invoice"/> @@ -187,6 +190,66 @@ </group> </page> </notebook> + <notebook> + <page string="Merchant"> + <group> + <group string="Informasi Perusahaan"> + <field name="name_merchant" /> + <field name="pejabat_name" /> + <field name="pic_merchant" /> + <field name="pic_position" /> + <field name="address_merchant" /> + <field name="state_merchant" /> + <field name="city_merchant" /> + <field name="district_merchant" /> + <field name="subDistrict_merchant" /> + <field name="zip_merchant" /> + <field name="bank_name_merchant" /> + <field name="rekening_name_merchant" /> + <field name="account_number_merchant" /> + <field name="email_company_merchant" widget="email"/> + <field name="email_sales_merchant" widget="email"/> + <field name="email_finance_merchant" widget="email"/> + <field name="phone_merchant" widget="phone"/> + <field name="mobile_merchant" widget="phone"/> + <field name="bisnis_type" /> + <field name="website_merchant" /> + <field name="category_perusahaan" /> + </group> + <group string="Syarat Perdagangan"> + <field name="is_kembali_barang" /> + <field name="tenggat_waktu" /> + <field name="sertifikat_produk" /> + <field name="tempo_garansi" /> + <field name="explain_garansi" /> + <field name="is_order_quantity" /> + </group> + <group string="Informasi Vendor"> + <field name="harga_tayang" /> + <field name="category_produk_ids_merchant" widget="many2many_tags" /> + <field name="merk_dagang" /> + <field name="is_pengajuan_tempo" /> + <field name="tempo_duration_merchant" /> + <field name="kredit_limit" /> + <field name="waktu_pengiriman" /> + <field name="terhitung_sejak" /> + </group> + <group string="Dokumen"> + <field name="file_npwp" /> + <field name="file_sppkp" /> + <field name="file_dokumenKtpDirut" /> + <field name="file_kartuNama" /> + <field name="file_suratPernyataan" /> + <field name="file_fotoKantor" /> + <field name="file_dataProduk" /> + <field name="file_pricelist" /> + </group> + <group> +<!-- <field name="description" />--> + </group> + </group> + </page> + </notebook> </field> </record> </data> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 163330c5..5af3f4a2 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -1,174 +1,226 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <odoo> <data> <record id="sale_order_form_view_inherit" model="ir.ui.view"> <field name="name">Sale Order</field> <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_order_form"/> + <field name="inherit_id" ref="sale.view_order_form" /> <field name="arch" type="xml"> <button id="action_confirm" position="after"> <button name="calculate_line_no" - string="Create No" - type="object" + string="Create No" + type="object" /> <button name="sale_order_approve" - string="Ask Approval" - type="object" - attrs="{'invisible': [('approval_status', '=', ['approved'])]}" + string="Ask Approval" + type="object" + attrs="{'invisible': [('approval_status', '=', ['approved'])]}" + /> + <button name="hold_unhold_qty_outgoing_so" + string="Hold/Unhold Outgoing" + type="object" + attrs="{'invisible': [('state', 'in', ['cancel'])]}" + /> + <button name="ask_retur_cancel_purchasing" + string="Ask Cancel Purchasing" + type="object" + attrs="{'invisible': [('state', 'in', ['cancel'])]}" /> <button name="action_web_approve" - string="Web Approve" - type="object" - attrs="{'invisible': ['|', '|', ('create_uid', '!=', 25), ('web_approval', '!=', False), ('state', '!=', 'draft')]}" + string="Web Approve" + type="object" + attrs="{'invisible': ['|', '|', ('create_uid', '!=', 25), ('web_approval', '!=', False), ('state', '!=', 'draft')]}" /> - <button name="indoteknik_custom.action_view_uangmuka_penjualan" string="UangMuka" - type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/> + <button name="indoteknik_custom.action_view_uangmuka_penjualan" + string="UangMuka" + type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}" /> </button> <field name="payment_term_id" position="after"> - <field name="create_uid" invisible="1"/> - <field name="create_date" invisible="1"/> - <field name="shipping_cost_covered" attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}"/> - <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}"/> - <field name="delivery_amt"/> - <field name="fee_third_party"/> - <field name="total_percent_margin"/> - <field name="type_promotion"/> - <label for="voucher_id"/> + <field name="create_uid" invisible="1" /> + <field name="create_date" invisible="1" /> + <field name="shipping_cost_covered" + attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}" /> + <field name="shipping_paid_by" + attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}" /> + <field name="delivery_amt" /> + <field name="ongkir_ke_xpdc" /> + <field name="metode_kirim_ke_xpdc" /> + <field name="fee_third_party" /> + <field name="biaya_lain_lain" /> + <field name="total_percent_margin" /> + <field name="total_margin_excl_third_party" readonly="1" /> + <field name="type_promotion" /> + <label for="voucher_id" /> <div class="o_row"> - <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/> + <field name="voucher_id" id="voucher_id" + attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}" /> <field name="applied_voucher_id" invisible="1" /> - <button name="action_apply_voucher" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" + <button name="action_apply_voucher" type="object" string="Apply" + confirm="Anda yakin untuk menggunakan voucher?" + help="Apply the selected voucher" class="btn-link mb-1 px-0" + icon="fa-plus" attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}" /> - <button name="cancel_voucher" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" + <button name="cancel_voucher" type="object" string="Cancel" + confirm="Anda yakin untuk membatalkan penggunaan voucher?" + help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}" /> </div> - <label for="voucher_shipping_id"/> + <label for="voucher_shipping_id" /> <div class="o_row"> - <field name="voucher_shipping_id" id="voucher_shipping_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"/> + <field name="voucher_shipping_id" id="voucher_shipping_id" + attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}" /> <field name="applied_voucher_shipping_id" invisible="1" /> - <button name="action_apply_voucher_shipping" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" + <button name="action_apply_voucher_shipping" type="object" string="Apply" + confirm="Anda yakin untuk menggunakan voucher?" + help="Apply the selected voucher" class="btn-link mb-1 px-0" + icon="fa-plus" attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}" /> - <button name="cancel_voucher_shipping" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" + <button name="cancel_voucher_shipping" type="object" string="Cancel" + confirm="Anda yakin untuk membatalkan penggunaan voucher?" + help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" attrs="{'invisible': ['|', ('applied_voucher_shipping_id', '=', False), ('state', 'not in', ['draft','sent'])]}" /> </div> <button name="calculate_selling_price" - string="Calculate Selling Price" - type="object" + string="Calculate Selling Price" + type="object" /> </field> <field name="source_id" position="attributes"> <attribute name="invisible">1</attribute> </field> <field name="user_id" position="after"> - <field name="helper_by_id" readonly="1"/> - <field name="compute_fullfillment" invisible="1"/> + <field name="hold_outgoing" readonly="1" /> + <field name="helper_by_id" readonly="1" /> + <field name="compute_fullfillment" invisible="1" /> </field> <field name="tag_ids" position="after"> - <field name="eta_date" readonly="1"/> - <field name="flash_sale"/> - <field name="margin_after_delivery_purchase"/> - <field name="percent_margin_after_delivery_purchase"/> - <field name="total_weight"/> - <field name="pareto_status"/> + <field name="eta_date_start" /> + <t t-esc="' to '" /> + <field name="eta_date" readonly="1" /> + <field name="expected_ready_to_ship" /> + <field name="ready_to_ship_status_detail"/> + <field name="flash_sale" /> + <field name="margin_after_delivery_purchase" /> + <field name="percent_margin_after_delivery_purchase" /> + <field name="total_weight" /> + <field name="pareto_status" /> </field> <field name="analytic_account_id" position="after"> - <field name="customer_type" required="1"/> - <field name="npwp" placeholder='99.999.999.9-999.999' required="1"/> - <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/> - <field name="email" required="1"/> - <field name="unreserve_id"/> - <field name="due_id" readonly="1"/> - <field name="vendor_approval_id" readonly="1" widget="many2many_tags"/> - <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/> + <field name="customer_type" readonly="1" /> + <field name="npwp" placeholder='99.999.999.9-999.999' readonly="1" /> + <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}" readonly="1" /> + <field name="email" required="1" /> + <field name="unreserve_id" /> + <field name="due_id" readonly="1" /> + <field name="vendor_approval_id" readonly="1" widget="many2many_tags" /> + <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1" /> <button name="override_allow_create_invoice" - string="Override Create Invoice" - type="object" + string="Override Create Invoice" + type="object" /> - <button string="Estimate Shipping" type="object" name="action_estimate_shipping"/> + <button string="Estimate Shipping" type="object" name="action_estimate_shipping" /> </field> <field name="partner_shipping_id" position="after"> - <field name="real_shipping_id"/> - <field name="real_invoice_id"/> + <field name="real_shipping_id" /> + <field name="real_invoice_id" /> <field name="approval_status" /> - <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/> - <field name="carrier_id" required="1"/> - <field name="delivery_service_type" readonly="1"/> + <field name="sales_tax_id" + domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" /> + <field name="carrier_id" required="1" /> + <field name="delivery_service_type" readonly="1" /> + <field name="shipping_option_id" /> </field> <field name="medium_id" position="after"> - <field name="date_doc_kirim" readonly="1"/> - <field name="notification" readonly="1"/> + <field name="date_doc_kirim" readonly="1" /> + <field name="notification" readonly="1" /> </field> - <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" position="attributes"> + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" + position="attributes"> <attribute name="attrs"> {'readonly': [('state', 'in', ('done','cancel'))]} </attribute> </xpath> - <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree" position="inside"> - <field name="desc_updatable" invisible="1"/> + <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree" + position="inside"> + <field name="desc_updatable" invisible="1" /> </xpath> - <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']" position="attributes"> + <xpath + expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']" + position="attributes"> <attribute name="modifiers"> {'readonly': [('desc_updatable', '=', False)]} </attribute> </xpath> - <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes"> + <xpath + expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" + position="attributes"> <attribute name="attrs"> { - 'readonly': [ - '|', - ('qty_invoiced', '>', 0), - ('parent.approval_status', '!=', False) - ] + 'readonly': [ + '|', + ('qty_invoiced', '>', 0), + ('parent.approval_status', '!=', False) + ] } </attribute> </xpath> <div name="invoice_lines" position="before"> - <div name="vendor_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}"> - <label for="vendor_id"/> + <div name="vendor_id" groups="base.group_no_one" + attrs="{'invisible': [('display_type', '!=', False)]}"> + <label for="vendor_id" /> <div name="vendor_id"> - <field name="vendor_id" - attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" - domain="[('parent_id', '=', False)]" - options="{'no_create': True}" class="oe_inline" /> + <field name="vendor_id" + attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" + domain="[('parent_id', '=', False)]" + options="{'no_create': True}" class="oe_inline" /> </div> </div> </div> - + <div name="invoice_lines" position="before"> - <div name="purchase_price" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}"> - <label for="purchase_price"/> - <field name="purchase_price"/> + <div name="purchase_price" groups="base.group_no_one" + attrs="{'invisible': [('display_type', '!=', False)]}"> + <label for="purchase_price" /> + <field name="purchase_price" /> </div> </div> <div name="invoice_lines" position="before"> - <div name="purchase_tax_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}"> - <label for="purchase_tax_id"/> + <div name="purchase_tax_id" groups="base.group_no_one" + attrs="{'invisible': [('display_type', '!=', False)]}"> + <label for="purchase_tax_id" /> <div name="purchase_tax_id"> - <field name="purchase_tax_id"/> + <field name="purchase_tax_id" /> </div> </div> </div> <div name="invoice_lines" position="before"> - <div name="item_percent_margin" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}"> - <label for="item_percent_margin"/> - <field name="item_percent_margin"/> + <div name="item_percent_margin" groups="base.group_no_one" + attrs="{'invisible': [('display_type', '!=', False)]}"> + <label for="item_percent_margin" /> + <field name="item_percent_margin" /> </div> </div> <div name="invoice_lines" position="before"> - <div name="price_subtotal" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}"> - <label for="price_subtotal"/> - <field name="price_subtotal"/> + <div name="price_subtotal" groups="base.group_no_one" + attrs="{'invisible': [('display_type', '!=', False)]}"> + <label for="price_subtotal" /> + <field name="price_subtotal" /> </div> </div> - <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after"> - <field name="qty_free_bu" optional="hide"/> - <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')], 'invisible': [('display_type', '!=', False)]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/> - <field name="vendor_md_id" optional="hide"/> - <field name="purchase_price" attrs=" + <xpath + expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" + position="after"> + <field name="qty_free_bu" optional="hide" /> + <field name="vendor_id" + attrs="{'readonly': [('parent.approval_status', '=', 'approved')], 'invisible': [('display_type', '!=', False)]}" + domain="[('parent_id', '=', False)]" options="{'no_create':True}" /> + <field name="vendor_md_id" optional="hide" /> + <field name="purchase_price" + attrs=" { 'readonly': [ '|', @@ -176,56 +228,79 @@ ('parent.approval_status', '!=', False) ] } - "/> - <field name="purchase_price_md" optional="hide"/> - <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/> - <field name="item_percent_margin"/> - <field name="item_margin" optional="hide"/> - <field name="margin_md" optional="hide"/> - <field name="note" optional="hide"/> - <field name="note_procurement" optional="hide"/> - <field name="vendor_subtotal" optional="hide"/> - <field name="weight" optional="hide"/> - <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/> - <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/> + " /> + <field name="purchase_price_md" optional="hide" /> + <field name="purchase_tax_id" + attrs="{'readonly': [('parent.approval_status', '!=', False)]}" + domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}" /> + <field name="item_percent_margin" /> + <field name="item_margin" optional="hide" /> + <field name="margin_md" optional="hide" /> + <field name="note" optional="hide" /> + <field name="note_procurement" optional="hide" /> + <field name="vendor_subtotal" optional="hide" /> + <field name="weight" optional="hide" /> + <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide" /> + <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide" /> </xpath> - <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 + 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='qty_delivered']" position="before"> - <field name="qty_reserved" invisible="1"/> - <field name="reserved_from" readonly="1" optional="hide"/> + <xpath + expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='qty_delivered']" + position="before"> + <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"> + <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"> + <!-- <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"/> + <field name="grand_total" /> <label for="amount_voucher_disc" string="Voucher" /> <div> - <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1"/> - <div class="text-right mb-2"><small>*Hanya informasi</small></div> + <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1" /> + <div class="text-right mb-2"> + <small>*Hanya informasi</small> + </div> </div> <label for="amount_voucher_shipping_disc" string="Voucher Shipping" /> <div> - <field class="mb-0" name="amount_voucher_shipping_disc" string="Voucher Shipping" readonly="1"/> - <div class="text-right mb-2"><small>*Hanya informasi</small></div> + <field class="mb-0" name="amount_voucher_shipping_disc" + string="Voucher Shipping" readonly="1" /> + <div class="text-right mb-2"> + <small>*Hanya informasi</small> + </div> </div> - <field name="total_margin"/> - <field name="total_percent_margin"/> + <field name="total_margin" /> + <field name="total_percent_margin" /> + <field name="total_before_margin" /> </field> <field name="effective_date" position="after"> - <field name="carrier_id"/> - <field name="estimated_arrival_days"/> - <field name="picking_iu_id"/> - <field name="note_ekspedisi"/> + <field name="carrier_id" /> + <field name="estimated_arrival_days" /> + <field name="picking_iu_id" /> + <field name="note_ekspedisi" /> </field> <field name="carrier_id" position="attributes"> <attribute name="attrs"> - {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', ['cancel','draft'])]} + {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', + ['cancel','draft'])]} + </attribute> + </field> + <field name="payment_term_id" position="attributes"> + <attribute name="attrs"> + {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', + ['cancel','draft'])]} </attribute> </field> @@ -233,22 +308,22 @@ <page string="Website" name="customer_purchase_order"> <group> <group> - <field name="partner_purchase_order_name" readonly="True"/> - <field name="partner_purchase_order_description" readonly="True"/> - <field name="partner_purchase_order_file" readonly="True"/> - <field name="note_website" readonly="True"/> - <field name="web_approval" readonly="True"/> + <field name="partner_purchase_order_name" readonly="True" /> + <field name="partner_purchase_order_description" readonly="True" /> + <field name="partner_purchase_order_file" readonly="True" /> + <field name="note_website" readonly="True" /> + <field name="web_approval" readonly="True" /> </group> <group> <button name="generate_payment_link_midtrans_sales_order" - string="Create Payment Link" - type="object" + string="Create Payment Link" + type="object" /> - <field name="payment_link_midtrans" readonly="True" widget="url"/> - <field name="gross_amount" readonly="True"/> - <field name="payment_type" readonly="True"/> - <field name="payment_status" readonly="True"/> - <field name="payment_qr_code" widget="image" readonly="True"/> + <field name="payment_link_midtrans" readonly="True" widget="url" /> + <field name="gross_amount" readonly="True" /> + <field name="payment_type" readonly="True" /> + <field name="payment_status" readonly="True" /> + <field name="payment_qr_code" widget="image" readonly="True" /> </group> </group> </page> @@ -269,86 +344,92 @@ </field> </page> <page string="Matches PO" name="page_matches_po" invisible="1"> - <field name="order_sales_match_line" readonly="1"/> + <field name="order_sales_match_line" readonly="1" /> </page> <!-- <page string="Fullfillment" name="page_sale_order_fullfillment"> <field name="fullfillment_line" readonly="1"/> </page> --> <page string="Fulfillment v2" name="page_sale_order_fullfillment2"> - <field name="fulfillment_line_v2" readonly="1"/> + <field name="fulfillment_line_v2" readonly="1" /> </page> <page string="Reject Line" name="page_sale_order_reject_line"> - <field name="reject_line" readonly="1"/> + <field name="reject_line" readonly="0" /> + </page> + <page string="Koli" name="page_sales_order_koli_line"> + <field name="koli_lines" readonly="1" /> </page> </page> </field> </record> - <!-- Wizard for Reject Reason --> - <record id="view_cancel_reason_order_form" model="ir.ui.view"> - <field name="name">cancel.reason.order.form</field> - <field name="model">cancel.reason.order</field> - <field name="arch" type="xml"> - <form string="Cancel Reason"> - <group> - <field name="reason_cancel" widget="selection"/> - <field name="attachment_bukti" widget="many2many_binary" required="1"/> - <field name="nomor_so_pengganti" attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}"/> - </group> - <footer> - <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/> - <button string="Cancel" class="btn-secondary" special="cancel"/> - </footer> - </form> - </field> - </record> + <!-- Wizard for Reject Reason --> + <record id="view_cancel_reason_order_form" model="ir.ui.view"> + <field name="name">cancel.reason.order.form</field> + <field name="model">cancel.reason.order</field> + <field name="arch" type="xml"> + <form string="Cancel Reason"> + <group> + <field name="reason_cancel" widget="selection" /> + <field name="attachment_bukti" widget="many2many_binary" required="1" /> + <field name="nomor_so_pengganti" + attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}" /> + </group> + <footer> + <button string="Confirm" type="object" name="confirm_reject" + class="btn-primary" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> + </footer> + </form> + </field> + </record> - <record id="action_cancel_reason_order" model="ir.actions.act_window"> - <field name="name">Cancel Reason</field> - <field name="res_model">cancel.reason.order</field> - <field name="view_mode">form</field> - <field name="target">new</field> - </record> + <record id="action_cancel_reason_order" model="ir.actions.act_window"> + <field name="name">Cancel Reason</field> + <field name="res_model">cancel.reason.order</field> + <field name="view_mode">form</field> + <field name="target">new</field> + </record> </data> <data> <record id="sale_order_tree_view_inherit" model="ir.ui.view"> <field name="name">Sale Order</field> <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding"/> + <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding" /> <field name="arch" type="xml"> <field name="state" position="after"> <field name="approval_status" /> - <field name="client_order_ref"/> - <field name="payment_type" optional="hide"/> - <field name="payment_status" optional="hide"/> - <field name="pareto_status" optional="hide"/> - <field name="shipping_method_picking" optional="hide"/> + <field name="client_order_ref" /> + <field name="payment_type" optional="hide" /> + <field name="payment_status" optional="hide" /> + <field name="pareto_status" optional="hide" /> + <field name="shipping_method_picking" optional="hide" /> + <field name="hold_outgoing" optional="hide" /> </field> </field> </record> <record id="sales_order_tree_view_inherit" model="ir.ui.view"> <field name="name">Sale Order</field> <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_order_tree"/> + <field name="inherit_id" ref="sale.view_order_tree" /> <field name="arch" type="xml"> <field name="state" position="after"> <field name="approval_status" /> - <field name="client_order_ref"/> - <field name="so_status"/> - <field name="date_status_done"/> - <field name="date_kirim_ril"/> - <field name="date_driver_departure"/> - <field name="date_driver_arrival"/> - <field name="payment_type" optional="hide"/> - <field name="payment_status" optional="hide"/> - <field name="pareto_status" optional="hide"/> + <field name="client_order_ref" /> + <field name="so_status" /> + <field name="date_status_done" /> + <field name="date_kirim_ril" /> + <field name="date_driver_departure" /> + <field name="date_driver_arrival" /> + <field name="payment_type" optional="hide" /> + <field name="payment_status" optional="hide" /> + <field name="pareto_status" optional="hide" /> </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="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> @@ -356,46 +437,81 @@ <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="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> <record id="mail_template_sale_order_web_approve_notification" model="mail.template"> <field name="name">Sale Order: Web Approve Notification</field> - <field name="model_id" ref="indoteknik_custom.model_sale_order"/> + <field name="model_id" ref="indoteknik_custom.model_sale_order" /> <field name="subject">Permintaan Persetujuan Pesanan ${object.name} di Indoteknik.com</field> <field name="email_from">sales@indoteknik.com</field> <field name="email_to">${object.partner_id.email | safe}</field> <field name="email_cc">${object.partner_id.get_approve_partner_ids("email_comma_sep")}</field> <field name="body_html" type="html"> - <table border="0" cellpadding="0" cellspacing="0" style="padding: 16px 0; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;"> - <tr><td align="center"> - <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> - <tbody> - <tr> - <td align="center" style="min-width: 590px;"> - <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> - <tr><td style="padding-bottom: 24px;">Dear ${(object.partner_id.get_main_parent()).name},</td></tr> + <table border="0" cellpadding="0" cellspacing="0" + style="padding: 16px 0; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;"> + <tr> + <td align="center"> + <table border="0" cellpadding="0" cellspacing="0" width="590" + style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> + <tbody> + <tr> + <td align="center" style="min-width: 590px;"> + <table border="0" cellpadding="0" cellspacing="0" + width="590" + style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> + <tr> + <td style="padding-bottom: 24px;"> + Dear + ${(object.partner_id.get_main_parent()).name},</td> + </tr> - <tr><td style="padding-bottom: 16px;">Ini adalah konfirmasi pesanan dari ${object.partner_id.name | safe} untuk nomor pesanan ${object.name} yang memerlukan persetujuan agar dapat diproses.</td></tr> - <tr><td style="padding-bottom: 16px;"> - <a href="https://indoteknik.com/my/quotations/${object.id}" style="color: white; background-color: #C53030; border: none; border-radius: 6px; padding: 4px 8px; width: fit-content; display: block;"> - Lihat Pesanan - </a> - </td></tr> - <tr><td style="padding-bottom: 16px;">Mohon segera melakukan tinjauan terhadap pesanan ini dan memberikan persetujuan. Terima kasih atas perhatian dan kerjasama Anda. Kami berharap dapat segera melanjutkan proses pesanan ini setelah mendapatkan persetujuan Anda.</td></tr> + <tr> + <td style="padding-bottom: 16px;">Ini adalah + konfirmasi pesanan dari + ${object.partner_id.name | safe} untuk nomor + pesanan ${object.name} yang memerlukan + persetujuan agar dapat diproses.</td> + </tr> + <tr> + <td style="padding-bottom: 16px;"> + <a + href="https://indoteknik.com/my/quotations/${object.id}" + style="color: white; background-color: #C53030; border: none; border-radius: 6px; padding: 4px 8px; width: fit-content; display: block;"> + Lihat Pesanan + </a> + </td> + </tr> + <tr> + <td style="padding-bottom: 16px;">Mohon segera + melakukan tinjauan terhadap pesanan ini dan + memberikan persetujuan. Terima kasih atas + perhatian dan kerjasama Anda. Kami berharap + dapat segera melanjutkan proses pesanan ini + setelah mendapatkan persetujuan Anda.</td> + </tr> - <tr><td style="padding-bottom: 2px;">Hormat kami,</td></tr> - <tr><td style="padding-bottom: 2px;">PT. Indoteknik Dotcom Gemilang</td></tr> - <tr><td style="padding-bottom: 2px;">sales@indoteknik.com</td></tr> - </table> - </td> - </tr> - </tbody> - </table> - </td></tr> + <tr> + <td style="padding-bottom: 2px;">Hormat kami,</td> + </tr> + <tr> + <td style="padding-bottom: 2px;">PT. Indoteknik + Dotcom Gemilang</td> + </tr> + <tr> + <td style="padding-bottom: 2px;"> + sales@indoteknik.com</td> + </tr> + </table> + </td> + </tr> + </tbody> + </table> + </td> + </tr> </table> </field> </record> @@ -407,45 +523,59 @@ <field name="model">sales.order.purchase.match</field> <field name="arch" type="xml"> <tree editable="top" create="false" delete="false"> - <field name="purchase_order_id" readonly="1"/> - <field name="purchase_line_id" readonly="1"/> - <field name="product_id" readonly="1"/> - <field name="qty_so" readonly="1"/> - <field name="qty_po" readonly="1"/> + <field name="purchase_order_id" readonly="1" /> + <field name="purchase_line_id" readonly="1" /> + <field name="product_id" readonly="1" /> + <field name="qty_so" readonly="1" /> + <field name="qty_po" readonly="1" /> </tree> </field> </record> </data> <data> - - </data> - <record id="sales_order_fulfillment_v2_tree" model="ir.ui.view"> - <field name="name">sales.order.fulfillment.v2.tree</field> - <field name="model">sales.order.fulfillment.v2</field> + <record id="sales_order_koli_tree" model="ir.ui.view"> + <field name="name">sales.order.koli.tree</field> + <field name="model">sales.order.koli</field> <field name="arch" type="xml"> - <tree editable="top" create="false"> - <field name="product_id" readonly="1"/> - <field name="so_qty" readonly="1" optional="show"/> - <field name="reserved_stock_qty" readonly="1" optional="show"/> - <field name="delivered_qty" readonly="1" optional="hide"/> - <field name="po_ids" widget="many2many_tags" readonly="1" optional="show"/> - <field name="po_qty" readonly="1" optional="show"/> - <field name="received_qty" readonly="1" optional="show"/> - <field name="purchaser" readonly="1" optional="hide"/> + <tree editable="top" create="false" delete="false"> + <field name="koli_id" readonly="1" /> + <field name="picking_id" readonly="1" /> + <field name="state" readonly="1" /> </tree> </field> </record> + </data> + + <data> + + </data> + <record id="sales_order_fulfillment_v2_tree" model="ir.ui.view"> + <field name="name">sales.order.fulfillment.v2.tree</field> + <field name="model">sales.order.fulfillment.v2</field> + <field name="arch" type="xml"> + <tree editable="top" create="false"> + <field name="product_id" readonly="1" /> + <field name="so_qty" readonly="1" optional="show" /> + <field name="reserved_stock_qty" readonly="1" optional="show" /> + <field name="delivered_qty" readonly="1" optional="hide" /> + <field name="po_ids" widget="many2many_tags" readonly="1" optional="show" /> + <field name="po_qty" readonly="1" optional="show" /> + <field name="received_qty" readonly="1" optional="show" /> + <field name="purchaser" readonly="1" optional="hide" /> + </tree> + </field> + </record> <data> <record id="sales_order_fullfillmet_tree" model="ir.ui.view"> <field name="name">sales.order.fullfillment.tree</field> <field name="model">sales.order.fullfillment</field> <field name="arch" type="xml"> <tree editable="top" create="false"> - <field name="product_id" readonly="1"/> - <field name="reserved_from" readonly="1"/> - <field name="qty_fullfillment" readonly="1"/> - <field name="user_id" readonly="1"/> + <field name="product_id" readonly="1" /> + <field name="reserved_from" readonly="1" /> + <field name="qty_fullfillment" readonly="1" /> + <field name="user_id" readonly="1" /> </tree> </field> </record> @@ -457,9 +587,9 @@ <field name="model">sales.order.reject</field> <field name="arch" type="xml"> <tree editable="top" create="false"> - <field name="product_id" readonly="1"/> - <field name="qty_reject" readonly="1"/> - <field name="reason_reject" readonly="1"/> + <field name="product_id" readonly="1" /> + <field name="qty_reject" readonly="1" /> + <field name="reason_reject" readonly="0" /> </tree> </field> </record> @@ -468,8 +598,8 @@ <data> <record id="sale_order_multi_create_uangmuka_ir_actions_server" model="ir.actions.server"> <field name="name">Uang Muka</field> - <field name="model_id" ref="sale.model_sale_order"/> - <field name="binding_model_id" ref="sale.model_sale_order"/> + <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_create_uang_muka()</field> </record> @@ -478,66 +608,84 @@ <data> <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template"> <field name="name">Sale Order: Notification to Salesperson</field> - <field name="model_id" ref="sale.model_sale_order"/> + <field name="model_id" ref="sale.model_sale_order" /> <field name="subject">Konsolidasi Pengiriman</field> <field name="email_from">sales@indoteknik.com</field> <field name="email_to">${object.user_id.login | safe}</field> <field name="body_html" type="html"> - <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;"> - <tr><td align="center"> - <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> - <!-- HEADER --> - <tbody> - <tr> - <td align="center" style="min-width: 590px;"> - <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> - <tr> - <td valign="middle"> - <span></span> - </td> - </tr> - </table> - </td> - </tr> - <!-- CONTENT --> - <tr> - <td align="center" style="min-width: 590px;"> - <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> - <tr><td style="padding-bottom: 24px;">Dear ${salesperson_name},</td></tr> - - <tr><td style="padding-bottom: 16px;">Terdapat pesanan dari BP ${business_partner} untuk site ${site} dengan total belanja ${sum_total_amount} dari list SO dibawah ini:</td></tr> - - <tr> - <td> - <table border="1" cellpadding="5" cellspacing="0"> - <thead> - <tr> - <th>Nama Pesanan</th> - <th>Nama Perusahaan Induk</th> - <th>Nama Situs</th> - <th>Total Pembelian</th> - </tr> - </thead> - <tbody> - ${table_content} - </tbody> - </table> - </td> - </tr> - - <tr> - <td style="text-align:center;"> - <hr width="100%" - style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" /> - </td> - </tr> - </table> - </td> - </tr> - <!-- CONTENT --> - </tbody> - </table> - </td></tr> + <table border="0" cellpadding="0" cellspacing="0" + style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;"> + <tr> + <td align="center"> + <table border="0" cellpadding="0" cellspacing="0" width="590" + style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> + <!-- HEADER --> + <tbody> + <tr> + <td align="center" style="min-width: 590px;"> + <table border="0" cellpadding="0" cellspacing="0" + width="590" + style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> + <tr> + <td valign="middle"> + <span></span> + </td> + </tr> + </table> + </td> + </tr> + <!-- CONTENT --> + <tr> + <td align="center" style="min-width: 590px;"> + <table border="0" cellpadding="0" cellspacing="0" + width="590" + style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"> + <tr> + <td style="padding-bottom: 24px;">Dear + ${salesperson_name},</td> + </tr> + + <tr> + <td style="padding-bottom: 16px;">Terdapat + pesanan dari BP ${business_partner} untuk + site ${site} dengan total belanja + ${sum_total_amount} dari list SO dibawah + ini:</td> + </tr> + + <tr> + <td> + <table border="1" cellpadding="5" + cellspacing="0"> + <thead> + <tr> + <th>Nama Pesanan</th> + <th>Nama Perusahaan Induk</th> + <th>Nama Situs</th> + <th>Total Pembelian</th> + </tr> + </thead> + <tbody> + ${table_content} + </tbody> + </table> + </td> + </tr> + + <tr> + <td style="text-align:center;"> + <hr width="100%" + style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" /> + </td> + </tr> + </table> + </td> + </tr> + <!-- CONTENT --> + </tbody> + </table> + </td> + </tr> </table> </field> </record> diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml index e9eec41b..d2c661ba 100644 --- a/indoteknik_custom/views/shipment_group.xml +++ b/indoteknik_custom/views/shipment_group.xml @@ -7,6 +7,8 @@ <tree default_order="create_date desc"> <field name="number"/> <field name="partner_id"/> + <field name="carrier_id"/> + <field name="total_colly_line"/> </tree> </field> </record> @@ -16,11 +18,9 @@ <field name="model">shipment.group.line</field> <field name="arch" type="xml"> <tree editable="bottom"> - <field name="picking_id" required="1"/> - <field name="partner_id" readonly="1"/> <field name="sale_id" readonly="1"/> - <field name="shipping_paid_by" readonly="1"/> - <field name="state" readonly="1"/> + <field name="picking_id" required="1"/> + <field name="total_colly" readonly="1"/> </tree> </field> </record> @@ -37,6 +37,8 @@ </group> <group> <field name="partner_id" readonly="1"/> + <field name="carrier_id" readonly="1"/> + <field name="total_colly_line" readonly="1"/> </group> </group> <notebook> diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index 50ea40bf..ae77ab9a 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -7,7 +7,8 @@ <field name="inherit_id" ref="stock.vpicktree"/> <field name="arch" type="xml"> <tree position="attributes"> - <attribute name="default_order">create_date desc</attribute> + <attribute name="default_order">final_seq asc</attribute> + <!-- <attribute name="default_order">create_date desc</attribute> --> </tree> <field name="json_popover" position="after"> <field name="date_done" optional="hide"/> @@ -18,8 +19,14 @@ <field name="note" optional="hide"/> <field name="date_reserved" optional="hide"/> <field name="state_reserve" optional="hide"/> + <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/> + <field name="final_seq"/> + <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/> + <!-- <field name="countdown_hours" optional="hide"/> + <field name="countdown_ready_to_ship" /> --> </field> <field name="partner_id" position="after"> + <field name="area_name" optional="hide"/> <field name="purchase_representative_id"/> <field name="status_printed"/> </field> @@ -66,12 +73,33 @@ type="object" attrs="{'invisible': [('carrier_id', '!=', 9)]}" /> + <button name="action_get_kgx_pod" + string="Tracking KGX" + type="object" + attrs="{'invisible': [('carrier_id', '!=', 173)]}" + /> + <button name="button_state_approve_md" + string="Approve MD Gudang Selisih" + type="object" + attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}" + /> + + <button name="button_state_pending_md" + string="Pending MD Gudang Selisih" + type="object" + attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}" + /> </button> <field name="backorder_id" position="after"> + <field name="shipping_method_so_id"/> <field name="summary_qty_detail"/> <field name="count_line_detail"/> <field name="dokumen_tanda_terima"/> <field name="dokumen_pengiriman"/> + <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)], 'required': [('location_dest_id', '=', 60)]}"/> + <field name="total_mapping_koli" attrs="{'invisible': [('location_id', '!=', 60)]}"/> + <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/> + <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/> </field> <field name="weight_uom_name" position="after"> <group> @@ -93,12 +121,15 @@ <field name="arrival_time"/> </field> <field name="origin" position="after"> +<!-- <field name="show_state_approve_md" invisible="1" optional="hide"/>--> + <field name="state_approve_md" widget="badge"/> <field name="purchase_id"/> <field name="sale_order"/> <field name="invoice_status"/> <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/> <field name="summary_qty_operation"/> <field name="count_line_operation"/> + <field name="linked_manual_bu_out" attrs="{'invisible': [('location_id', '=', 60)]}" domain="[('picking_type_code', '=', 'outgoing'),('state', 'not in', ['done','cancel']), ('group_id', '=', group_id)]"/> <field name="account_id" attrs="{ 'readonly': [['state', 'in', ['done', 'cancel']]], @@ -124,6 +155,7 @@ <field name="approval_status"/> <field name="approval_receipt_status"/> <field name="approval_return_status"/> + <field name="so_lama"/> </field> <field name="product_id" position="before"> <field name="line_no" attrs="{'readonly': 1}" optional="hide"/> @@ -144,13 +176,15 @@ </group> </group> </page> - <page string="Delivery" name="delivery_order"> + <page string="Delivery" name="delivery_order" attrs="{'invisible': [('location_dest_id', '=', 60)]}"> <group> <group> <field name="notee"/> <field name="note_logistic"/> + <field name="note_info"/> <field name="responsible" /> <field name="carrier_id"/> + <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/> <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/> <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/> <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/> @@ -190,27 +224,78 @@ <field name="lalamove_image_url" invisible="1"/> <field name="lalamove_image_html"/> </group> + <group attrs="{'invisible': [('carrier_id', '!=', 173)]}"> + <field name="kgx_pod_photo_url" invisible="1"/> + <field name="kgx_pod_photo"/> + <field name="kgx_pod_signature" invisible="1"/> + <field name="kgx_pod_receive_time"/> + <field name="kgx_pod_receiver"/> + </group> </group> </page> - <page string="Check Product" name="check_product"> + <page string="Check Product" name="check_product" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}"> <field name="check_product_lines"/> </page> <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}"> <field name="barcode_product_lines"/> </page> + <page string="Check Koli" name="check_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}"> + <field name="check_koli_lines"/> + </page> + <page string="Mapping Koli" name="konfirm_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"> + <field name="konfirm_koli_lines"/> + </page> + <page string="Konfirm Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"> + <field name="scan_koli_lines"/> + </page> </page> </field> </record> + <record id="scan_koli_tree" model="ir.ui.view"> + <field name="name">scan.koli.tree</field> + <field name="model">scan.koli</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="code_koli"/> + <field name="koli_id" options="{'no_create': True}" domain="[('state', '=', 'not_delivered')]"/> + <field name="scan_koli_progress"/> + </tree> + </field> + </record> + + <record id="konfirm_koli_tree" model="ir.ui.view"> + <field name="name">konfirm.koli.tree</field> + <field name="model">konfirm.koli</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="pick_id" options="{'no_create': True}" required="1" domain="[('picking_type_code', '=', 'internal'), ('group_id', '=', parent.group_id), ('linked_manual_bu_out', '=', parent.id)]"/> + </tree> + </field> + </record> + + <record id="check_koli_tree" model="ir.ui.view"> + <field name="name">check.koli.tree</field> + <field name="model">check.koli</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="koli"/> + <field name="reserved_id"/> + <field name="check_koli_progress"/> + </tree> + </field> + </record> + <record id="check_product_tree" model="ir.ui.view"> <field name="name">check.product.tree</field> <field name="model">check.product</field> <field name="arch" type="xml"> <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'"> + <field name="code_product"/> <field name="product_id"/> <field name="quantity"/> - <field name="status"/> + <field name="status" readonly="1"/> </tree> </field> </record> @@ -247,6 +332,35 @@ <field name="purchase_representative_id"/> </field> </field> - </record> + </record> + + <record id="view_warning_modal_wizard_form" model="ir.ui.view"> + <field name="name">warning.modal.wizard.form</field> + <field name="model">warning.modal.wizard</field> + <field name="arch" type="xml"> + <form string="Peringatan Koli Belum Diperiksa"> + <sheet> + <div class="oe_title"> + <h2><span>⚠️ Perhatian!</span></h2> + </div> + <group> + <field name="message" readonly="1" nolabel="1" widget="text"/> + </group> + </sheet> + <footer> + <button name="action_continue" type="object" string="Lanjutkan" class="btn-primary"/> + <button string="Tutup" class="btn-secondary" special="cancel"/> + </footer> + </form> + </field> + </record> + + <record id="action_warning_modal_wizard" model="ir.actions.act_window"> + <field name="name">Peringatan Koli</field> + <field name="res_model">warning.modal.wizard</field> + <field name="view_mode">form</field> + <field name="view_id" ref="view_warning_modal_wizard_form"/> + <field name="target">new</field> + </record> </data> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml new file mode 100644 index 00000000..ae5a0f9f --- /dev/null +++ b/indoteknik_custom/views/user_form_merchant.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <record id="user_form_merchant_tree" model="ir.ui.view"> + <field name="name">user.form.merchant.tree</field> + <field name="model">user.form.merchant</field> + <field name="arch" type="xml"> + <tree create="1" default_order="create_date desc"> + <field name="name_merchant"/> + <field name="email_company"/> + <field name="phone"/> + <field name="description"/> + <field name="create_date"/> + </tree> + </field> + </record> + + <record id="user_form_merchant_form" model="ir.ui.view"> + <field name="name">user.form.merchant.form</field> + <field name="model">user.form.merchant</field> + <field name="arch" type="xml"> + <form create="0"> + <sheet> + <group> + <group string="Informasi Perusahaan" > + <field name="name_merchant" /> + <field name="pejabat_name" /> + <field name="pic_merchant" /> + <field name="pic_position" /> + <field name="address" /> + <field name="state" /> + <field name="city" /> + <field name="district" /> + <field name="subDistrict" /> + <field name="zip" /> + <field name="bank_name" /> + <field name="rekening_name" /> + <field name="account_number" /> + <field name="email_company" widget="email"/> + <field name="email_sales" widget="email"/> + <field name="email_finance" widget="email"/> + <field name="phone" widget="phone"/> + <field name="mobile" widget="phone"/> + <field name="bisnis_type" /> + <field name="website" /> + <field name="category_perusahaan" /> + </group> + </group> + <group string="Informasi Vendor"> + <group> + <field name="harga_tayang" /> + <field name="category_produk_ids" widget="many2many_tags"/> + <field name="merk_dagang" /> + <field name="is_pengajuan_tempo" /> + <field name="tempo_duration" /> + <field name="kredit_limit" /> + <field name="waktu_pengiriman" /> + <field name="terhitung_sejak" /> + </group> + + </group> + <group string="Syarat Perdagangan"> + <group> + <field name="is_kembali_barang" /> + <field name="tenggat_waktu" /> + <field name="sertifikat_produk" /> +<!-- <field name="custom_sertifikat_produk" />--> + <field name="tempo_garansi" /> + <field name="explain_garansi" /> + <field name="is_order_quantity" /> + + </group> + </group> + <group string="Dokumen"> + <group> + <field name="file_npwp" /> + <field name="file_sppkp" /> + <field name="file_dokumenKtpDirut" /> + <field name="file_kartuNama" /> + <field name="file_suratPernyataan" /> + <field name="file_fotoKantor" /> + <field name="file_dataProduk" /> + <field name="file_pricelist" /> + </group> + <group> +<!-- <field name="description" />--> + </group> + </group> + </sheet> + </form> + </field> + </record> + + <record id="action_user_form_merchant" model="ir.actions.act_window"> + <field name="name">User Form Merchant</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">user.form.merchant</field> + <field name="view_mode">tree,form</field> + </record> + + +<!-- <menuitem--> +<!-- id="menu_user_form_merchant"--> +<!-- name="User Form Merchant"--> +<!-- parent="res_partner_menu_user"--> +<!-- sequence="1"--> +<!-- action="action_user_form_merchant"--> +<!-- />--> + +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/user_merchant_request.xml b/indoteknik_custom/views/user_merchant_request.xml new file mode 100644 index 00000000..e4f309fd --- /dev/null +++ b/indoteknik_custom/views/user_merchant_request.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <record id="user_merchant_request_tree" model="ir.ui.view"> + <field name="name">user.merchant.request.tree</field> + <field name="model">user.merchant.request</field> + <field name="arch" type="xml"> + <tree create="1" default_order="create_date desc"> + <field name="user_id"/> + <field name="merchant_id"/> + <field name="state_merchant" decoration-success="state_merchant == 'approved'" decoration-danger="state_merchant == 'reject'" widget="badge" optional="show"/> + <field name="create_date"/> + </tree> + </field> + </record> + + <record id="user_merchant_request_form" model="ir.ui.view"> + <field name="name">user.merchant.request.form</field> + <field name="model">user.merchant.request</field> + <field name="arch" type="xml"> + <form create="0"> + <header> + <button name="button_approve" + string="Approve Merchant" + attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}" + type="object" + class="oe_highlight"/> + <button name="button_reject" + string="Reject" + attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}" + type="object" + groups="purchase.group_purchase_manager" + class="oe_highlight"/> + <field name="state_merchant" widget="statusbar" + statusbar_visible="draft,approved" + statusbar_colors='{"reject":"red"}'/> + </header> + <sheet> + <group> + <group> + <field name="user_id" readonly="1"/> + <field name="merchant_id"/> + </group> + </group> + </sheet> + <div class="oe_chatter"> + <field name="message_ids" widget="mail_thread"/> + </div> + </form> + </field> +</record> + + + + + <!-- Wizard for Reject Reason --> +<record id="view_reject_reason_wizard_merchant_form" model="ir.ui.view"> + <field name="name">reject.reason.wizard.merchant.form</field> + <field name="model">reject.reason.wizard.merchant</field> + <field name="arch" type="xml"> + <form string="Reject Reason"> + <group> + <field name="reason_reject" widget="text"/> + </group> + <footer> + <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> + </footer> + </form> + </field> +</record> + +<record id="action_reject_reason_wizard_merchant" model="ir.actions.act_window"> + <field name="name">Reject Reason</field> + <field name="res_model">reject.reason.wizard.merchant</field> + <field name="view_mode">form</field> + <field name="target">new</field> +</record> + + +<record id="view_confirm_approval_wizard_merchant_form" model="ir.ui.view"> + <field name="name">confirm.approval.wizard.merchant.form</field> + <field name="model">confirm.approval.wizard.merchant</field> + <field name="arch" type="xml"> + <form string="Konfirmasi Approval"> + <group> + <p>Apakah Anda yakin ingin mengapprove merchant ini?</p> + </group> + <footer> + <button string="Batal" class="btn-secondary" special="cancel"/> + <button string="Konfirmasi" type="object" name="confirm_approval" class="btn-primary"/> + </footer> + </form> + </field> +</record> + + + + <record id="action_user_merchant_request" model="ir.actions.act_window"> + <field name="name">User Merchant Request</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">user.merchant.request</field> + <field name="view_mode">tree,form</field> + </record> + + <menuitem + id="menu_user_merchant_request" + name="User Merchant Request" + parent="res_partner_menu_user" + sequence="2" + action="action_user_merchant_request" + /> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml index 7f1faa41..4eebe9e4 100644 --- a/indoteknik_custom/views/user_pengajuan_tempo.xml +++ b/indoteknik_custom/views/user_pengajuan_tempo.xml @@ -53,6 +53,7 @@ <group string="Pengiriman" colspan="4"> <group> <field name="pic_name"/> + <field name="pic_mobile"/> <field name="street_pengiriman"/> <field name="state_id_pengiriman"/> <field name="city_id_pengiriman"/> @@ -62,6 +63,7 @@ </group> <group> <field name="invoice_pic"/> + <field name="invoice_pic_mobile"/> <field name="street_invoice"/> <field name="state_id_invoice"/> <field name="city_id_invoice"/> diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml index 7063231b..339ce8db 100644 --- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml +++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml @@ -102,6 +102,7 @@ <Page string="Pengiriman"> <group> <field name="pic_name"/> + <field name="pic_mobile"/> <field name="street_pengiriman"/> <field name="state_id_pengiriman"/> <field name="city_id_pengiriman"/> @@ -111,6 +112,7 @@ </group> <group> <field name="invoice_pic"/> + <field name="invoice_pic_mobile"/> <field name="street_invoice"/> <field name="state_id_invoice"/> <field name="city_id_invoice"/> @@ -121,6 +123,7 @@ <group> <field name="tukar_invoice"/> <field name="jadwal_bayar"/> + <field name="dokumen_prosedur" widget="many2many_binary"/> <field name="dokumen_pengiriman"/> <field name="dokumen_pengiriman_input"/> <field name="dokumen_invoice"/> diff --git a/indoteknik_custom/views/vendor_payment_term.xml b/indoteknik_custom/views/vendor_payment_term.xml index e0e96388..7d16b129 100644 --- a/indoteknik_custom/views/vendor_payment_term.xml +++ b/indoteknik_custom/views/vendor_payment_term.xml @@ -8,6 +8,8 @@ <field name="display_name"/> <field name="name"/> <field name="parent_id"/> + <field name="minimum_amount"/> + <field name="minimum_amount_tax"/> <field name="property_supplier_payment_term_id"/> </tree> </field> @@ -23,6 +25,8 @@ <group> <field name="name"/> <field name="parent_id" readonly="1"/> + <field name="minimum_amount"/> + <field name="minimum_amount_tax"/> <field name="property_supplier_payment_term_id"/> </group> </group> diff --git a/indoteknik_custom/views/vendor_sla.xml b/indoteknik_custom/views/vendor_sla.xml new file mode 100644 index 00000000..cf4425eb --- /dev/null +++ b/indoteknik_custom/views/vendor_sla.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" ?> +<odoo> + <record id="vendor_action" model="ir.actions.act_window"> + <field name="name">Vendor SLA</field> + <field name="res_model">vendor.sla</field> + <field name="view_mode">tree,form</field> + </record> + + <record id="vendor_tree" model="ir.ui.view"> + <field name="name">Vendor SLA</field> + <field name="model">vendor.sla</field> + <field name="arch" type="xml"> + <tree> + <field name="id_vendor" string="Vendor Name" /> + <field name="duration_unit" string="Duration" /> + </tree> + </field> + </record> + + <record id="vendor_sla_view" model="ir.ui.view"> + <field name="name">Vendor SLA</field> + <field name="model">vendor.sla</field> + <field name="arch" type="xml"> + <form> + <sheet> + <group> + <field name="id_vendor" string="Vendor Name" /> + <field name="duration" string="SLA Duration" /> + <field name="unit" string="SLA Time" /> + </group> + </sheet> + </form> + </field> + </record> + + <menuitem id="menu_vendor_sla" + name="Vendor SLA" + parent="menu_monitoring_in_purchase" + sequence="1" + action="vendor_action" + /> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index ae958f05..78e42969 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -27,63 +27,71 @@ <group> <group> <field name="image" widget="image" width="120"/> - <field name="name" required="1" /> - <field name="code" required="1" /> - <field name="visibility" required="1" /> + <field name="name" required="1"/> + <field name="code" required="1"/> + <field name="voucher_category" widget="many2many"/> + <field name="visibility" required="1"/> <field name="start_time" required="1"/> <field name="end_time" required="1"/> <field name="limit" required="1"/> <field name="limit_user" required="1"/> - <field name="apply_type" required="1" /> - <field name="account_type" required="1" /> - <field name="show_on_email" /> - <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/> + <field name="apply_type" required="1"/> + <field name="account_type" required="1"/> + <field name="show_on_email"/> + <field name="excl_pricelist_ids" widget="many2many_tags" + domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/> </group> - <group string="Discount Settings" attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}"> - <field name="min_purchase_amount" widget="monetary" required="1" /> - <field name="discount_type" attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}" /> + <group string="Discount Settings" + attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}"> + <field name="min_purchase_amount" widget="monetary" required="1"/> + <field name="discount_type" + attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}"/> - <label for="max_discount_amount" string="Discount Amount" /> + <label for="max_discount_amount" string="Discount Amount"/> <div class="d-flex align-items-center"> - <span - class="mr-1 font-weight-bold" - attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}" + <span + class="mr-1 font-weight-bold" + attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}" > Rp </span> - <field class="mb-0" name="discount_amount" required="1" /> - <span - class="ml-1 font-weight-bold" - attrs="{'invisible': [('discount_type', '!=', 'percentage')]}" + <field class="mb-0" name="discount_amount" required="1"/> + <span + class="ml-1 font-weight-bold" + attrs="{'invisible': [('discount_type', '!=', 'percentage')]}" > % </span> </div> - <field name="max_discount_amount" widget="monetary" required="1" attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/> + <field name="max_discount_amount" widget="monetary" required="1" + attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/> </group> </group> <notebook> - <page name="voucher_line" string="Voucher Line" attrs="{'invisible': [('apply_type', '!=', 'brand')]}"> + <page name="voucher_line" string="Voucher Line" + attrs="{'invisible': [('apply_type', '!=', 'brand')]}"> <field name="voucher_line"> <tree editable="bottom"> - <field name="manufacture_id" required="1" /> - <field name="min_purchase_amount" required="1" /> - <field name="discount_type" required="1" /> - <field name="discount_amount" required="1" /> - <field name="max_discount_amount" required="1" attrs="{'readonly': [('discount_type', '!=', 'percentage')]}" /> + <field name="manufacture_id" required="1"/> + <field name="min_purchase_amount" required="1"/> + <field name="discount_type" required="1"/> + <field name="discount_amount" required="1"/> + <field name="max_discount_amount" required="1" + attrs="{'readonly': [('discount_type', '!=', 'percentage')]}"/> </tree> </field> </page> <page name="description" string="Description"> - <label for="description" string="Max 120 characters:" class="font-weight-normal mb-2 oe_edit_only"/> - <field name="description" placeholder="Insert short description..." /> + <label for="description" string="Max 120 characters:" + class="font-weight-normal mb-2 oe_edit_only"/> + <field name="description" placeholder="Insert short description..."/> </page> <page name="terms_conditions" string="Terms and Conditions"> - <field name="terms_conditions" /> + <field name="terms_conditions"/> </page> <page name="order_page" string="Orders"> - <field name="order_ids" readonly="1" /> + <field name="order_ids" readonly="1"/> </page> </notebook> </sheet> @@ -92,10 +100,10 @@ </record> <menuitem id="voucher" - name="Voucher" - parent="website_sale.menu_catalog" - sequence="1" - action="voucher_action" + name="Voucher" + parent="website_sale.menu_catalog" + sequence="1" + action="voucher_action" /> </data> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/x_banner_banner.xml b/indoteknik_custom/views/x_banner_banner.xml index ec1e38a5..e40568cc 100755 --- a/indoteknik_custom/views/x_banner_banner.xml +++ b/indoteknik_custom/views/x_banner_banner.xml @@ -33,6 +33,7 @@ <field name="group_by_week" /> <field name="x_headline_banner" /> <field name="x_description_banner" /> + <field name="x_keyword_banner" /> <field name="last_update_solr" readonly="1"/> </group> <group> diff --git a/indoteknik_custom/views/x_banner_category.xml b/indoteknik_custom/views/x_banner_category.xml index 11feb207..a83c4129 100755 --- a/indoteknik_custom/views/x_banner_category.xml +++ b/indoteknik_custom/views/x_banner_category.xml @@ -23,7 +23,7 @@ <group> <field name="x_name"/> <field name="x_banner_subtitle"/> - <field name="x_studio_field_KKVl4"/> + <field name="x_studio_field_KKVl4"/> <field name="last_update_solr" readonly="1"/> </group> <group></group> |