-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CLN] delivery: clean files organization
Part-of: odoo#115811
- Loading branch information
Showing
9 changed files
with
75 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<odoo> | ||
<data noupdate="1"> | ||
<record id="product_category_deliveries" model="product.category"> | ||
<field name="parent_id" ref="product.product_category_all"/> | ||
<field name="name">Deliveries</field> | ||
</record> | ||
<record id="product_product_delivery" model="product.product"> | ||
<field name="name">Standard delivery</field> | ||
<field name="default_code">Delivery_007</field> | ||
<field name="type">service</field> | ||
<field name="categ_id" ref="delivery.product_category_deliveries"/> | ||
<field name="sale_ok" eval="False"/> | ||
<field name="purchase_ok" eval="False"/> | ||
<field name="list_price">0.0</field> | ||
<field name="invoice_policy">order</field> | ||
</record> | ||
<record id="free_delivery_carrier" model="delivery.carrier"> | ||
<field name="name">Standard delivery</field> | ||
<field name="fixed_price">0.0</field> | ||
<field name="sequence">1</field> | ||
<field name="delivery_type">fixed</field> | ||
<field name="product_id" ref="delivery.product_product_delivery"/> | ||
</record> | ||
</data> | ||
<odoo noupdate="1"> | ||
|
||
<record id="product_category_deliveries" model="product.category"> | ||
<field name="parent_id" ref="product.product_category_all"/> | ||
<field name="name">Deliveries</field> | ||
</record> | ||
<record id="product_product_delivery" model="product.product"> | ||
<field name="name">Standard delivery</field> | ||
<field name="default_code">Delivery_007</field> | ||
<field name="type">service</field> | ||
<field name="categ_id" ref="delivery.product_category_deliveries"/> | ||
<field name="sale_ok" eval="False"/> | ||
<field name="purchase_ok" eval="False"/> | ||
<field name="list_price">0.0</field> | ||
<field name="invoice_policy">order</field> | ||
</record> | ||
<record id="free_delivery_carrier" model="delivery.carrier"> | ||
<field name="name">Standard delivery</field> | ||
<field name="fixed_price">0.0</field> | ||
<field name="sequence">1</field> | ||
<field name="delivery_type">fixed</field> | ||
<field name="product_id" ref="delivery.product_product_delivery"/> | ||
</record> | ||
|
||
</odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<odoo> | ||
<template id="delivery_report_saleorder_document" inherit_id="sale.report_saleorder_document"> | ||
<xpath expr="//p[@name='order_note']" position="before"> | ||
<p t-if="doc.carrier_id.carrier_description" id="carrier_description"> | ||
<strong>Shipping Description:</strong> | ||
<span t-out="doc.carrier_id.carrier_description"/> | ||
|
||
<template id="delivery_report_saleorder_document" inherit_id="sale.report_saleorder_document"> | ||
<p name="order_note" position="before"> | ||
<p t-if="doc.carrier_id.carrier_description" id="carrier_description"> | ||
<strong>Shipping Description:</strong> | ||
<span t-out="doc.carrier_id.carrier_description"/> | ||
</p> | ||
</p> | ||
</xpath> | ||
</template> | ||
</template> | ||
|
||
</odoo> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version='1.0' encoding='utf-8'?> | ||
<odoo noupdate="1"> | ||
|
||
<record model="ir.rule" id="delivery_carrier_comp_rule"> | ||
<field name="name">Delivery Carrier multi-company</field> | ||
<field name="model_id" ref="model_delivery_carrier"/> | ||
<field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> | ||
</record> | ||
|
||
</odoo> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<odoo> | ||
|
||
<record id="view_partner_property_form" model="ir.ui.view"> | ||
<field name="name">res.partner.carrier.property.form.inherit</field> | ||
<field name="model">res.partner</field> | ||
<field name="inherit_id" ref="base.view_partner_form" /> | ||
<field name="arch" type="xml"> | ||
<group name="sale" position="inside"> | ||
<field name="property_delivery_carrier_id"/> | ||
</group> | ||
</field> | ||
</record> | ||
|
||
</odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters