Skip to content

Commit d607b7f

Browse files
committed
[FIX] 3pl_logistic_company: fix post-oxp
1 parent 2e25d30 commit d607b7f

18 files changed

+1067
-1100
lines changed

.weblate.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,6 @@
326326
"filemask": "library/i18n/*.po",
327327
"new_base": "library/i18n/library.pot"
328328
},
329-
{
330-
"name": "logistic_company",
331-
"filemask": "logistic_company/i18n/*.po",
332-
"new_base": "logistic_company/i18n/logistic_company.pot"
333-
},
334329
{
335330
"name": "marketing_agency",
336331
"filemask": "marketing_agency/i18n/*.po",

3pl_logistic_company/__manifest__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,16 @@
6161
'demo/mrp_bom.xml',
6262
'demo/mrp_bom_line.xml',
6363
'demo/stock_lot.xml',
64-
'demo/stock_quant.xml',
65-
'demo/x_stock_history.xml',
6664
'demo/website_theme_apply.xml',
6765
'demo/crm_lead.xml',
6866
'demo/stock_package.xml',
67+
'demo/x_stock_history.xml',
6968
'demo/sale_order.xml',
7069
'demo/sale_order_line.xml',
7170
'demo/sale_order_confirm.xml',
72-
'demo/account_move.xml',
7371
'demo/stock_picking.xml',
7472
'demo/stock_move.xml',
7573
'demo/stock_move_line.xml',
76-
'demo/quality_check.xml',
7774
],
7875
'cloc_exclude': [
7976
'data/ir_cron.xml',

3pl_logistic_company/data/ir_cron.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<field name="model_id" ref="x_stock_history_model"/>
99
<field name="state">code</field>
1010
<field name="code"><![CDATA[
11-
for sq in env['stock.quant'].search([('location_id.usage', '=', 'internal')]):
11+
for sq in env['stock.quant'].search([('location_id.usage', '=', 'internal'), ('inventory_quantity_auto_apply', '&gt;', 0.0)]):
1212
sh = env['x_stock_history'].create({
1313
'x_date': datetime.datetime.today().date(),
1414
'x_history_owner_id': sq.product_tmpl_id.x_owner_id.id,

3pl_logistic_company/data/ir_ui_view.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929
<record id="res_partner_form_custo_logistic_company" model="ir.ui.view">
3030
<field name="name">res.partner.form.custo.logistic.company</field>
3131
<field name="model">res.partner</field>
32-
<field name="inherit_id" ref="base.view_partner_form"/>
32+
<field name="inherit_id" ref="calendar.view_partners_form"/>
3333
<field name="mode">extension</field>
3434
<field name="active" eval="True"/>
35+
<field name="priority" eval="150"/>
3536
<field name="arch" type="xml">
36-
<xpath expr="//div[@name='button_box']" position="inside">
37+
<xpath expr="//button[@icon='fa-calendar']" position="before">
3738
<button class="oe_stat_button" icon="fa-home" type="action" name="%(action_window_partner_see_products)d">
3839
<field widget="statinfo" name="x_partner_related_products" string="Products"/>
3940
</button>

3pl_logistic_company/data/product_template.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<field name="categ_id" ref="product_category_5"/>
2727
<field name="is_storable" eval="True"/>
2828
<field name="responsible_id" ref="base.user_admin"/>
29-
<field name="tracking">lot</field>
3029
<field name="purchase_method">receive</field>
3130
<field name="service_type">manual</field>
3231
<field name="invoice_policy">order</field>
@@ -48,31 +47,31 @@
4847
<field name="responsible_id" ref="base.user_admin"/>
4948
<field name="purchase_method">purchase</field>
5049
<field name="service_type">manual</field>
51-
<field name="invoice_policy">delivery</field>
50+
<field name="invoice_policy">order</field>
5251
</record>
5352
<record id="product_template_17" model="product.template" context="{'create_product_product': False}">
5453
<field name="name">Extra's</field>
5554
<field name="type">service</field>
5655
<field name="responsible_id" ref="base.user_admin"/>
5756
<field name="purchase_method">purchase</field>
5857
<field name="service_type">manual</field>
59-
<field name="invoice_policy">delivery</field>
58+
<field name="invoice_policy">order</field>
6059
</record>
6160
<record id="product_template_15" model="product.template" context="{'create_product_product': False}">
6261
<field name="name">Handling Charges Input</field>
6362
<field name="type">service</field>
6463
<field name="responsible_id" ref="base.user_admin"/>
6564
<field name="purchase_method">purchase</field>
6665
<field name="service_type">manual</field>
67-
<field name="invoice_policy">delivery</field>
66+
<field name="invoice_policy">order</field>
6867
</record>
6968
<record id="product_template_16" model="product.template" context="{'create_product_product': False}">
7069
<field name="name">Handling Charges Output</field>
7170
<field name="type">service</field>
7271
<field name="responsible_id" ref="base.user_admin"/>
7372
<field name="purchase_method">purchase</field>
7473
<field name="service_type">manual</field>
75-
<field name="invoice_policy">delivery</field>
74+
<field name="invoice_policy">order</field>
7675
</record>
7776
<record id="product_template_5" model="product.template" context="{'create_product_product': False}">
7877
<field name="name">Hydrate powder</field>
@@ -94,7 +93,7 @@
9493
<field name="responsible_id" ref="base.user_admin"/>
9594
<field name="purchase_method">purchase</field>
9695
<field name="service_type">manual</field>
97-
<field name="invoice_policy">delivery</field>
96+
<field name="invoice_policy">order</field>
9897
<field name="recurring_invoice" eval="True"/>
9998
</record>
10099
<record id="product_template_13" model="product.template" context="{'create_product_product': False}">
@@ -105,7 +104,7 @@
105104
<field name="responsible_id" ref="base.user_admin"/>
106105
<field name="purchase_method">purchase</field>
107106
<field name="service_type">manual</field>
108-
<field name="invoice_policy">delivery</field>
107+
<field name="invoice_policy">order</field>
109108
<field name="recurring_invoice" eval="True"/>
110109
</record>
111110
<record id="product_template_2" model="product.template" context="{'create_product_product': False}">
@@ -148,7 +147,7 @@
148147
<field name="responsible_id" ref="base.user_admin"/>
149148
<field name="purchase_method">purchase</field>
150149
<field name="service_type">manual</field>
151-
<field name="invoice_policy">delivery</field>
150+
<field name="invoice_policy">order</field>
152151
</record>
153152
<record id="product_template_20" model="product.template" context="{'create_product_product': False}">
154153
<field name="name">Storage - High-Bay</field>

3pl_logistic_company/data/stock_warehouse.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
33
<record id="stock.warehouse0" model="stock.warehouse" forcecreate="1">
4-
<field name="name">02-09-25-3PL</field>
54
<field name="lot_stock_id" ref="stock.stock_location_stock"/>
65
<field name="code">WH</field>
76
<field name="reception_steps">two_steps</field>

3pl_logistic_company/demo/account_move.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="mrp_bom_line_1" model="mrp.bom.line">
4-
<field name="product_id" ref="product_product_7"/>
5-
<field name="bom_id" ref="mrp_bom_1"/>
6-
</record>
7-
<record id="mrp_bom_line_2" model="mrp.bom.line">
8-
<field name="product_id" ref="product_product_5"/>
9-
<field name="bom_id" ref="mrp_bom_1"/>
10-
</record>
11-
<record id="mrp_bom_line_3" model="mrp.bom.line">
12-
<field name="product_id" ref="product_product_6"/>
13-
<field name="bom_id" ref="mrp_bom_1"/>
14-
<field name="product_qty">2.0</field>
15-
</record>
16-
<record id="mrp_bom_line_4" model="mrp.bom.line">
17-
<field name="product_id" ref="product_product_9"/>
18-
<field name="bom_id" ref="mrp_bom_1"/>
19-
</record>
3+
<record id="mrp_bom_line_1" model="mrp.bom.line">
4+
<field name="product_id" ref="product_product_7"/>
5+
<field name="bom_id" ref="mrp_bom_1"/>
6+
</record>
7+
<record id="mrp_bom_line_2" model="mrp.bom.line">
8+
<field name="product_id" ref="product_product_5"/>
9+
<field name="bom_id" ref="mrp_bom_1"/>
10+
</record>
11+
<record id="mrp_bom_line_3" model="mrp.bom.line">
12+
<field name="product_id" ref="product_product_6"/>
13+
<field name="bom_id" ref="mrp_bom_1"/>
14+
<field name="product_qty">2.0</field>
15+
</record>
16+
<record id="mrp_bom_line_4" model="mrp.bom.line">
17+
<field name="product_id" ref="product_product_9"/>
18+
<field name="bom_id" ref="mrp_bom_1"/>
19+
</record>
2020
</odoo>

3pl_logistic_company/demo/quality_check.xml

Lines changed: 0 additions & 53 deletions
This file was deleted.

3pl_logistic_company/demo/sale_order_line.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<field name="product_uom_id" ref="uom.product_uom_unit"/>
99
<field name="price_unit">11.0</field>
1010
<field name="technical_price_unit">11.0</field>
11-
<!-- <field name="x_subscription_state">3_progress</field> -->
1211
</record>
1312
<record id="sale_order_line_13" model="sale.order.line">
1413
<field name="order_id" ref="sale_order_3"/>
@@ -19,7 +18,6 @@ This price is calculated per Standard Pallet per month]]></field>
1918
<field name="product_uom_id" ref="uom.product_uom_unit"/>
2019
<field name="price_unit">9.0</field>
2120
<field name="technical_price_unit">9.0</field>
22-
<!-- <field name="x_subscription_state">3_progress</field> -->
2321
</record>
2422
<record id="sale_order_line_1" model="sale.order.line">
2523
<field name="order_id" ref="sale_order_1"/>

0 commit comments

Comments
 (0)