delivery_carrier_partner_account: looks ready for first launch
This commit is contained in:
parent
9b882ec7f8
commit
5b696e8eab
3 changed files with 29 additions and 1 deletions
|
|
@ -35,6 +35,8 @@
|
||||||
"views/res_partner_views.xml",
|
"views/res_partner_views.xml",
|
||||||
"views/delivery_carrier_views.xml",
|
"views/delivery_carrier_views.xml",
|
||||||
"views/delivery_carrier_account_views.xml",
|
"views/delivery_carrier_account_views.xml",
|
||||||
|
"views/sale_order_views.xml",
|
||||||
|
"views/stock_picking_views.xml",
|
||||||
"wizard/choose_delivery_carrier_views.xml",
|
"wizard/choose_delivery_carrier_views.xml",
|
||||||
],
|
],
|
||||||
"assets": {},
|
"assets": {},
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,14 @@
|
||||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||||
<field name="model">sale.order</field>
|
<field name="model">sale.order</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
<group name="sale_shipping" position="inside">
|
||||||
|
<field name="valid_carrier_account_ids" invisible="1"/>
|
||||||
|
<field name="carrier_id"/>
|
||||||
|
<field name="delivery_billing_mode"/>
|
||||||
|
<field name="carrier_account_id"
|
||||||
|
domain="[('id', 'in', valid_carrier_account_ids)]"
|
||||||
|
readonly="not delivery_billing_mode or delivery_billing_mode == 'no charge'"/>
|
||||||
|
</group>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<odoo>
|
||||||
|
<record id="stock_picking_view_form" model="ir.ui.view">
|
||||||
|
<field name="name">stock.picking.view.form</field>
|
||||||
|
<field name="model">stock.picking</field>
|
||||||
|
<field name="inherit_id" ref="stock_delivery.view_picking_withcarrier_out_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="carrier_id" position="after">
|
||||||
|
<field name="valid_carrier_account_ids" invisible="1"/>
|
||||||
|
<field name="delivery_billing_mode"/>
|
||||||
|
<field name="carrier_account_id"
|
||||||
|
domain="[('id', 'in', valid_carrier_account_ids)]"
|
||||||
|
readonly="not delivery_billing_mode or delivery_billing_mode == 'no charge'"
|
||||||
|
/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
|
||||||
|
</record>
|
||||||
|
</odoo>
|
||||||
Loading…
Reference in a new issue