Skip to content

Commit 40efd30

Browse files
sbejaouidsolanki-initos
authored andcommitted
[14.0][MIG] - purchase_fop_shipping
1 parent bb0ee02 commit 40efd30

File tree

5 files changed

+77
-29
lines changed

5 files changed

+77
-29
lines changed

purchase_fop_shipping/__manifest__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# © 2017 Akretion (http://www.akretion.com)
1+
# © 2017 Akretion (http://www.akretion.com) Payment
22
# @author Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
44

55
{
6-
"name": "Purchase Free-Of-Paiment shipping",
7-
"version": "13.0.1.0.0",
6+
"name": "Purchase Free-Of-Payment shipping",
7+
"version": "14.0.1.0.0",
88
"author": "Akretion,Odoo Community Association (OCA)",
99
"website": "https://github.com/OCA/purchase-workflow",
1010
"maintainer": "Akretion",

purchase_fop_shipping/i18n/purchase_fop_shipping.pot

+44-20
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
11
# Translation of Odoo Server.
22
# This file contains the translation of the following modules:
3-
# * purchase_fop_shipping
3+
# * purchase_fop_shipping
44
#
55
msgid ""
66
msgstr ""
7-
"Project-Id-Version: Odoo Server 10.0\n"
7+
"Project-Id-Version: Odoo Server 14.0\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"Last-Translator: <>\n"
9+
"Last-Translator: \n"
1010
"Language-Team: \n"
1111
"MIME-Version: 1.0\n"
1212
"Content-Type: text/plain; charset=UTF-8\n"
1313
"Content-Transfer-Encoding: \n"
1414
"Plural-Forms: \n"
1515

1616
#. module: purchase_fop_shipping
17-
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop
17+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop
1818
msgid "Confirm under FOP"
1919
msgstr ""
2020

2121
#. module: purchase_fop_shipping
22-
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached
22+
#: model:ir.model,name:purchase_fop_shipping.model_res_partner
23+
msgid "Contact"
24+
msgstr ""
25+
26+
#. module: purchase_fop_shipping
27+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__display_name
28+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__display_name
29+
msgid "Display Name"
30+
msgstr ""
31+
32+
#. module: purchase_fop_shipping
33+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached
2334
msgid "FOP reached"
2435
msgstr ""
2536

2637
#. module: purchase_fop_shipping
27-
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping
28-
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping
29-
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping
38+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping
39+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping
40+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping
3041
msgid "FOP shipping"
3142
msgstr ""
3243

3344
#. module: purchase_fop_shipping
34-
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop
45+
#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager
46+
msgid "FOP shipping Manager"
47+
msgstr ""
48+
49+
#. module: purchase_fop_shipping
50+
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop
3551
msgid "Force confirm purchase order under Free-Of-Payment shipping"
3652
msgstr ""
3753

3854
#. module: purchase_fop_shipping
39-
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached
55+
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached
4056
msgid "Free-Of-Payment shipping reached"
4157
msgstr ""
4258

4359
#. module: purchase_fop_shipping
44-
#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping
45-
#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping
46-
msgid "Min purchase order amount for FOP shipping"
60+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__id
61+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__id
62+
msgid "ID"
4763
msgstr ""
4864

4965
#. module: purchase_fop_shipping
50-
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping
51-
msgid "Min purchase order amount for Free-Of-Payment shipping"
66+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order____last_update
67+
#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner____last_update
68+
msgid "Last Modified on"
5269
msgstr ""
5370

5471
#. module: purchase_fop_shipping
55-
#: model:ir.model,name:purchase_fop_shipping.model_res_partner
56-
msgid "Partner"
72+
#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping
73+
#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping
74+
msgid "Min purchase order amount for FOP shipping"
75+
msgstr ""
76+
77+
#. module: purchase_fop_shipping
78+
#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping
79+
msgid "Min purchase order amount for Free-Of-Payment shipping"
5780
msgstr ""
5881

5982
#. module: purchase_fop_shipping
@@ -62,8 +85,9 @@ msgid "Purchase Order"
6285
msgstr ""
6386

6487
#. module: purchase_fop_shipping
65-
#: code:addons/purchase_fop_shipping/models/purchase.py:38
88+
#: code:addons/purchase_fop_shipping/models/purchase.py:0
6689
#, python-format
67-
msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"."
90+
msgid ""
91+
"You cannot confirm a purchase order with amount under FOP shipping. To force"
92+
" confirm you must belongs to \"FOP shipping Manager\"."
6893
msgstr ""
69-

purchase_fop_shipping/models/purchase.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class PurchaseOrder(models.Model):
2929
)
3030

3131
@api.depends(
32-
"amount_total", "partner_id.fop_shipping",
32+
"amount_total",
33+
"partner_id.fop_shipping",
3334
)
3435
def _compute_fop_shipping_reached(self):
3536
digit_precision = self.env["decimal.precision"].precision_get("Account")

purchase_fop_shipping/security/res_groups.xml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<odoo>
33
<record id="group_fop_shipping_purchase_manager" model="res.groups">
44
<field name="name">FOP shipping Manager</field>
5-
<field name="category_id" ref="base.module_category_operations_purchase" />
65
<field name="implied_ids" eval="[(4, ref('purchase.group_purchase_user'))]" />
76
<field name="users" eval="[(4, ref('base.user_root'))]" />
87
</record>

purchase_fop_shipping/views/purchase_order.xml

+28-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,38 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
3-
<record model="ir.ui.view" id="origin_type_purchase_order_tree">
3+
<record model="ir.ui.view" id="purchase_order_tree">
44
<field name="model">purchase.order</field>
55
<field name="type">tree</field>
66
<field name="inherit_id" ref="purchase.purchase_order_tree" />
77
<field name="arch" type="xml">
88
<xpath expr="//tree" position="attributes">
9-
<attribute name="decoration-danger">
10-
fop_reached == False
11-
</attribute>
9+
<attribute name="decoration-danger">fop_reached == False</attribute>
10+
</xpath>
11+
<field name="origin" position="after">
12+
<field name="fop_reached" optional="show" />
13+
</field>
14+
</field>
15+
</record>
16+
<record model="ir.ui.view" id="purchase_order_view_tree">
17+
<field name="model">purchase.order</field>
18+
<field name="type">tree</field>
19+
<field name="inherit_id" ref="purchase.purchase_order_view_tree" />
20+
<field name="arch" type="xml">
21+
<xpath expr="//tree" position="attributes">
22+
<attribute name="decoration-danger">fop_reached == False</attribute>
23+
</xpath>
24+
<field name="origin" position="after">
25+
<field name="fop_reached" optional="show" />
26+
</field>
27+
</field>
28+
</record>
29+
<record model="ir.ui.view" id="purchase_order_kpis_tree">
30+
<field name="model">purchase.order</field>
31+
<field name="type">tree</field>
32+
<field name="inherit_id" ref="purchase.purchase_order_kpis_tree" />
33+
<field name="arch" type="xml">
34+
<xpath expr="//tree" position="attributes">
35+
<attribute name="decoration-danger">fop_reached == False</attribute>
1236
</xpath>
1337
<field name="origin" position="after">
1438
<field name="fop_reached" optional="show" />

0 commit comments

Comments
 (0)