diff options
| author | Indoteknik . <it@fixcomart.co.id> | 2025-07-26 11:58:32 +0700 |
|---|---|---|
| committer | Indoteknik . <it@fixcomart.co.id> | 2025-07-26 11:58:32 +0700 |
| commit | e09e59db22d65fa144c2a43cd8f6959fada49484 (patch) | |
| tree | 0567b1a8f0c8c57efb2d0d38ae489da26a55c245 /indoteknik_custom/views/sale_order.xml | |
| parent | fff5507cf7c0f360a5c68068e77fa84b1d6340c5 (diff) | |
| parent | 77e76f376b78733cad58aa196e3ead3c6a04ff42 (diff) | |
(andri) fix conflict
Diffstat (limited to 'indoteknik_custom/views/sale_order.xml')
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index bb8bdc08..c1f1fe61 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -35,30 +35,30 @@ string="UangMuka" type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/> </button> - <xpath expr="//header" position="inside"> + <!-- <xpath expr="//header" position="inside"> <button name="button_refund" type="object" string="Refund" class="btn-primary" attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" /> - </xpath> + </xpath> --> <div class="oe_button_box" name="button_box"> - <button name="action_open_advance_payment_move" + <field name="advance_payment_move_ids" invisible="1"/> + <button name="action_open_advance_payment_moves" type="object" class="oe_stat_button" icon="fa-book" - width="250px" - attrs="{'invisible': [('advance_payment_move_id','=',False)]}"> - <field name="advance_payment_move_id" string="Journal Uang Muka" widget="statinfo"/> + attrs="{'invisible': [('advance_payment_move_ids', '=', [])]}"> + <field name="advance_payment_move_count" widget="statinfo" string="Journals"/> </button> - <button type="object" + <!-- <button type="object" name="action_view_related_refunds" class="oe_stat_button" icon="fa-refresh" attrs="{'invisible': [('refund_count', '=', 0)]}"> <field name="refund_count" widget="statinfo" string="Refund"/> - </button> + </button> --> </div> <field name="payment_term_id" position="after"> <field name="create_uid" invisible="1"/> @@ -176,7 +176,10 @@ <field name="expected_ready_to_ship"/> <field name="eta_date_start"/> <field name="eta_date" readonly="1"/> - <field name="has_refund" readonly="1"/> + <!-- <field name="has_refund" readonly="1"/> --> + </group> + <group string="Return Doc"> + <field name="ccm_id" readonly="1"/> </group> </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" @@ -658,7 +661,7 @@ </record> </data> - <data> + <!-- <data> <record id="sale_order_multi_create_refund_ir_actions_server" model="ir.actions.server"> <field name="name">Refund</field> <field name="model_id" ref="sale.model_sale_order"/> @@ -666,7 +669,7 @@ <field name="state">code</field> <field name="code">action = records.open_form_multi_create_refund()</field> </record> - </data> + </data> --> <data> <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template"> |