|
@ -42,15 +42,16 @@ |
|
|
class="oe_subtotal_footer_separator" |
|
|
class="oe_subtotal_footer_separator" |
|
|
widget='monetary' |
|
|
widget='monetary' |
|
|
options="{'currency_field': 'currency_id'}"/> |
|
|
options="{'currency_field': 'currency_id'}"/> |
|
|
<!-- <field name="tax_totals_json"--> |
|
|
|
|
|
<!-- widget="account-tax-totals-field" nolabel="1"--> |
|
|
|
|
|
<!-- colspan="2" invisible="1"/>--> |
|
|
|
|
|
</group> |
|
|
</group> |
|
|
<group colspan="4"> |
|
|
|
|
|
<field name="note" nolabel="1" |
|
|
<group colspan="4"> |
|
|
placeholder="Terms and conditions..."/> |
|
|
<field colspan="2" name="note" nolabel="1" placeholder="Terms and conditions..."/> |
|
|
</group> |
|
|
</group> |
|
|
<div class="oe_clear"/> |
|
|
<group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total"> |
|
|
|
|
|
<field name="tax_totals" widget="account-tax-totals-field" nolabel="1" colspan="2" readonly="1"/> |
|
|
|
|
|
</group> |
|
|
|
|
|
<div class="clearfix"/> |
|
|
|
|
|
|
|
|
</group> |
|
|
</group> |
|
|
|
|
|
|
|
|
</xpath> |
|
|
</xpath> |
|
@ -68,7 +69,7 @@ |
|
|
<field name="inherit_id" ref="sale.view_order_form"/> |
|
|
<field name="inherit_id" ref="sale.view_order_form"/> |
|
|
<field name="arch" type="xml"> |
|
|
<field name="arch" type="xml"> |
|
|
<xpath expr="//page/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after"> |
|
|
<xpath expr="//page/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after"> |
|
|
<field name="total_discount" force_save="1"/> |
|
|
<field name="total_discount" force_save="1" invisible="1"/> |
|
|
</xpath> |
|
|
</xpath> |
|
|
</field> |
|
|
</field> |
|
|
</record> |
|
|
</record> |
|
|