pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CLN] delivery: clean files organization

Browse Source 
Part-of: odoo/odoo#115811
This commit is contained in:
Victor Feyens
2023-03-20 15:31:46 +01:00
parent a80f32bbe5
commit f203b1e730
9 changed files with 76 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/__manifest__.py
+9 -6
View File
@@ -13,14 +13,17 @@ The system is able to add and compute the shipping line.
""",
'depends': ['sale'],
'data': [
'security/ir.model.access.csv',
'security/delivery_carrier_security.xml',
'views/delivery_view.xml',
'views/partner_view.xml',
'data/delivery_data.xml',
'views/res_config_settings_views.xml',
'wizard/choose_delivery_carrier_views.xml',
'security/ir.model.access.csv',
'security/ir_rules.xml',
'report/ir_actions_report_templates.xml',
'views/delivery_view.xml',
'views/res_partner_views.xml',
'wizard/res_config_settings_views.xml',
'wizard/choose_delivery_carrier_views.xml',
],
'demo': ['data/delivery_demo.xml'],
'installable': True,
addons/delivery/data/delivery_data.xml
+24 -24
View File
@@ -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>
addons/delivery/data/delivery_demo.xml
+2 -3
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<odoo noupdate="1">
<!-- Carrier -->
@@ -71,5 +70,5 @@
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier_id')]"/>
<field name="value" eval="'delivery.carrier,'+str(ref('delivery_local_delivery'))"/>
</record>
</data>
</odoo>
addons/delivery/report/ir_actions_report_templates.xml
+9 -7
View File
@@ -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>
addons/delivery/security/delivery_carrier_security.xml
-10
View File
@@ -1,10 +0,0 @@
<?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>
addons/delivery/security/ir_rules.xml
+10
View File
@@ -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>
addons/delivery/views/partner_view.xml
-15
View File
@@ -1,15 +0,0 @@
<?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>
addons/delivery/views/res_partner_views.xml
+15
View File
@@ -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>
addons/delivery/views/res_config_settings_views.xml → addons/delivery/wizard/res_config_settings_views.xml
+7 -3
View File
@@ -6,13 +6,17 @@
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="sale.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//setting[@id='delivery']" position="inside">
<setting id="delivery" position="inside">
<div class="content-group">
<div class="mt8" attrs="{'invisible': [('module_delivery','=',False)]}">
<button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Shipping Methods" class="btn-link"/>
<button name="%(delivery.action_delivery_carrier_form)d"
type="action"
class="btn-link"
icon="fa-arrow-right"
string="Shipping Methods"/>
</div>
</div>
</xpath>
</setting>
</field>
</record>