From e4afee30eae4a2d1b1df27bb0a63d2cb1868dcc3 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Tue, 7 Feb 2017 12:26:52 +0100 Subject: [PATCH 01/34] [FIX] mv module --- purchase_fop_shipping/README.rst | 62 +++++++++++++ purchase_fop_shipping/__init__.py | 6 ++ purchase_fop_shipping/__openerp__.py | 22 +++++ purchase_fop_shipping/i18n/fr.po | 89 +++++++++++++++++++ .../i18n/purchase_fop_shipping.pot | 87 ++++++++++++++++++ purchase_fop_shipping/models/__init__.py | 7 ++ purchase_fop_shipping/models/partner.py | 13 +++ purchase_fop_shipping/models/purchase.py | 59 ++++++++++++ purchase_fop_shipping/views/partner_view.xml | 17 ++++ purchase_fop_shipping/views/purchase_view.xml | 34 +++++++ 10 files changed, 396 insertions(+) create mode 100644 purchase_fop_shipping/README.rst create mode 100755 purchase_fop_shipping/__init__.py create mode 100755 purchase_fop_shipping/__openerp__.py create mode 100755 purchase_fop_shipping/i18n/fr.po create mode 100644 purchase_fop_shipping/i18n/purchase_fop_shipping.pot create mode 100755 purchase_fop_shipping/models/__init__.py create mode 100755 purchase_fop_shipping/models/partner.py create mode 100755 purchase_fop_shipping/models/purchase.py create mode 100755 purchase_fop_shipping/views/partner_view.xml create mode 100755 purchase_fop_shipping/views/purchase_view.xml diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst new file mode 100644 index 00000000000..a98df6acaa2 --- /dev/null +++ b/purchase_fop_shipping/README.rst @@ -0,0 +1,62 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License AGPL-3 + +=========================== +Pruchase Free-Of-Paiment shipping +=========================== + +This module allows to define a Free-Of-Paiment (FOP) shipping on supplier. +FOP shipping is a min order amout to got shipping free from supplier. +User can force confirm order if he/she wishes. + +Installation +============ + +You need an Odoo/OCB installation updated up to at least on 27 august of 2015, +containing revision `617ef49 `_ + +Usage +===== + +.. imagedefine https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/142/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + + +Credits +======= + +Contributors +------------ + +* Mourad EL HADJ MIMOUNE + +Icon +---- + +* Original Odoo purchase module icon +* https://openclipart.org/detail/159937/clothing-label-with-rope + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. \ No newline at end of file diff --git a/purchase_fop_shipping/__init__.py b/purchase_fop_shipping/__init__.py new file mode 100755 index 00000000000..614bb8f8296 --- /dev/null +++ b/purchase_fop_shipping/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/purchase_fop_shipping/__openerp__.py b/purchase_fop_shipping/__openerp__.py new file mode 100755 index 00000000000..f6a88abe37a --- /dev/null +++ b/purchase_fop_shipping/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Purchase Free-Of-Paiment shipping", + 'version': '1.1', + 'author': "Akretion,Odoo Community Association (OCA)", + 'maintainer': 'Akretion', + 'license': 'AGPL-3', + 'category': 'Delivery', + 'complexity': 'normal', + 'depends': ['purchase'], + 'website': 'http://www.akretion.com/', + 'data': ['views/purchase_view.xml', + 'views/partner_view.xml', + ], + 'tests': [], + 'installable': True, + 'auto_install': False, +} diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po new file mode 100755 index 00000000000..e0c6ff27dc8 --- /dev/null +++ b/purchase_fop_shipping/i18n/fr.po @@ -0,0 +1,89 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-09 15:18+0000\n" +"PO-Revision-Date: 2016-06-09 15:18+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: purchase_fop_shipping +#: field:purchase.order,force_order_under_fop:0 +msgid "Confirm under FOP" +msgstr "Confirmer sous Franco" + +#. module: purchase_fop_shipping +#: field:purchase.order,fop_reached:0 +msgid "FOP reached" +msgstr "Franco atteint" + +#. module: purchase_fop_shipping +#: field:purchase.order,fop_shipping:0 +#: field:res.partner,fop_shipping:0 +msgid "FOP shipping" +msgstr "Franco" + +#. module: purchase_fop_shipping +#: help:purchase.order,force_order_under_fop:0 +msgid "Force confirm order under Free-Of-Paiment shipping" +msgstr "Forcer la confirmation de la commande sous le franco" + +#. module: purchase_fop_shipping +#: help:purchase.order,fop_reached:0 +msgid "Free-Of-Paiment shipping reached" +msgstr "Franco atteint" + +#. module: purchase_fop_shipping +#: help:res.partner,fop_shipping:0 +msgid "Min order amount for FOP shipping" +msgstr "Franco de commande d'achat" + +#. module: purchase_fop_shipping +#: help:purchase.order,fop_shipping:0 +msgid "Min order amount for Free-Of-Paiment shipping" +msgstr "Franco de commande d'achat" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "Partenaire" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Commande d'achat" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:48 +#, python-format +msgid "You cannot confirm a purchase order with InvoiceControl Method 'Based on incoming shipments' thatdoesn't contain any stockable item." +msgstr "Vous ne pouvez pas confirmer une commande dont la méthode " +"facturation est basée sur les réception et qui n'a aucun produit stockable." + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:37 +#, python-format +msgid "You cannot confirm a purchase order with amount underFOP shipping." +msgstr "Vous ne pouvez pas confirmer une commande dont le montant est en " +"dessous du Franco." + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:41 +#, python-format +msgid "You cannot confirm a purchase order without anypurchase order line." +msgstr "Vous ne pouvez pas confirmer une commande d'achat sans aucune ligne." + +#. module: purchase_fop_shipping +#: view:purchase.order:purchase_fop_shipping.origin_type_purchase_order_tree +msgid "red:fop_reached ==\n" +" False;blue:fop_reached == True;grey:state=='cancel'" +msgstr "red:fop_reached ==\n" +" False;blue:fop_reached == True;grey:state=='cancel'" diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot new file mode 100644 index 00000000000..7fba6063fb7 --- /dev/null +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -0,0 +1,87 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-09 12:45+0000\n" +"PO-Revision-Date: 2016-06-09 12:45+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: purchase_fop_shipping +#: field:purchase.order,force_order_under_fop:0 +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: field:purchase.order,fop_reached:0 +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: field:purchase.order,fop_shipping:0 +#: field:res.partner,fop_shipping:0 +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: help:purchase.order,force_order_under_fop:0 +msgid "Force confirm order under Free-Of-Paiment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: help:purchase.order,fop_reached:0 +msgid "Free-Of-Paiment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: help:res.partner,fop_shipping:0 +msgid "Min order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: help:purchase.order,fop_shipping:0 +msgid "Min order amount for Free-Of-Paiment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:48 +#, python-format +msgid "You cannot confirm a purchase order with Invoice Control Method 'Based on incoming shipments' that doesn't contain any stockable item." +msgstr "" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:37 +#, python-format +msgid "You cannot confirm a purchase order with amount under FOP shipping." +msgstr "" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:41 +#, python-format +msgid "You cannot confirm a purchase order without any purchase order line." +msgstr "" + +#. module: purchase_fop_shipping +#: view:purchase.order:purchase_fop_shipping.origin_type_purchase_order_tree +msgid "red:fop_reached ==\n" +" False;blue:fop_reached == True;grey:state=='cancel'" +msgstr "" + diff --git a/purchase_fop_shipping/models/__init__.py b/purchase_fop_shipping/models/__init__.py new file mode 100755 index 00000000000..b2ab7520603 --- /dev/null +++ b/purchase_fop_shipping/models/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import partner +from . import purchase diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py new file mode 100755 index 00000000000..454c2970c99 --- /dev/null +++ b/purchase_fop_shipping/models/partner.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + fop_shipping = fields.Float( + 'FOP shipping', help='Min order amount for FOP shipping',) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py new file mode 100755 index 00000000000..d11882a3632 --- /dev/null +++ b/purchase_fop_shipping/models/purchase.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.exceptions import Warning as UserError +from openerp import models, fields, api, _ + + +class PurchaseOrder(models.Model): + + _inherit = "purchase.order" + fop_reached = fields.Boolean( + string='FOP reached', + help='Free-Of-Paiment shipping reached', + compute='_fop_shipping_reached') + force_order_under_fop = fields.Boolean( + string='Confirm under FOP', + help='Force confirm order under Free-Of-Paiment shipping',) + fop_shipping = fields.Float( + 'FOP shipping', + related='partner_id.fop_shipping', + readonly=True, + help='Min order amount for Free-Of-Paiment shipping',) + + @api.multi + @api.depends('amount_total', 'partner_id.fop_shipping') + def _fop_shipping_reached(self): + for record in self: + record.fop_reached = record.amount_total >\ + record.partner_id.fop_shipping + + @api.multi + def wkf_confirm_order(self): + todo = self.env['purchase.order.line'].browse([]) + for po in self: + if not po.force_order_under_fop and not po.fop_reached: + raise UserError( + _('You cannot confirm a purchase order with amount under ' + 'FOP shipping.')) + if not any(line.state != 'cancel' for line in po.order_line): + raise UserError( + _('You cannot confirm a purchase order without any ' + 'purchase order line.')) + if po.invoice_method == 'picking' and\ + not any([l.product_id and l.product_id.type in + ('product', 'consu') and + l.state != 'cancel' for l in po.order_line]): + raise UserError( + _("You cannot confirm a purchase order with Invoice " + "Control Method 'Based on incoming shipments' that " + "doesn't contain any stockable item.")) + + for line in po.order_line: + if line.state == 'draft': + todo += line + todo.action_confirm() + self.write({'state': 'confirmed', 'validator': self._uid}) + return True diff --git a/purchase_fop_shipping/views/partner_view.xml b/purchase_fop_shipping/views/partner_view.xml new file mode 100755 index 00000000000..7590039341a --- /dev/null +++ b/purchase_fop_shipping/views/partner_view.xml @@ -0,0 +1,17 @@ + + + + + fop.shipping.res.partner.form + res.partner + form + + + + + + + + + \ No newline at end of file diff --git a/purchase_fop_shipping/views/purchase_view.xml b/purchase_fop_shipping/views/purchase_view.xml new file mode 100755 index 00000000000..f3c6186adb1 --- /dev/null +++ b/purchase_fop_shipping/views/purchase_view.xml @@ -0,0 +1,34 @@ + + + + + purchase.order.tree + purchase.order + tree + + + + red:fop_reached == + False;blue:fop_reached == True;grey:state=='cancel' + + + + + + + + + + purchase.order.delivery.paid.form.view.inherit + purchase.order + + form + + + + + + + + + \ No newline at end of file From fff2299d113dc8d730ff4179ca63002569c29748 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Tue, 7 Feb 2017 16:18:10 +0100 Subject: [PATCH 02/34] [FIX] adapt code to v10.0 --- purchase_fop_shipping/README.rst | 3 +-- purchase_fop_shipping/__init__.py | 3 --- .../{__openerp__.py => __manifest__.py} | 7 +++-- purchase_fop_shipping/models/__init__.py | 3 --- purchase_fop_shipping/models/purchase.py | 26 +++---------------- purchase_fop_shipping/views/partner_view.xml | 4 +-- purchase_fop_shipping/views/purchase_view.xml | 4 +-- 7 files changed, 12 insertions(+), 38 deletions(-) rename purchase_fop_shipping/{__openerp__.py => __manifest__.py} (83%) diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index a98df6acaa2..7764162e1f8 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -13,8 +13,7 @@ User can force confirm order if he/she wishes. Installation ============ -You need an Odoo/OCB installation updated up to at least on 27 august of 2015, -containing revision `617ef49 `_ +You need an Odoo/OCB installation v 10.0. Usage ===== diff --git a/purchase_fop_shipping/__init__.py b/purchase_fop_shipping/__init__.py index 614bb8f8296..cde864bae21 100755 --- a/purchase_fop_shipping/__init__.py +++ b/purchase_fop_shipping/__init__.py @@ -1,6 +1,3 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) -# @author Mourad EL HADJ MIMOUNE -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/purchase_fop_shipping/__openerp__.py b/purchase_fop_shipping/__manifest__.py similarity index 83% rename from purchase_fop_shipping/__openerp__.py rename to purchase_fop_shipping/__manifest__.py index f6a88abe37a..6c1a1869234 100755 --- a/purchase_fop_shipping/__openerp__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -1,22 +1,21 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) +# © 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Purchase Free-Of-Paiment shipping", - 'version': '1.1', + 'version': '10.0.0.1.0', 'author': "Akretion,Odoo Community Association (OCA)", 'maintainer': 'Akretion', 'license': 'AGPL-3', - 'category': 'Delivery', + 'category': 'Purchase', 'complexity': 'normal', 'depends': ['purchase'], 'website': 'http://www.akretion.com/', 'data': ['views/purchase_view.xml', 'views/partner_view.xml', ], - 'tests': [], 'installable': True, 'auto_install': False, } diff --git a/purchase_fop_shipping/models/__init__.py b/purchase_fop_shipping/models/__init__.py index b2ab7520603..cfbefc2423c 100755 --- a/purchase_fop_shipping/models/__init__.py +++ b/purchase_fop_shipping/models/__init__.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) -# @author Mourad EL HADJ MIMOUNE -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import partner from . import purchase diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index d11882a3632..c04f17b4a48 100755 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) +# © 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -31,29 +31,11 @@ def _fop_shipping_reached(self): record.partner_id.fop_shipping @api.multi - def wkf_confirm_order(self): - todo = self.env['purchase.order.line'].browse([]) + def button_approve(self, force=False): for po in self: if not po.force_order_under_fop and not po.fop_reached: raise UserError( _('You cannot confirm a purchase order with amount under ' 'FOP shipping.')) - if not any(line.state != 'cancel' for line in po.order_line): - raise UserError( - _('You cannot confirm a purchase order without any ' - 'purchase order line.')) - if po.invoice_method == 'picking' and\ - not any([l.product_id and l.product_id.type in - ('product', 'consu') and - l.state != 'cancel' for l in po.order_line]): - raise UserError( - _("You cannot confirm a purchase order with Invoice " - "Control Method 'Based on incoming shipments' that " - "doesn't contain any stockable item.")) - - for line in po.order_line: - if line.state == 'draft': - todo += line - todo.action_confirm() - self.write({'state': 'confirmed', 'validator': self._uid}) - return True + result = super(PurchaseOrder, self).button_approve(force=force) + return result diff --git a/purchase_fop_shipping/views/partner_view.xml b/purchase_fop_shipping/views/partner_view.xml index 7590039341a..d344369857d 100755 --- a/purchase_fop_shipping/views/partner_view.xml +++ b/purchase_fop_shipping/views/partner_view.xml @@ -7,11 +7,11 @@ form - - \ No newline at end of file + diff --git a/purchase_fop_shipping/views/purchase_view.xml b/purchase_fop_shipping/views/purchase_view.xml index f3c6186adb1..6934783f925 100755 --- a/purchase_fop_shipping/views/purchase_view.xml +++ b/purchase_fop_shipping/views/purchase_view.xml @@ -24,11 +24,11 @@ form - + - \ No newline at end of file + From 75c58788c8b72e61b8ffbb55571cdb75126286cc Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Tue, 7 Feb 2017 17:07:00 +0100 Subject: [PATCH 03/34] [IMP] add test --- purchase_fop_shipping/tests/__init__.py | 2 + .../tests/test_fop_shipping.py | 49 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 purchase_fop_shipping/tests/__init__.py create mode 100644 purchase_fop_shipping/tests/test_fop_shipping.py diff --git a/purchase_fop_shipping/tests/__init__.py b/purchase_fop_shipping/tests/__init__.py new file mode 100644 index 00000000000..9b861517243 --- /dev/null +++ b/purchase_fop_shipping/tests/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import test_fop_shipping diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py new file mode 100644 index 00000000000..9661d1e9c71 --- /dev/null +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import openerp.tests.common as common +from openerp.exceptions import Warning as UserError +from openerp import fields + + +class TestPurchaseOrder(common.TransactionCase): + + def setUp(self): + super(TestPurchaseOrder, self).setUp() + self.product_1 = self.env.ref('product.product_product_4') + self.product_2 = self.env.ref('product.product_product_5b') + self.partner_3 = self.env.ref('base.res_partner_3') + self.partner_3.fop_shipping = 250 + po_model = self.env['purchase.order.line'] + self.purchase_order1 = self.env['purchase.order'].create( + {'partner_id': self.partner_3.id}) + self.po_line_1 = po_model.create( + {'order_id': self.purchase_order1.id, + 'product_id': self.product_1.id, + 'date_planned': fields.Datetime.now(), + 'name': 'Test', + 'product_qty': 1.0, + 'product_uom': self.product_1.uom_id.id, + 'price_unit': 100.0}) + self.purchase_order2 = self.env['purchase.order'].create( + {'partner_id': self.partner_3.id}) + self.po_line_2 = po_model.create( + {'order_id': self.purchase_order2.id, + 'product_id': self.product_2.id, + 'date_planned': fields.Datetime.now(), + 'name': 'Test', + 'product_qty': 10.0, + 'product_uom': self.product_2.uom_id.id, + 'price_unit': 45.0}) + + def test_purchase_order_vals(self): + with self.assertRaises(UserError): + self.purchase_order1.button_approve() + self.purchase_order2.button_approve() + self.assertEqual(self.purchase_order1.state, 'draft') + self.assertEqual(self.purchase_order2.state, 'purchase') + self.purchase_order1.force_order_under_fop = True + self.purchase_order1.button_approve() + self.assertEqual(self.purchase_order1.state, 'purchase') From 3e8e7f4e8c9ab6ac2c1f4cd5181e3a77934b554c Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Tue, 7 Feb 2017 17:10:14 +0100 Subject: [PATCH 04/34] [FIX] readme.rst --- purchase_fop_shipping/README.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index 7764162e1f8..613e099c157 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -7,7 +7,7 @@ Pruchase Free-Of-Paiment shipping =========================== This module allows to define a Free-Of-Paiment (FOP) shipping on supplier. -FOP shipping is a min order amout to got shipping free from supplier. +FOP shipping is a min order amount to got shipping free from supplier. User can force confirm order if he/she wishes. Installation @@ -18,9 +18,6 @@ You need an Odoo/OCB installation v 10.0. Usage ===== -.. imagedefine https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/142/8.0 Bug Tracker =========== From a87c93c85443116382d3724a020755c168d1e5b0 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Wed, 8 Feb 2017 11:28:24 +0100 Subject: [PATCH 05/34] [FIX] use last template ofreadme.rst --- purchase_fop_shipping/README.rst | 57 +++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index 613e099c157..8283e91a344 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -1,53 +1,72 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License AGPL-3 + :alt: License: AGPL-3 -=========================== +================================= Pruchase Free-Of-Paiment shipping -=========================== +================================= This module allows to define a Free-Of-Paiment (FOP) shipping on supplier. FOP shipping is a min order amount to got shipping free from supplier. -User can force confirm order if he/she wishes. +User can force confirm order if he/she wishes. -Installation -============ +Configuration +============= -You need an Odoo/OCB installation v 10.0. +To configure this module, you need to: +Define an amount of FOP shipping for suppliers Usage ===== +#. Go to ... + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/142/10.0 + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + +Known issues / Roadmap +====================== + +* ... Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. - +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= +Images +------ + +* Odoo Community Association: `Icon `_. + Contributors ------------ * Mourad EL HADJ MIMOUNE -Icon ----- +Funders +------- + +The development of this module has been financially supported by: -* Original Odoo purchase module icon -* https://openclipart.org/detail/159937/clothing-label-with-rope +* Asler Diffusion Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -55,4 +74,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. \ No newline at end of file +To contribute to this module, please visit https://odoo-community.org. From 9fd94fa5e99e57fa25e92dfbed098ffd54439079 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Wed, 8 Feb 2017 14:10:37 +0100 Subject: [PATCH 06/34] [FIX] typo, replace openerp by odoo,indentation, translation --- purchase_fop_shipping/__manifest__.py | 4 +- purchase_fop_shipping/i18n/fr.po | 59 ++++++------------ .../i18n/purchase_fop_shipping.pot | 51 +++++---------- purchase_fop_shipping/models/partner.py | 2 +- purchase_fop_shipping/models/purchase.py | 13 ++-- purchase_fop_shipping/views/partner_view.xml | 31 +++++----- purchase_fop_shipping/views/purchase_view.xml | 62 +++++++++---------- 7 files changed, 90 insertions(+), 132 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index 6c1a1869234..b3f2df7961b 100755 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -5,17 +5,15 @@ { "name": "Purchase Free-Of-Paiment shipping", - 'version': '10.0.0.1.0', + 'version': '10.0.1.0.0', 'author': "Akretion,Odoo Community Association (OCA)", 'maintainer': 'Akretion', 'license': 'AGPL-3', 'category': 'Purchase', - 'complexity': 'normal', 'depends': ['purchase'], 'website': 'http://www.akretion.com/', 'data': ['views/purchase_view.xml', 'views/partner_view.xml', ], 'installable': True, - 'auto_install': False, } diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po index e0c6ff27dc8..f8949d54a7a 100755 --- a/purchase_fop_shipping/i18n/fr.po +++ b/purchase_fop_shipping/i18n/fr.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-09 15:18+0000\n" -"PO-Revision-Date: 2016-06-09 15:18+0000\n" +"POT-Creation-Date: 2017-02-08 13:48+0000\n" +"PO-Revision-Date: 2017-02-08 13:48+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,40 +16,40 @@ msgstr "" "Plural-Forms: \n" #. module: purchase_fop_shipping -#: field:purchase.order,force_order_under_fop:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop msgid "Confirm under FOP" msgstr "Confirmer sous Franco" #. module: purchase_fop_shipping -#: field:purchase.order,fop_reached:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached msgid "FOP reached" msgstr "Franco atteint" #. module: purchase_fop_shipping -#: field:purchase.order,fop_shipping:0 -#: field:res.partner,fop_shipping:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping msgid "FOP shipping" msgstr "Franco" #. module: purchase_fop_shipping -#: help:purchase.order,force_order_under_fop:0 -msgid "Force confirm order under Free-Of-Paiment shipping" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm order under Free-Of-Payment shipping" msgstr "Forcer la confirmation de la commande sous le franco" #. module: purchase_fop_shipping -#: help:purchase.order,fop_reached:0 -msgid "Free-Of-Paiment shipping reached" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" msgstr "Franco atteint" #. module: purchase_fop_shipping -#: help:res.partner,fop_shipping:0 +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping msgid "Min order amount for FOP shipping" msgstr "Franco de commande d'achat" #. module: purchase_fop_shipping -#: help:purchase.order,fop_shipping:0 -msgid "Min order amount for Free-Of-Paiment shipping" -msgstr "Franco de commande d'achat" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min order amount for Free-Of-Payment shipping" +msgstr "Min de commande d'achat pour avoir une livraison gratuite (Franco)" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_res_partner @@ -59,31 +59,12 @@ msgstr "Partenaire" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" -msgstr "Commande d'achat" +msgstr "Commande fournisseur" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:48 +#: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format -msgid "You cannot confirm a purchase order with InvoiceControl Method 'Based on incoming shipments' thatdoesn't contain any stockable item." -msgstr "Vous ne pouvez pas confirmer une commande dont la méthode " -"facturation est basée sur les réception et qui n'a aucun produit stockable." - -#. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:37 -#, python-format -msgid "You cannot confirm a purchase order with amount underFOP shipping." +msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." msgstr "Vous ne pouvez pas confirmer une commande dont le montant est en " -"dessous du Franco." - -#. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:41 -#, python-format -msgid "You cannot confirm a purchase order without anypurchase order line." -msgstr "Vous ne pouvez pas confirmer une commande d'achat sans aucune ligne." - -#. module: purchase_fop_shipping -#: view:purchase.order:purchase_fop_shipping.origin_type_purchase_order_tree -msgid "red:fop_reached ==\n" -" False;blue:fop_reached == True;grey:state=='cancel'" -msgstr "red:fop_reached ==\n" -" False;blue:fop_reached == True;grey:state=='cancel'" +"dessous du Franco. Pour forcer les commande en dessous du franco," +"vous devez avoir le group \"Franco Manager\"" \ No newline at end of file diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot index 7fba6063fb7..da614b36b11 100644 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-09 12:45+0000\n" -"PO-Revision-Date: 2016-06-09 12:45+0000\n" +"POT-Creation-Date: 2017-02-08 13:51+0000\n" +"PO-Revision-Date: 2017-02-08 13:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,39 +16,39 @@ msgstr "" "Plural-Forms: \n" #. module: purchase_fop_shipping -#: field:purchase.order,force_order_under_fop:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: field:purchase.order,fop_reached:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: field:purchase.order,fop_shipping:0 -#: field:res.partner,fop_shipping:0 +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: help:purchase.order,force_order_under_fop:0 -msgid "Force confirm order under Free-Of-Paiment shipping" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: help:purchase.order,fop_reached:0 -msgid "Free-Of-Paiment shipping reached" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: help:res.partner,fop_shipping:0 +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping msgid "Min order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: help:purchase.order,fop_shipping:0 -msgid "Min order amount for Free-Of-Paiment shipping" +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min order amount for Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping @@ -62,26 +62,7 @@ msgid "Purchase Order" msgstr "" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:48 +#: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format -msgid "You cannot confirm a purchase order with Invoice Control Method 'Based on incoming shipments' that doesn't contain any stockable item." +msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." msgstr "" - -#. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:37 -#, python-format -msgid "You cannot confirm a purchase order with amount under FOP shipping." -msgstr "" - -#. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:41 -#, python-format -msgid "You cannot confirm a purchase order without any purchase order line." -msgstr "" - -#. module: purchase_fop_shipping -#: view:purchase.order:purchase_fop_shipping.origin_type_purchase_order_tree -msgid "red:fop_reached ==\n" -" False;blue:fop_reached == True;grey:state=='cancel'" -msgstr "" - diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py index 454c2970c99..d98c0e9fec0 100755 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -3,7 +3,7 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields +from odoo import models, fields class ResPartner(models.Model): diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index c04f17b4a48..3cbce9bcf6d 100755 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -3,8 +3,8 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.exceptions import Warning as UserError -from openerp import models, fields, api, _ +from odoo.exceptions import Warning as UserError +from odoo import models, fields, api, _ class PurchaseOrder(models.Model): @@ -12,16 +12,16 @@ class PurchaseOrder(models.Model): _inherit = "purchase.order" fop_reached = fields.Boolean( string='FOP reached', - help='Free-Of-Paiment shipping reached', + help='Free-Of-Payment shipping reached', compute='_fop_shipping_reached') force_order_under_fop = fields.Boolean( string='Confirm under FOP', - help='Force confirm order under Free-Of-Paiment shipping',) + help='Force confirm order under Free-Of-Payment shipping',) fop_shipping = fields.Float( 'FOP shipping', related='partner_id.fop_shipping', readonly=True, - help='Min order amount for Free-Of-Paiment shipping',) + help='Min order amount for Free-Of-Payment shipping',) @api.multi @api.depends('amount_total', 'partner_id.fop_shipping') @@ -36,6 +36,7 @@ def button_approve(self, force=False): if not po.force_order_under_fop and not po.fop_reached: raise UserError( _('You cannot confirm a purchase order with amount under ' - 'FOP shipping.')) + 'FOP shipping. To force confirm you must belongs to "FOP' + ' shipping Manager".')) result = super(PurchaseOrder, self).button_approve(force=force) return result diff --git a/purchase_fop_shipping/views/partner_view.xml b/purchase_fop_shipping/views/partner_view.xml index d344369857d..38513c59c1a 100755 --- a/purchase_fop_shipping/views/partner_view.xml +++ b/purchase_fop_shipping/views/partner_view.xml @@ -1,17 +1,16 @@ - - - - fop.shipping.res.partner.form - res.partner - form - - - - - - - - - + + + + res.partner + form + + + + + + + + + diff --git a/purchase_fop_shipping/views/purchase_view.xml b/purchase_fop_shipping/views/purchase_view.xml index 6934783f925..f1cfa5695b3 100755 --- a/purchase_fop_shipping/views/purchase_view.xml +++ b/purchase_fop_shipping/views/purchase_view.xml @@ -1,34 +1,32 @@ - - - - purchase.order.tree - purchase.order - tree - - - - red:fop_reached == - False;blue:fop_reached == True;grey:state=='cancel' - - - - - - - + + + + purchase.order + tree + + + + red:fop_reached == + False;blue:fop_reached == True;grey:state=='cancel' + + + + + + + - - purchase.order.delivery.paid.form.view.inherit - purchase.order - - form - - - - - - - - - + + purchase.order + + form + + + + + + + + + From 05d93291971fe0e99c8e7ce87c3e215d1adb3203 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Wed, 8 Feb 2017 15:11:12 +0100 Subject: [PATCH 07/34] [FIX] add group FOP shipping manager --- purchase_fop_shipping/security/purchase_group.xml | 13 +++++++++++++ purchase_fop_shipping/views/purchase_view.xml | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 purchase_fop_shipping/security/purchase_group.xml diff --git a/purchase_fop_shipping/security/purchase_group.xml b/purchase_fop_shipping/security/purchase_group.xml new file mode 100644 index 00000000000..2da9ba3bdc4 --- /dev/null +++ b/purchase_fop_shipping/security/purchase_group.xml @@ -0,0 +1,13 @@ + + + + + + FOP shipping Manager + + + + + + + \ No newline at end of file diff --git a/purchase_fop_shipping/views/purchase_view.xml b/purchase_fop_shipping/views/purchase_view.xml index f1cfa5695b3..c2378e4cc69 100755 --- a/purchase_fop_shipping/views/purchase_view.xml +++ b/purchase_fop_shipping/views/purchase_view.xml @@ -23,7 +23,8 @@ form - + From 6e50859fd091cdd6510cdd5a2da0276d62f65588 Mon Sep 17 00:00:00 2001 From: Mourad Elhadj Mimoune Date: Mon, 13 Feb 2017 09:13:52 +0100 Subject: [PATCH 08/34] [FIX] rename order to purchase order & fix typo --- purchase_fop_shipping/README.rst | 6 +- purchase_fop_shipping/i18n/de.po | 73 +++++++++++++++++ purchase_fop_shipping/i18n/es.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/es_PE.po | 78 +++++++++++++++++++ purchase_fop_shipping/i18n/fr.po | 38 +++++---- purchase_fop_shipping/i18n/fr_BE.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/gl.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/hr.po | 76 ++++++++++++++++++ purchase_fop_shipping/i18n/it.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/nl.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/nl_NL.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/pt_BR.po | 75 ++++++++++++++++++ .../i18n/purchase_fop_shipping.pot | 6 +- purchase_fop_shipping/i18n/ro.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/sl.po | 75 ++++++++++++++++++ purchase_fop_shipping/i18n/vi_VN.po | 75 ++++++++++++++++++ purchase_fop_shipping/models/partner.py | 2 +- purchase_fop_shipping/models/purchase.py | 4 +- 18 files changed, 1009 insertions(+), 24 deletions(-) create mode 100644 purchase_fop_shipping/i18n/de.po create mode 100644 purchase_fop_shipping/i18n/es.po create mode 100644 purchase_fop_shipping/i18n/es_PE.po mode change 100755 => 100644 purchase_fop_shipping/i18n/fr.po create mode 100644 purchase_fop_shipping/i18n/fr_BE.po create mode 100644 purchase_fop_shipping/i18n/gl.po create mode 100644 purchase_fop_shipping/i18n/hr.po create mode 100644 purchase_fop_shipping/i18n/it.po create mode 100644 purchase_fop_shipping/i18n/nl.po create mode 100644 purchase_fop_shipping/i18n/nl_NL.po create mode 100644 purchase_fop_shipping/i18n/pt_BR.po create mode 100644 purchase_fop_shipping/i18n/ro.po create mode 100644 purchase_fop_shipping/i18n/sl.po create mode 100644 purchase_fop_shipping/i18n/vi_VN.po diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index 8283e91a344..c6520607a93 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -3,12 +3,12 @@ :alt: License: AGPL-3 ================================= -Pruchase Free-Of-Paiment shipping +Purchase Free-Of-Paiment shipping ================================= This module allows to define a Free-Of-Paiment (FOP) shipping on supplier. -FOP shipping is a min order amount to got shipping free from supplier. -User can force confirm order if he/she wishes. +FOP shipping is a min purchase order amount to got shipping free from supplier. +User can force confirm purchase order if he/she wishes. Configuration ============= diff --git a/purchase_fop_shipping/i18n/de.po b/purchase_fop_shipping/i18n/de.po new file mode 100644 index 00000000000..f608380a392 --- /dev/null +++ b/purchase_fop_shipping/i18n/de.po @@ -0,0 +1,73 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-03 03:41+0000\n" +"PO-Revision-Date: 2017-03-03 03:41+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Bestellauftrag" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/es.po b/purchase_fop_shipping/i18n/es.po new file mode 100644 index 00000000000..0e0c517e3da --- /dev/null +++ b/purchase_fop_shipping/i18n/es.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-18 07:33+0000\n" +"PO-Revision-Date: 2017-05-18 07:33+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Orden de Compra" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/es_PE.po b/purchase_fop_shipping/i18n/es_PE.po new file mode 100644 index 00000000000..cacc61074c6 --- /dev/null +++ b/purchase_fop_shipping/i18n/es_PE.po @@ -0,0 +1,78 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# Henry Garcia , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-15 06:42+0000\n" +"PO-Revision-Date: 2017-07-15 06:42+0000\n" +"Last-Translator: Henry Garcia , 2017\n" +"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "Confirmar bajo libre de pago" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "Libre de pago alcanzado" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "Envío libre de pago" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "Forzar la orden de compra bajo el envio de libre de pago" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "Envío libre de pago alcanzado" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "Cantidad mìnima de pedido para envío libre de pago" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "Mínima cantidad de orden de compra para envío libre de pago" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "Socio" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Orden de compra" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" +"No puede confirmar una orden de compra con un importe bajo el envío libre de" +" pago. Para confirmar la confirmación, debe pertenecer a \"Administrar envio" +" Libre de pago\"." diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po old mode 100755 new mode 100644 index f8949d54a7a..44e6c1169cd --- a/purchase_fop_shipping/i18n/fr.po +++ b/purchase_fop_shipping/i18n/fr.po @@ -1,19 +1,22 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * purchase_fop_shipping -# +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-08 13:48+0000\n" -"PO-Revision-Date: 2017-02-08 13:48+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2017-11-24 07:53+0000\n" +"PO-Revision-Date: 2017-11-24 07:53+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop @@ -28,12 +31,13 @@ msgstr "Franco atteint" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping msgid "FOP shipping" msgstr "Franco" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop -msgid "Force confirm order under Free-Of-Payment shipping" +msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "Forcer la confirmation de la commande sous le franco" #. module: purchase_fop_shipping @@ -43,12 +47,13 @@ msgstr "Franco atteint" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -msgid "Min order amount for FOP shipping" +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" msgstr "Franco de commande d'achat" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping -msgid "Min order amount for Free-Of-Payment shipping" +msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "Min de commande d'achat pour avoir une livraison gratuite (Franco)" #. module: purchase_fop_shipping @@ -59,12 +64,15 @@ msgstr "Partenaire" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" -msgstr "Commande fournisseur" +msgstr "Bon de commande" #. module: purchase_fop_shipping #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format -msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." -msgstr "Vous ne pouvez pas confirmer une commande dont le montant est en " -"dessous du Franco. Pour forcer les commande en dessous du franco," -"vous devez avoir le group \"Franco Manager\"" \ No newline at end of file +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" +"Vous ne pouvez pas confirmer une commande dont le montant est en dessous du " +"Franco. Pour forcer les commande en dessous du franco,vous devez avoir le " +"group \"Franco Manager\"" diff --git a/purchase_fop_shipping/i18n/fr_BE.po b/purchase_fop_shipping/i18n/fr_BE.po new file mode 100644 index 00000000000..b6cbd7a18f1 --- /dev/null +++ b/purchase_fop_shipping/i18n/fr_BE.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-03 03:48+0000\n" +"PO-Revision-Date: 2018-03-03 03:48+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: French (Belgium) (https://www.transifex.com/oca/teams/23907/fr_BE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr_BE\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Commande fournisseur" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/gl.po b/purchase_fop_shipping/i18n/gl.po new file mode 100644 index 00000000000..c9e07367fbf --- /dev/null +++ b/purchase_fop_shipping/i18n/gl.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-01 02:48+0000\n" +"PO-Revision-Date: 2017-06-01 02:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Orde de compra" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/hr.po b/purchase_fop_shipping/i18n/hr.po new file mode 100644 index 00000000000..c43f453330f --- /dev/null +++ b/purchase_fop_shipping/i18n/hr.po @@ -0,0 +1,76 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-11 12:53+0000\n" +"PO-Revision-Date: 2017-07-11 12:53+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Nabavni nalog" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po new file mode 100644 index 00000000000..d28512dc5d4 --- /dev/null +++ b/purchase_fop_shipping/i18n/it.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-18 07:33+0000\n" +"PO-Revision-Date: 2017-05-18 07:33+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Ordine Acquisto" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/nl.po b/purchase_fop_shipping/i18n/nl.po new file mode 100644 index 00000000000..03a2b014026 --- /dev/null +++ b/purchase_fop_shipping/i18n/nl.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# Erwin van der Ploeg , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-26 00:58+0000\n" +"PO-Revision-Date: 2017-04-26 00:58+0000\n" +"Last-Translator: Erwin van der Ploeg , 2017\n" +"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Inkooporder" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/nl_NL.po b/purchase_fop_shipping/i18n/nl_NL.po new file mode 100644 index 00000000000..3790aafd95b --- /dev/null +++ b/purchase_fop_shipping/i18n/nl_NL.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-22 02:44+0000\n" +"PO-Revision-Date: 2017-06-22 02:44+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Inkooporder" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po new file mode 100644 index 00000000000..99a2331c677 --- /dev/null +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-24 07:53+0000\n" +"PO-Revision-Date: 2017-11-24 07:53+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Ordem de Compra" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot index da614b36b11..39c13bedff9 100644 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -33,7 +33,7 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop -msgid "Force confirm order under Free-Of-Payment shipping" +msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping @@ -43,12 +43,12 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -msgid "Min order amount for FOP shipping" +msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping -msgid "Min order amount for Free-Of-Payment shipping" +msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping diff --git a/purchase_fop_shipping/i18n/ro.po b/purchase_fop_shipping/i18n/ro.po new file mode 100644 index 00000000000..06dea1373f2 --- /dev/null +++ b/purchase_fop_shipping/i18n/ro.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-01 02:48+0000\n" +"PO-Revision-Date: 2017-06-01 02:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Comandă achiziție" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/sl.po b/purchase_fop_shipping/i18n/sl.po new file mode 100644 index 00000000000..610f1aeb8c2 --- /dev/null +++ b/purchase_fop_shipping/i18n/sl.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-18 07:33+0000\n" +"PO-Revision-Date: 2017-05-18 07:33+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Nabavni nalog" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/i18n/vi_VN.po b/purchase_fop_shipping/i18n/vi_VN.po new file mode 100644 index 00000000000..9900a7be09d --- /dev/null +++ b/purchase_fop_shipping/i18n/vi_VN.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-01 02:48+0000\n" +"PO-Revision-Date: 2017-06-01 02:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: vi_VN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "Đơn hàng Mua" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py index d98c0e9fec0..df57d7c8252 100755 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -10,4 +10,4 @@ class ResPartner(models.Model): _inherit = 'res.partner' fop_shipping = fields.Float( - 'FOP shipping', help='Min order amount for FOP shipping',) + 'FOP shipping', help='Min purchase order amount for FOP shipping',) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 3cbce9bcf6d..769436afd0c 100755 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -16,12 +16,12 @@ class PurchaseOrder(models.Model): compute='_fop_shipping_reached') force_order_under_fop = fields.Boolean( string='Confirm under FOP', - help='Force confirm order under Free-Of-Payment shipping',) + help='Force confirm purchase order under Free-Of-Payment shipping',) fop_shipping = fields.Float( 'FOP shipping', related='partner_id.fop_shipping', readonly=True, - help='Min order amount for Free-Of-Payment shipping',) + help='Min purchase order amount for Free-Of-Payment shipping',) @api.multi @api.depends('amount_total', 'partner_id.fop_shipping') From b09c50df6725260b7777e4fa32a2299706b616b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Fri, 15 Jun 2018 23:37:23 +0200 Subject: [PATCH 09/34] remove obsolete .pot files [ci skip] --- .../i18n/purchase_fop_shipping.pot | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 purchase_fop_shipping/i18n/purchase_fop_shipping.pot diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot deleted file mode 100644 index 39c13bedff9..00000000000 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ /dev/null @@ -1,68 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * purchase_fop_shipping -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-08 13:51+0000\n" -"PO-Revision-Date: 2017-02-08 13:51+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop -msgid "Confirm under FOP" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached -msgid "FOP reached" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -msgid "FOP shipping" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop -msgid "Force confirm purchase order under Free-Of-Payment shipping" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached -msgid "Free-Of-Payment shipping reached" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -msgid "Min purchase order amount for FOP shipping" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping -msgid "Min purchase order amount for Free-Of-Payment shipping" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_purchase_order -msgid "Purchase Order" -msgstr "" - -#. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 -#, python-format -msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." -msgstr "" From 39998d94ac28b61924a4f2bb40402c6148091605 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 20 Jun 2018 22:51:20 +0200 Subject: [PATCH 10/34] [FIX] README lint errors --- purchase_fop_shipping/README.rst | 5 -- purchase_fop_shipping/i18n/de.po | 10 ++- purchase_fop_shipping/i18n/es.po | 8 +- purchase_fop_shipping/i18n/es_PE.po | 17 +++-- purchase_fop_shipping/i18n/fr.po | 8 +- purchase_fop_shipping/i18n/fr_BE.po | 11 +-- purchase_fop_shipping/i18n/gl.po | 8 +- purchase_fop_shipping/i18n/hr.po | 11 +-- purchase_fop_shipping/i18n/it.po | 8 +- purchase_fop_shipping/i18n/nl.po | 8 +- purchase_fop_shipping/i18n/nl_NL.po | 11 +-- purchase_fop_shipping/i18n/pt_BR.po | 11 +-- .../i18n/purchase_fop_shipping.pot | 69 ++++++++++++++++++ purchase_fop_shipping/i18n/ro.po | 11 +-- purchase_fop_shipping/i18n/sl.po | 11 +-- purchase_fop_shipping/i18n/vi_VN.po | 11 +-- .../static/description/icon.png | Bin 0 -> 9455 bytes 17 files changed, 146 insertions(+), 72 deletions(-) create mode 100644 purchase_fop_shipping/i18n/purchase_fop_shipping.pot create mode 100644 purchase_fop_shipping/static/description/icon.png diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index c6520607a93..15b360da01d 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -28,11 +28,6 @@ Usage .. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt .. branch is "8.0" for example -Known issues / Roadmap -====================== - -* ... - Bug Tracker =========== diff --git a/purchase_fop_shipping/i18n/de.po b/purchase_fop_shipping/i18n/de.po index f608380a392..066b7fc4a64 100644 --- a/purchase_fop_shipping/i18n/de.po +++ b/purchase_fop_shipping/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-03-03 03:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -31,6 +31,7 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping msgid "FOP shipping" msgstr "" @@ -46,6 +47,7 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" @@ -68,6 +70,6 @@ msgstr "Bestellauftrag" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/es.po b/purchase_fop_shipping/i18n/es.po index 0e0c517e3da..ee795219cc6 100644 --- a/purchase_fop_shipping/i18n/es.po +++ b/purchase_fop_shipping/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-05-18 07:33+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,6 +70,6 @@ msgstr "Orden de Compra" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/es_PE.po b/purchase_fop_shipping/i18n/es_PE.po index cacc61074c6..a3bcc047ec7 100644 --- a/purchase_fop_shipping/i18n/es_PE.po +++ b/purchase_fop_shipping/i18n/es_PE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # Henry Garcia , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-15 06:42+0000\n" "PO-Revision-Date: 2017-07-15 06:42+0000\n" "Last-Translator: Henry Garcia , 2017\n" -"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n" +"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/" +"es_PE/)\n" +"Language: es_PE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_PE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,9 +71,9 @@ msgstr "Orden de compra" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" -"No puede confirmar una orden de compra con un importe bajo el envío libre de" -" pago. Para confirmar la confirmación, debe pertenecer a \"Administrar envio" -" Libre de pago\"." +"No puede confirmar una orden de compra con un importe bajo el envío libre de " +"pago. Para confirmar la confirmación, debe pertenecer a \"Administrar envio " +"Libre de pago\"." diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po index 44e6c1169cd..b95a400083f 100644 --- a/purchase_fop_shipping/i18n/fr.po +++ b/purchase_fop_shipping/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-24 07:53+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping @@ -70,8 +70,8 @@ msgstr "Bon de commande" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" "Vous ne pouvez pas confirmer une commande dont le montant est en dessous du " "Franco. Pour forcer les commande en dessous du franco,vous devez avoir le " diff --git a/purchase_fop_shipping/i18n/fr_BE.po b/purchase_fop_shipping/i18n/fr_BE.po index b6cbd7a18f1..73dbcd07a74 100644 --- a/purchase_fop_shipping/i18n/fr_BE.po +++ b/purchase_fop_shipping/i18n/fr_BE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-03-03 03:48+0000\n" "PO-Revision-Date: 2018-03-03 03:48+0000\n" "Last-Translator: OCA Transbot , 2018\n" -"Language-Team: French (Belgium) (https://www.transifex.com/oca/teams/23907/fr_BE/)\n" +"Language-Team: French (Belgium) (https://www.transifex.com/oca/teams/23907/" +"fr_BE/)\n" +"Language: fr_BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_BE\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping @@ -70,6 +71,6 @@ msgstr "Commande fournisseur" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/gl.po b/purchase_fop_shipping/i18n/gl.po index c9e07367fbf..42521798653 100644 --- a/purchase_fop_shipping/i18n/gl.po +++ b/purchase_fop_shipping/i18n/gl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-06-01 02:48+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,6 +70,6 @@ msgstr "Orde de compra" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/hr.po b/purchase_fop_shipping/i18n/hr.po index c43f453330f..9a199cae036 100644 --- a/purchase_fop_shipping/i18n/hr.po +++ b/purchase_fop_shipping/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 # Bole , 2017 @@ -13,11 +13,12 @@ msgstr "" "PO-Revision-Date: 2017-07-11 12:53+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop @@ -71,6 +72,6 @@ msgstr "Nabavni nalog" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index d28512dc5d4..ebe0d74d4bd 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-05-18 07:33+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,6 +70,6 @@ msgstr "Ordine Acquisto" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/nl.po b/purchase_fop_shipping/i18n/nl.po index 03a2b014026..b40111be2e7 100644 --- a/purchase_fop_shipping/i18n/nl.po +++ b/purchase_fop_shipping/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # Erwin van der Ploeg , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-26 00:58+0000\n" "Last-Translator: Erwin van der Ploeg , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,6 +70,6 @@ msgstr "Inkooporder" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/nl_NL.po b/purchase_fop_shipping/i18n/nl_NL.po index 3790aafd95b..becbc93e47f 100644 --- a/purchase_fop_shipping/i18n/nl_NL.po +++ b/purchase_fop_shipping/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-06-22 02:44+0000\n" "PO-Revision-Date: 2017-06-22 02:44+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping @@ -70,6 +71,6 @@ msgstr "Inkooporder" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po index 99a2331c677..25c875c707f 100644 --- a/purchase_fop_shipping/i18n/pt_BR.po +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-24 07:53+0000\n" "PO-Revision-Date: 2017-11-24 07:53+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping @@ -70,6 +71,6 @@ msgstr "Ordem de Compra" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot new file mode 100644 index 00000000000..cad2c94a226 --- /dev/null +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -0,0 +1,69 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_fop_shipping +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Confirm under FOP" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "FOP reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +msgid "FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +msgid "Force confirm purchase order under Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +msgid "Free-Of-Payment shipping reached" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Partner" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model,name:purchase_fop_shipping.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: purchase_fop_shipping +#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#, python-format +msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." +msgstr "" + diff --git a/purchase_fop_shipping/i18n/ro.po b/purchase_fop_shipping/i18n/ro.po index 06dea1373f2..b946deaee91 100644 --- a/purchase_fop_shipping/i18n/ro.po +++ b/purchase_fop_shipping/i18n/ro.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-06-01 02:48+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1));\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop @@ -70,6 +71,6 @@ msgstr "Comandă achiziție" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/sl.po b/purchase_fop_shipping/i18n/sl.po index 610f1aeb8c2..b9609037354 100644 --- a/purchase_fop_shipping/i18n/sl.po +++ b/purchase_fop_shipping/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-05-18 07:33+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop @@ -70,6 +71,6 @@ msgstr "Nabavni nalog" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/i18n/vi_VN.po b/purchase_fop_shipping/i18n/vi_VN.po index 9900a7be09d..d43df61bb8c 100644 --- a/purchase_fop_shipping/i18n/vi_VN.po +++ b/purchase_fop_shipping/i18n/vi_VN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * purchase_fop_shipping -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-06-01 02:48+0000\n" "PO-Revision-Date: 2017-06-01 02:48+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/" +"teams/23907/vi_VN/)\n" +"Language: vi_VN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi_VN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: purchase_fop_shipping @@ -70,6 +71,6 @@ msgstr "Đơn hàng Mua" #: code:addons/purchase_fop_shipping/models/purchase.py:38 #, python-format msgid "" -"You cannot confirm a purchase order with amount under FOP shipping. To force" -" confirm you must belongs to \"FOP shipping Manager\"." +"You cannot confirm a purchase order with amount under FOP shipping. To force " +"confirm you must belongs to \"FOP shipping Manager\"." msgstr "" diff --git a/purchase_fop_shipping/static/description/icon.png b/purchase_fop_shipping/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 03510ddcc2e82a5308a8f464e1ffd86c8f5dc918 Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Fri, 5 Jun 2020 12:11:30 +0200 Subject: [PATCH 11/34] [MIG] purchase_fop_shipping migration to v13 --- purchase_fop_shipping/__init__.py | 2 - purchase_fop_shipping/__manifest__.py | 16 ++- purchase_fop_shipping/models/__init__.py | 1 - purchase_fop_shipping/models/partner.py | 8 +- purchase_fop_shipping/models/purchase.py | 40 ++++--- .../{purchase_group.xml => res_groups.xml} | 4 +- purchase_fop_shipping/tests/__init__.py | 1 - .../tests/test_fop_shipping.py | 112 +++++++++++------- purchase_fop_shipping/views/partner_view.xml | 16 --- .../views/purchase_order.xml | 33 ++++++ purchase_fop_shipping/views/purchase_view.xml | 33 ------ purchase_fop_shipping/views/res_partner.xml | 15 +++ 12 files changed, 154 insertions(+), 127 deletions(-) mode change 100755 => 100644 purchase_fop_shipping/__init__.py mode change 100755 => 100644 purchase_fop_shipping/__manifest__.py mode change 100755 => 100644 purchase_fop_shipping/models/__init__.py mode change 100755 => 100644 purchase_fop_shipping/models/partner.py mode change 100755 => 100644 purchase_fop_shipping/models/purchase.py rename purchase_fop_shipping/security/{purchase_group.xml => res_groups.xml} (92%) delete mode 100755 purchase_fop_shipping/views/partner_view.xml create mode 100644 purchase_fop_shipping/views/purchase_order.xml delete mode 100755 purchase_fop_shipping/views/purchase_view.xml create mode 100644 purchase_fop_shipping/views/res_partner.xml diff --git a/purchase_fop_shipping/__init__.py b/purchase_fop_shipping/__init__.py old mode 100755 new mode 100644 index cde864bae21..0650744f6bc --- a/purchase_fop_shipping/__init__.py +++ b/purchase_fop_shipping/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py old mode 100755 new mode 100644 index b3f2df7961b..216a9f8c535 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -1,19 +1,23 @@ -# -*- coding: utf-8 -*- # © 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Purchase Free-Of-Paiment shipping", - 'version': '10.0.1.0.0', + 'version': '13.0.1.0.0', 'author': "Akretion,Odoo Community Association (OCA)", + 'website': "https://github.com/OCA/purchase-workflow", 'maintainer': 'Akretion', 'license': 'AGPL-3', 'category': 'Purchase', - 'depends': ['purchase'], + 'depends': [ + 'purchase', + ], 'website': 'http://www.akretion.com/', - 'data': ['views/purchase_view.xml', - 'views/partner_view.xml', - ], + 'data': [ + 'security/res_groups.xml', + 'views/purchase_order.xml', + 'views/res_partner.xml', + ], 'installable': True, } diff --git a/purchase_fop_shipping/models/__init__.py b/purchase_fop_shipping/models/__init__.py old mode 100755 new mode 100644 index cfbefc2423c..af2b0943f8e --- a/purchase_fop_shipping/models/__init__.py +++ b/purchase_fop_shipping/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from . import partner from . import purchase diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py old mode 100755 new mode 100644 index df57d7c8252..3ca630fc8c6 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -1,13 +1,13 @@ -# -*- coding: utf-8 -*- # © 2014-2016 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields +from odoo import fields, models class ResPartner(models.Model): - _inherit = 'res.partner' + _inherit = "res.partner" fop_shipping = fields.Float( - 'FOP shipping', help='Min purchase order amount for FOP shipping',) + string="FOP shipping", help="Min purchase order amount for FOP shipping", + ) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py old mode 100755 new mode 100644 index 769436afd0c..6fbfea6811c --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -1,42 +1,50 @@ -# -*- coding: utf-8 -*- # © 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.exceptions import Warning as UserError +from odoo.exceptions import UserError from odoo import models, fields, api, _ class PurchaseOrder(models.Model): _inherit = "purchase.order" + fop_reached = fields.Boolean( string='FOP reached', help='Free-Of-Payment shipping reached', - compute='_fop_shipping_reached') + compute='_compute_fop_reached', + ) force_order_under_fop = fields.Boolean( string='Confirm under FOP', - help='Force confirm purchase order under Free-Of-Payment shipping',) + help='Force confirm purchase order under Free-Of-Payment shipping', + ) fop_shipping = fields.Float( - 'FOP shipping', + string='FOP shipping', related='partner_id.fop_shipping', readonly=True, - help='Min purchase order amount for Free-Of-Payment shipping',) + help='Min purchase order amount for Free-Of-Payment shipping', + ) - @api.multi - @api.depends('amount_total', 'partner_id.fop_shipping') - def _fop_shipping_reached(self): + @api.depends( + 'amount_total', + 'partner_id.fop_shipping' + ) + def _compute_fop_reached(self): for record in self: record.fop_reached = record.amount_total >\ record.partner_id.fop_shipping - @api.multi def button_approve(self, force=False): - for po in self: - if not po.force_order_under_fop and not po.fop_reached: - raise UserError( - _('You cannot confirm a purchase order with amount under ' - 'FOP shipping. To force confirm you must belongs to "FOP' - ' shipping Manager".')) + self._check_fop_shipping() result = super(PurchaseOrder, self).button_approve(force=force) return result + + def _check_fop_shipping(self): + for po in self: + if not po.force_order_under_fop and not po.fop_reached: + raise UserError(_( + 'You cannot confirm a purchase order with amount under ' + 'FOP shipping. To force confirm you must belongs to "FOP' + ' shipping Manager".' + )) diff --git a/purchase_fop_shipping/security/purchase_group.xml b/purchase_fop_shipping/security/res_groups.xml similarity index 92% rename from purchase_fop_shipping/security/purchase_group.xml rename to purchase_fop_shipping/security/res_groups.xml index 2da9ba3bdc4..0e0b4040ec0 100644 --- a/purchase_fop_shipping/security/purchase_group.xml +++ b/purchase_fop_shipping/security/res_groups.xml @@ -1,6 +1,5 @@ - FOP shipping Manager @@ -9,5 +8,4 @@ - - \ No newline at end of file + diff --git a/purchase_fop_shipping/tests/__init__.py b/purchase_fop_shipping/tests/__init__.py index 9b861517243..dbcde39c549 100644 --- a/purchase_fop_shipping/tests/__init__.py +++ b/purchase_fop_shipping/tests/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import test_fop_shipping diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 9661d1e9c71..2637e87f0bd 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -1,49 +1,71 @@ -# -*- coding: utf-8 -*- # © 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import openerp.tests.common as common -from openerp.exceptions import Warning as UserError -from openerp import fields - - -class TestPurchaseOrder(common.TransactionCase): - - def setUp(self): - super(TestPurchaseOrder, self).setUp() - self.product_1 = self.env.ref('product.product_product_4') - self.product_2 = self.env.ref('product.product_product_5b') - self.partner_3 = self.env.ref('base.res_partner_3') - self.partner_3.fop_shipping = 250 - po_model = self.env['purchase.order.line'] - self.purchase_order1 = self.env['purchase.order'].create( - {'partner_id': self.partner_3.id}) - self.po_line_1 = po_model.create( - {'order_id': self.purchase_order1.id, - 'product_id': self.product_1.id, - 'date_planned': fields.Datetime.now(), - 'name': 'Test', - 'product_qty': 1.0, - 'product_uom': self.product_1.uom_id.id, - 'price_unit': 100.0}) - self.purchase_order2 = self.env['purchase.order'].create( - {'partner_id': self.partner_3.id}) - self.po_line_2 = po_model.create( - {'order_id': self.purchase_order2.id, - 'product_id': self.product_2.id, - 'date_planned': fields.Datetime.now(), - 'name': 'Test', - 'product_qty': 10.0, - 'product_uom': self.product_2.uom_id.id, - 'price_unit': 45.0}) - - def test_purchase_order_vals(self): - with self.assertRaises(UserError): - self.purchase_order1.button_approve() - self.purchase_order2.button_approve() - self.assertEqual(self.purchase_order1.state, 'draft') - self.assertEqual(self.purchase_order2.state, 'purchase') - self.purchase_order1.force_order_under_fop = True - self.purchase_order1.button_approve() - self.assertEqual(self.purchase_order1.state, 'purchase') +from odoo import fields +from odoo.exceptions import UserError +from odoo.tests.common import SavepointCase + + +class TestPurchaseOrder(SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestPurchaseOrder, cls).setUpClass() + cls.Product = cls.env['product.product'] + cls.Purchase = cls.env['purchase.order'] + cls.PurchaseLine = cls.env['purchase.order.line'] + + cls.product_1 = cls.Product.create({ + 'name': 'Product', + 'type': 'consu', + }) + + cls.partner_3 = cls.env.ref('base.res_partner_3') + cls.partner_3.fop_shipping = 250 + + def test_fop_shipping_reached1(self): + po = self.Purchase.create({ + 'partner_id': self.partner_3.id, + }) + self.PurchaseLine.create({ + 'order_id': po.id, + 'product_id': self.product_1.id, + 'date_planned': fields.Datetime.now(), + 'name': 'Test', + 'product_qty': 1.0, + 'product_uom': self.product_1.uom_id.id, + 'price_unit': 100.0, + }) + + self.assertFalse(po.fop_reached) + + with self.assertRaises(UserError) as e, self.env.cr.savepoint(): + po.button_approve() + self.assertTrue( + "You cannot confirm a purchase order with amount under " + "FOP shipping" + in e.exception.name + ) + + po.force_order_under_fop = True + po.button_approve() + self.assertEqual(po.state, 'purchase') + + def test_fop_shipping_reached2(self): + po = self.Purchase.create({ + 'partner_id': self.partner_3.id, + }) + self.PurchaseLine.create({ + 'order_id': po.id, + 'product_id': self.product_1.id, + 'date_planned': fields.Datetime.now(), + 'name': 'Test', + 'product_qty': 10, + 'product_uom': self.product_1.uom_id.id, + 'price_unit': 45, + }) + + self.assertTrue(po.fop_reached) + po.button_approve() + self.assertEqual(po.state, 'purchase') diff --git a/purchase_fop_shipping/views/partner_view.xml b/purchase_fop_shipping/views/partner_view.xml deleted file mode 100755 index 38513c59c1a..00000000000 --- a/purchase_fop_shipping/views/partner_view.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - res.partner - form - - - - - - - - - diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml new file mode 100644 index 00000000000..ecf05624cba --- /dev/null +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -0,0 +1,33 @@ + + + + + purchase.order + tree + + + + + fop_reached == False + + + + + + + + + + purchase.order + + form + + + + + + + + + diff --git a/purchase_fop_shipping/views/purchase_view.xml b/purchase_fop_shipping/views/purchase_view.xml deleted file mode 100755 index c2378e4cc69..00000000000 --- a/purchase_fop_shipping/views/purchase_view.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - purchase.order - tree - - - - red:fop_reached == - False;blue:fop_reached == True;grey:state=='cancel' - - - - - - - - - - purchase.order - - form - - - - - - - - - diff --git a/purchase_fop_shipping/views/res_partner.xml b/purchase_fop_shipping/views/res_partner.xml new file mode 100644 index 00000000000..86cffb32067 --- /dev/null +++ b/purchase_fop_shipping/views/res_partner.xml @@ -0,0 +1,15 @@ + + + + + res.partner + form + + + + + + + + + From 23ff451c5d0de58039eac45e50b8ec2244bb8882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Pigeon?= Date: Fri, 21 Jul 2017 16:55:59 +0200 Subject: [PATCH 12/34] [13.0] purchase_fop_shipping: fixes and improvements --- purchase_fop_shipping/__manifest__.py | 1 - purchase_fop_shipping/models/partner.py | 4 +++- purchase_fop_shipping/models/purchase.py | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index 216a9f8c535..eb97f4f6b89 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -13,7 +13,6 @@ 'depends': [ 'purchase', ], - 'website': 'http://www.akretion.com/', 'data': [ 'security/res_groups.xml', 'views/purchase_order.xml', diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py index 3ca630fc8c6..1df28d55506 100644 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -9,5 +9,7 @@ class ResPartner(models.Model): _inherit = "res.partner" fop_shipping = fields.Float( - string="FOP shipping", help="Min purchase order amount for FOP shipping", + string="FOP shipping", + help="Min purchase order amount for FOP shipping", + company_dependent=True, ) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 6fbfea6811c..78fa06047cb 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -13,7 +13,7 @@ class PurchaseOrder(models.Model): fop_reached = fields.Boolean( string='FOP reached', help='Free-Of-Payment shipping reached', - compute='_compute_fop_reached', + compute='_compute_fop_shipping_reached' ) force_order_under_fop = fields.Boolean( string='Confirm under FOP', @@ -22,15 +22,16 @@ class PurchaseOrder(models.Model): fop_shipping = fields.Float( string='FOP shipping', related='partner_id.fop_shipping', + related_sudo=False, readonly=True, help='Min purchase order amount for Free-Of-Payment shipping', ) @api.depends( 'amount_total', - 'partner_id.fop_shipping' + 'partner_id.fop_shipping', ) - def _compute_fop_reached(self): + def _compute_fop_shipping_reached(self): for record in self: record.fop_reached = record.amount_total >\ record.partner_id.fop_shipping From 09fd61f7a57bb35401d9ad5bc73c7814b818b74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Pigeon?= Date: Tue, 12 Sep 2017 21:05:20 +0200 Subject: [PATCH 13/34] [FIX] FOP is reached if invoice amount is higher or equal to FOP amount --- purchase_fop_shipping/README.rst | 10 ++++++++-- purchase_fop_shipping/models/partner.py | 2 ++ purchase_fop_shipping/models/purchase.py | 16 +++++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index 15b360da01d..5b91b93d881 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -3,10 +3,10 @@ :alt: License: AGPL-3 ================================= -Purchase Free-Of-Paiment shipping +Purchase Free-Of-Payment shipping ================================= -This module allows to define a Free-Of-Paiment (FOP) shipping on supplier. +This module allows to define a Free-Of-Payment (FOP) shipping on supplier. FOP shipping is a min purchase order amount to got shipping free from supplier. User can force confirm purchase order if he/she wishes. @@ -28,6 +28,12 @@ Usage .. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt .. branch is "8.0" for example +Known issues / Roadmap +====================== + +* By upgrading the module you could have to re-configure all your FOP minimum amount on suppliers + as this information is now company-related. + Bug Tracker =========== diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py index 1df28d55506..b119c0fcb02 100644 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -2,6 +2,7 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from odoo import fields, models @@ -12,4 +13,5 @@ class ResPartner(models.Model): string="FOP shipping", help="Min purchase order amount for FOP shipping", company_dependent=True, + digits='Account', ) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 78fa06047cb..fe7b2347a4c 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -2,8 +2,9 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.exceptions import UserError from odoo import models, fields, api, _ +from odoo.exceptions import UserError +from odoo.tools import float_compare class PurchaseOrder(models.Model): @@ -32,9 +33,18 @@ class PurchaseOrder(models.Model): 'partner_id.fop_shipping', ) def _compute_fop_shipping_reached(self): + digit_precision = self.env['decimal.precision'].precision_get( + 'Account' + ) for record in self: - record.fop_reached = record.amount_total >\ - record.partner_id.fop_shipping + record.fop_reached = ( + float_compare( + record.amount_total, + record.partner_id.fop_shipping, + precision_digits=digit_precision, + ) + >= 0 + ) def button_approve(self, force=False): self._check_fop_shipping() From f1c1e91c81299bb0ed02a73cf4c1e6172d5ad5a2 Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Fri, 5 Jun 2020 12:50:06 +0200 Subject: [PATCH 14/34] [FIX] pre-commit --- purchase_fop_shipping/__manifest__.py | 26 ++++--- purchase_fop_shipping/models/__init__.py | 1 - purchase_fop_shipping/models/partner.py | 2 +- purchase_fop_shipping/models/purchase.py | 37 +++++----- purchase_fop_shipping/security/res_groups.xml | 10 ++- .../tests/test_fop_shipping.py | 69 +++++++++---------- .../views/purchase_order.xml | 19 +++-- purchase_fop_shipping/views/res_partner.xml | 13 ++-- 8 files changed, 83 insertions(+), 94 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index eb97f4f6b89..f3aa0b10f71 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,19 +4,17 @@ { "name": "Purchase Free-Of-Paiment shipping", - 'version': '13.0.1.0.0', - 'author': "Akretion,Odoo Community Association (OCA)", - 'website': "https://github.com/OCA/purchase-workflow", - 'maintainer': 'Akretion', - 'license': 'AGPL-3', - 'category': 'Purchase', - 'depends': [ - 'purchase', + "version": "13.0.1.0.0", + "author": "Akretion,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/purchase-workflow", + "maintainer": "Akretion", + "license": "AGPL-3", + "category": "Purchase", + "depends": ["purchase"], + "data": [ + "security/res_groups.xml", + "views/purchase_order.xml", + "views/res_partner.xml", ], - 'data': [ - 'security/res_groups.xml', - 'views/purchase_order.xml', - 'views/res_partner.xml', - ], - 'installable': True, + "installable": True, } diff --git a/purchase_fop_shipping/models/__init__.py b/purchase_fop_shipping/models/__init__.py index af2b0943f8e..bb1e2e8be0c 100644 --- a/purchase_fop_shipping/models/__init__.py +++ b/purchase_fop_shipping/models/__init__.py @@ -1,3 +1,2 @@ - from . import partner from . import purchase diff --git a/purchase_fop_shipping/models/partner.py b/purchase_fop_shipping/models/partner.py index b119c0fcb02..54f12154554 100644 --- a/purchase_fop_shipping/models/partner.py +++ b/purchase_fop_shipping/models/partner.py @@ -13,5 +13,5 @@ class ResPartner(models.Model): string="FOP shipping", help="Min purchase order amount for FOP shipping", company_dependent=True, - digits='Account', + digits="Account", ) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index fe7b2347a4c..46c29cbefc5 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -2,7 +2,7 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields, api, _ +from odoo import _, api, fields, models from odoo.exceptions import UserError from odoo.tools import float_compare @@ -12,30 +12,27 @@ class PurchaseOrder(models.Model): _inherit = "purchase.order" fop_reached = fields.Boolean( - string='FOP reached', - help='Free-Of-Payment shipping reached', - compute='_compute_fop_shipping_reached' + string="FOP reached", + help="Free-Of-Payment shipping reached", + compute="_compute_fop_shipping_reached", ) force_order_under_fop = fields.Boolean( - string='Confirm under FOP', - help='Force confirm purchase order under Free-Of-Payment shipping', + string="Confirm under FOP", + help="Force confirm purchase order under Free-Of-Payment shipping", ) fop_shipping = fields.Float( - string='FOP shipping', - related='partner_id.fop_shipping', + string="FOP shipping", + related="partner_id.fop_shipping", related_sudo=False, readonly=True, - help='Min purchase order amount for Free-Of-Payment shipping', + help="Min purchase order amount for Free-Of-Payment shipping", ) @api.depends( - 'amount_total', - 'partner_id.fop_shipping', + "amount_total", "partner_id.fop_shipping", ) def _compute_fop_shipping_reached(self): - digit_precision = self.env['decimal.precision'].precision_get( - 'Account' - ) + digit_precision = self.env["decimal.precision"].precision_get("Account") for record in self: record.fop_reached = ( float_compare( @@ -54,8 +51,10 @@ def button_approve(self, force=False): def _check_fop_shipping(self): for po in self: if not po.force_order_under_fop and not po.fop_reached: - raise UserError(_( - 'You cannot confirm a purchase order with amount under ' - 'FOP shipping. To force confirm you must belongs to "FOP' - ' shipping Manager".' - )) + raise UserError( + _( + "You cannot confirm a purchase order with amount under " + 'FOP shipping. To force confirm you must belongs to "FOP' + ' shipping Manager".' + ) + ) diff --git a/purchase_fop_shipping/security/res_groups.xml b/purchase_fop_shipping/security/res_groups.xml index 0e0b4040ec0..babf51977e5 100644 --- a/purchase_fop_shipping/security/res_groups.xml +++ b/purchase_fop_shipping/security/res_groups.xml @@ -1,11 +1,9 @@ - + - FOP shipping Manager - - - + + + - diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 2637e87f0bd..3a4fc23713d 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -8,35 +8,31 @@ class TestPurchaseOrder(SavepointCase): - @classmethod def setUpClass(cls): super(TestPurchaseOrder, cls).setUpClass() - cls.Product = cls.env['product.product'] - cls.Purchase = cls.env['purchase.order'] - cls.PurchaseLine = cls.env['purchase.order.line'] + cls.Product = cls.env["product.product"] + cls.Purchase = cls.env["purchase.order"] + cls.PurchaseLine = cls.env["purchase.order.line"] - cls.product_1 = cls.Product.create({ - 'name': 'Product', - 'type': 'consu', - }) + cls.product_1 = cls.Product.create({"name": "Product", "type": "consu"}) - cls.partner_3 = cls.env.ref('base.res_partner_3') + cls.partner_3 = cls.env.ref("base.res_partner_3") cls.partner_3.fop_shipping = 250 def test_fop_shipping_reached1(self): - po = self.Purchase.create({ - 'partner_id': self.partner_3.id, - }) - self.PurchaseLine.create({ - 'order_id': po.id, - 'product_id': self.product_1.id, - 'date_planned': fields.Datetime.now(), - 'name': 'Test', - 'product_qty': 1.0, - 'product_uom': self.product_1.uom_id.id, - 'price_unit': 100.0, - }) + po = self.Purchase.create({"partner_id": self.partner_3.id}) + self.PurchaseLine.create( + { + "order_id": po.id, + "product_id": self.product_1.id, + "date_planned": fields.Datetime.now(), + "name": "Test", + "product_qty": 1.0, + "product_uom": self.product_1.uom_id.id, + "price_unit": 100.0, + } + ) self.assertFalse(po.fop_reached) @@ -44,28 +40,27 @@ def test_fop_shipping_reached1(self): po.button_approve() self.assertTrue( "You cannot confirm a purchase order with amount under " - "FOP shipping" - in e.exception.name + "FOP shipping" in e.exception.name ) po.force_order_under_fop = True po.button_approve() - self.assertEqual(po.state, 'purchase') + self.assertEqual(po.state, "purchase") def test_fop_shipping_reached2(self): - po = self.Purchase.create({ - 'partner_id': self.partner_3.id, - }) - self.PurchaseLine.create({ - 'order_id': po.id, - 'product_id': self.product_1.id, - 'date_planned': fields.Datetime.now(), - 'name': 'Test', - 'product_qty': 10, - 'product_uom': self.product_1.uom_id.id, - 'price_unit': 45, - }) + po = self.Purchase.create({"partner_id": self.partner_3.id}) + self.PurchaseLine.create( + { + "order_id": po.id, + "product_id": self.product_1.id, + "date_planned": fields.Datetime.now(), + "name": "Test", + "product_qty": 10, + "product_uom": self.product_1.uom_id.id, + "price_unit": 45, + } + ) self.assertTrue(po.fop_reached) po.button_approve() - self.assertEqual(po.state, 'purchase') + self.assertEqual(po.state, "purchase") diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index ecf05624cba..1bb086cdb41 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -1,10 +1,9 @@ - + - purchase.order tree - + @@ -12,22 +11,22 @@ - + - purchase.order - + form - - + + - diff --git a/purchase_fop_shipping/views/res_partner.xml b/purchase_fop_shipping/views/res_partner.xml index 86cffb32067..e84ca2d76f6 100644 --- a/purchase_fop_shipping/views/res_partner.xml +++ b/purchase_fop_shipping/views/res_partner.xml @@ -1,15 +1,16 @@ - + - res.partner form - + - - + + - From 67c23ebd0356e5b88d38db7c1ede0bb9a519d41a Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Tue, 16 Jun 2020 09:04:00 +0200 Subject: [PATCH 15/34] [FIX] group category to module_category_operations_purchase --- purchase_fop_shipping/security/res_groups.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_fop_shipping/security/res_groups.xml b/purchase_fop_shipping/security/res_groups.xml index babf51977e5..be1d4260688 100644 --- a/purchase_fop_shipping/security/res_groups.xml +++ b/purchase_fop_shipping/security/res_groups.xml @@ -2,7 +2,7 @@ FOP shipping Manager - + From 484e49c8fb4e6ae07aba8cd01e6dcc2c15ab0de7 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 3 Jun 2021 16:53:00 +0200 Subject: [PATCH 16/34] [14.0][MIG] - purchase_fop_shipping --- purchase_fop_shipping/__manifest__.py | 6 +- .../i18n/purchase_fop_shipping.pot | 64 +++++++++++++------ purchase_fop_shipping/models/purchase.py | 3 +- purchase_fop_shipping/security/res_groups.xml | 1 - .../views/purchase_order.xml | 32 ++++++++-- 5 files changed, 77 insertions(+), 29 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index f3aa0b10f71..f2f8d776a2a 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -1,10 +1,10 @@ -# © 2017 Akretion (http://www.akretion.com) +# © 2017 Akretion (http://www.akretion.com) Payment # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - "name": "Purchase Free-Of-Paiment shipping", - "version": "13.0.1.0.0", + "name": "Purchase Free-Of-Payment shipping", + "version": "14.0.1.0.0", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot index cad2c94a226..2f98d67e25c 100644 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * purchase_fop_shipping +# * purchase_fop_shipping # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,46 +14,69 @@ msgstr "" "Plural-Forms: \n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__display_name +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__display_name +msgid "Display Name" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping -msgid "Min purchase order amount for FOP shipping" +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__id +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__id +msgid "ID" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping -msgid "Min purchase order amount for Free-Of-Payment shipping" +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order____last_update +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner____last_update +msgid "Last Modified on" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping +msgid "Min purchase order amount for FOP shipping" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping +msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping @@ -62,8 +85,9 @@ msgid "Purchase Order" msgstr "" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format -msgid "You cannot confirm a purchase order with amount under FOP shipping. To force confirm you must belongs to \"FOP shipping Manager\"." +msgid "" +"You cannot confirm a purchase order with amount under FOP shipping. To force" +" confirm you must belongs to \"FOP shipping Manager\"." msgstr "" - diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 46c29cbefc5..c784eff92f2 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -29,7 +29,8 @@ class PurchaseOrder(models.Model): ) @api.depends( - "amount_total", "partner_id.fop_shipping", + "amount_total", + "partner_id.fop_shipping", ) def _compute_fop_shipping_reached(self): digit_precision = self.env["decimal.precision"].precision_get("Account") diff --git a/purchase_fop_shipping/security/res_groups.xml b/purchase_fop_shipping/security/res_groups.xml index be1d4260688..057e9e7bdb9 100644 --- a/purchase_fop_shipping/security/res_groups.xml +++ b/purchase_fop_shipping/security/res_groups.xml @@ -2,7 +2,6 @@ FOP shipping Manager - diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 1bb086cdb41..6b6863571db 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -1,14 +1,38 @@ - + purchase.order tree - - fop_reached == False - + fop_reached == False + + + + + + + + purchase.order + tree + + + + fop_reached == False + + + + + + + + purchase.order + tree + + + + fop_reached == False From c720f0d179991a047afa8686e1311e1a3dc432d7 Mon Sep 17 00:00:00 2001 From: xavier-bouquiaux Date: Mon, 20 Sep 2021 10:46:10 +0200 Subject: [PATCH 17/34] [14.0][FIX] purchase_fop_shipping some view feature lost in migrations --- purchase_fop_shipping/__manifest__.py | 2 +- purchase_fop_shipping/views/purchase_order.xml | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index f2f8d776a2a..b2e2d6f78ea 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "14.0.1.0.0", + "version": "14.0.1.1.0", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 6b6863571db..1195265e67a 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -10,6 +10,7 @@ + @@ -23,6 +24,7 @@ + @@ -49,8 +51,16 @@ name="force_order_under_fop" groups="purchase_fop_shipping.group_fop_shipping_purchase_manager" /> - + + + From 50600e5facc5bcc2175d6bc5a03ce1e6701ab20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Douglas=20Cust=C3=B3dio?= Date: Mon, 3 Oct 2022 15:09:47 +0000 Subject: [PATCH 18/34] Translated using Weblate (Portuguese (Brazil)) Currently translated at 10.0% (1 of 10 strings) Translation: purchase-workflow-14.0/purchase-workflow-14.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-14-0/purchase-workflow-14-0-purchase_fop_shipping/pt_BR/ --- purchase_fop_shipping/i18n/pt_BR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po index 25c875c707f..e4f828c9725 100644 --- a/purchase_fop_shipping/i18n/pt_BR.po +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-24 07:53+0000\n" -"PO-Revision-Date: 2017-11-24 07:53+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2022-10-03 17:36+0000\n" +"Last-Translator: Douglas Custódio \n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" +"23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop @@ -65,7 +66,7 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" -msgstr "Ordem de Compra" +msgstr "Pedido de Compra" #. module: purchase_fop_shipping #: code:addons/purchase_fop_shipping/models/purchase.py:38 From 42d1b6fdb50abe20ab27382ad4829acf2cb5f71e Mon Sep 17 00:00:00 2001 From: Ricardoalso Date: Fri, 11 Nov 2022 14:14:48 +0100 Subject: [PATCH 19/34] [IMP] purchase_fop_shipping: black, isort, prettier --- purchase_fop_shipping/models/purchase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index c784eff92f2..82d2fd214ca 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -1,4 +1,4 @@ -# © 2017 Akretion (http://www.akretion.com) +# Copyright 2017 Akretion (http://www.akretion.com) # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -46,7 +46,7 @@ def _compute_fop_shipping_reached(self): def button_approve(self, force=False): self._check_fop_shipping() - result = super(PurchaseOrder, self).button_approve(force=force) + result = super().button_approve(force=force) return result def _check_fop_shipping(self): From c1c3aee89b7345ddeca80cf891e728da13a77c0c Mon Sep 17 00:00:00 2001 From: Ricardoalso Date: Fri, 11 Nov 2022 14:41:59 +0100 Subject: [PATCH 20/34] [MIG] purchase_fop_shipping: Migration to 15.0 --- purchase_fop_shipping/__manifest__.py | 2 +- .../i18n/purchase_fop_shipping.pot | 20 +------------------ .../tests/test_fop_shipping.py | 4 ++-- .../views/purchase_order.xml | 2 +- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index b2e2d6f78ea..96c0b579681 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "14.0.1.1.0", + "version": "15.0.1.0.0", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot index 2f98d67e25c..f1832c663ff 100644 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -23,12 +23,6 @@ msgstr "" msgid "Contact" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__display_name -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__display_name -msgid "Display Name" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" @@ -56,18 +50,6 @@ msgstr "" msgid "Free-Of-Payment shipping reached" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__id -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__id -msgid "ID" -msgstr "" - -#. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order____last_update -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner____last_update -msgid "Last Modified on" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 3a4fc23713d..6dabbe31682 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -4,10 +4,10 @@ from odoo import fields from odoo.exceptions import UserError -from odoo.tests.common import SavepointCase +from odoo.tests.common import TransactionCase -class TestPurchaseOrder(SavepointCase): +class TestPurchaseOrder(TransactionCase): @classmethod def setUpClass(cls): super(TestPurchaseOrder, cls).setUpClass() diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 1195265e67a..0218f955e8c 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -52,7 +52,7 @@ groups="purchase_fop_shipping.group_fop_shipping_purchase_manager" /> - + Date: Fri, 18 Nov 2022 12:08:24 +0000 Subject: [PATCH 21/34] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: purchase-workflow-15.0/purchase-workflow-15.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_fop_shipping/ --- purchase_fop_shipping/i18n/de.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/es.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/es_PE.po | 40 +++++++++++++++++----------- purchase_fop_shipping/i18n/fr.po | 40 +++++++++++++++++----------- purchase_fop_shipping/i18n/fr_BE.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/gl.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/hr.po | 40 +++++++++++++++++----------- purchase_fop_shipping/i18n/it.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/nl.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/nl_NL.po | 40 +++++++++++++++++----------- purchase_fop_shipping/i18n/pt_BR.po | 41 ++++++++++++++++------------- purchase_fop_shipping/i18n/ro.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/sl.po | 37 +++++++++++++++----------- purchase_fop_shipping/i18n/vi_VN.po | 37 +++++++++++++++----------- 14 files changed, 308 insertions(+), 226 deletions(-) diff --git a/purchase_fop_shipping/i18n/de.po b/purchase_fop_shipping/i18n/de.po index 066b7fc4a64..238c2eb71c2 100644 --- a/purchase_fop_shipping/i18n/de.po +++ b/purchase_fop_shipping/i18n/de.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Bestellauftrag" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/es.po b/purchase_fop_shipping/i18n/es.po index ee795219cc6..4f83a4913fa 100644 --- a/purchase_fop_shipping/i18n/es.po +++ b/purchase_fop_shipping/i18n/es.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Orden de Compra" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/es_PE.po b/purchase_fop_shipping/i18n/es_PE.po index a3bcc047ec7..88d6c20ab8a 100644 --- a/purchase_fop_shipping/i18n/es_PE.po +++ b/purchase_fop_shipping/i18n/es_PE.po @@ -20,55 +20,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "Confirmar bajo libre de pago" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "Libre de pago alcanzado" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "Envío libre de pago" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "Forzar la orden de compra bajo el envio de libre de pago" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "Envío libre de pago alcanzado" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "Cantidad mìnima de pedido para envío libre de pago" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "Mínima cantidad de orden de compra para envío libre de pago" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "Socio" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Orden de compra" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " @@ -77,3 +82,6 @@ msgstr "" "No puede confirmar una orden de compra con un importe bajo el envío libre de " "pago. Para confirmar la confirmación, debe pertenecer a \"Administrar envio " "Libre de pago\"." + +#~ msgid "Partner" +#~ msgstr "Socio" diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po index b95a400083f..55c3cb20af8 100644 --- a/purchase_fop_shipping/i18n/fr.po +++ b/purchase_fop_shipping/i18n/fr.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "Confirmer sous Franco" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "Franco atteint" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "Franco" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "Forcer la confirmation de la commande sous le franco" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "Franco atteint" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "Franco de commande d'achat" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "Min de commande d'achat pour avoir une livraison gratuite (Franco)" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "Partenaire" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Bon de commande" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " @@ -76,3 +81,6 @@ msgstr "" "Vous ne pouvez pas confirmer une commande dont le montant est en dessous du " "Franco. Pour forcer les commande en dessous du franco,vous devez avoir le " "group \"Franco Manager\"" + +#~ msgid "Partner" +#~ msgstr "Partenaire" diff --git a/purchase_fop_shipping/i18n/fr_BE.po b/purchase_fop_shipping/i18n/fr_BE.po index 73dbcd07a74..b4a949116c2 100644 --- a/purchase_fop_shipping/i18n/fr_BE.po +++ b/purchase_fop_shipping/i18n/fr_BE.po @@ -20,55 +20,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Commande fournisseur" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/gl.po b/purchase_fop_shipping/i18n/gl.po index 42521798653..91e2c9e692c 100644 --- a/purchase_fop_shipping/i18n/gl.po +++ b/purchase_fop_shipping/i18n/gl.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Orde de compra" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/hr.po b/purchase_fop_shipping/i18n/hr.po index 9a199cae036..bb28e47c7c5 100644 --- a/purchase_fop_shipping/i18n/hr.po +++ b/purchase_fop_shipping/i18n/hr.po @@ -21,57 +21,65 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "Partner" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Nabavni nalog" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " "confirm you must belongs to \"FOP shipping Manager\"." msgstr "" + +#~ msgid "Partner" +#~ msgstr "Partner" diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index ebe0d74d4bd..dee51b6cd93 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Ordine Acquisto" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/nl.po b/purchase_fop_shipping/i18n/nl.po index b40111be2e7..c7969149ef8 100644 --- a/purchase_fop_shipping/i18n/nl.po +++ b/purchase_fop_shipping/i18n/nl.po @@ -19,55 +19,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Inkooporder" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/nl_NL.po b/purchase_fop_shipping/i18n/nl_NL.po index becbc93e47f..ed8fd188d11 100644 --- a/purchase_fop_shipping/i18n/nl_NL.po +++ b/purchase_fop_shipping/i18n/nl_NL.po @@ -20,57 +20,65 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "Partner" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Inkooporder" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " "confirm you must belongs to \"FOP shipping Manager\"." msgstr "" + +#~ msgid "Partner" +#~ msgstr "Partner" diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po index e4f828c9725..5627c5440d2 100644 --- a/purchase_fop_shipping/i18n/pt_BR.po +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-24 07:53+0000\n" "PO-Revision-Date: 2022-10-03 17:36+0000\n" "Last-Translator: Douglas Custódio \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" -"23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,55 +21,60 @@ msgstr "" "X-Generator: Weblate 4.3.2\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Pedido de Compra" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/ro.po b/purchase_fop_shipping/i18n/ro.po index b946deaee91..506bd3aa2b4 100644 --- a/purchase_fop_shipping/i18n/ro.po +++ b/purchase_fop_shipping/i18n/ro.po @@ -20,55 +20,60 @@ msgstr "" "2:1));\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Comandă achiziție" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/sl.po b/purchase_fop_shipping/i18n/sl.po index b9609037354..9033a268156 100644 --- a/purchase_fop_shipping/i18n/sl.po +++ b/purchase_fop_shipping/i18n/sl.po @@ -20,55 +20,60 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Nabavni nalog" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " diff --git a/purchase_fop_shipping/i18n/vi_VN.po b/purchase_fop_shipping/i18n/vi_VN.po index d43df61bb8c..762e3ffcb8a 100644 --- a/purchase_fop_shipping/i18n/vi_VN.po +++ b/purchase_fop_shipping/i18n/vi_VN.po @@ -20,55 +20,60 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model,name:purchase_fop_shipping.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_force_order_under_fop +#: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager +msgid "FOP shipping Manager" +msgstr "" + +#. module: purchase_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_reached +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" msgstr "" #. module: purchase_fop_shipping -#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order_fop_shipping +#: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" msgstr "" -#. module: purchase_fop_shipping -#: model:ir.model,name:purchase_fop_shipping.model_res_partner -msgid "Partner" -msgstr "" - #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" msgstr "Đơn hàng Mua" #. module: purchase_fop_shipping -#: code:addons/purchase_fop_shipping/models/purchase.py:38 +#: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " From 094fed1a5f2dc61be1206fed1729ef9d8c7ca627 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Mon, 2 Jan 2023 10:17:00 +0000 Subject: [PATCH 22/34] Translated using Weblate (Italian) Currently translated at 9.0% (1 of 11 strings) Translation: purchase-workflow-15.0/purchase-workflow-15.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_fop_shipping/it/ --- purchase_fop_shipping/i18n/it.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index dee51b6cd93..c3727d13185 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-18 07:33+0000\n" -"PO-Revision-Date: 2017-05-18 07:33+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2023-01-02 12:45+0000\n" +"Last-Translator: Francesco Foresti \n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.14.1\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop @@ -69,7 +70,7 @@ msgstr "" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order msgid "Purchase Order" -msgstr "Ordine Acquisto" +msgstr "Ordine di acquisto" #. module: purchase_fop_shipping #: code:addons/purchase_fop_shipping/models/purchase.py:0 From 2ec44af8d8890ea002814a293b4c419fc0845726 Mon Sep 17 00:00:00 2001 From: Dhara Solanki Date: Thu, 22 Jun 2023 17:03:07 +0530 Subject: [PATCH 23/34] [MIG] purchase_fop_shipping: Migration to 16.0 --- purchase_fop_shipping/README.rst | 1 + purchase_fop_shipping/__manifest__.py | 2 +- purchase_fop_shipping/i18n/purchase_fop_shipping.pot | 3 ++- purchase_fop_shipping/tests/test_fop_shipping.py | 2 +- purchase_fop_shipping/views/purchase_order.xml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/purchase_fop_shipping/README.rst b/purchase_fop_shipping/README.rst index 5b91b93d881..0b29c6e09f6 100644 --- a/purchase_fop_shipping/README.rst +++ b/purchase_fop_shipping/README.rst @@ -54,6 +54,7 @@ Contributors ------------ * Mourad EL HADJ MIMOUNE +* Dhara Solanki Funders ------- diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index 96c0b579681..b9a41fb0494 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot index f1832c663ff..984d68cf8c1 100644 --- a/purchase_fop_shipping/i18n/purchase_fop_shipping.pot +++ b/purchase_fop_shipping/i18n/purchase_fop_shipping.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -67,6 +67,7 @@ msgid "Purchase Order" msgstr "" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 6dabbe31682..6f52774f4d2 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -40,7 +40,7 @@ def test_fop_shipping_reached1(self): po.button_approve() self.assertTrue( "You cannot confirm a purchase order with amount under " - "FOP shipping" in e.exception.name + "FOP shipping" in e.exception.args[0] ) po.force_order_under_fop = True diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 0218f955e8c..926588692c8 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -52,7 +52,7 @@ groups="purchase_fop_shipping.group_fop_shipping_purchase_manager" /> - + Date: Mon, 9 Oct 2023 20:19:39 +0000 Subject: [PATCH 24/34] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_fop_shipping/ --- purchase_fop_shipping/i18n/de.po | 1 + purchase_fop_shipping/i18n/es.po | 1 + purchase_fop_shipping/i18n/es_PE.po | 1 + purchase_fop_shipping/i18n/fr.po | 1 + purchase_fop_shipping/i18n/fr_BE.po | 1 + purchase_fop_shipping/i18n/gl.po | 1 + purchase_fop_shipping/i18n/hr.po | 1 + purchase_fop_shipping/i18n/it.po | 1 + purchase_fop_shipping/i18n/nl.po | 1 + purchase_fop_shipping/i18n/nl_NL.po | 1 + purchase_fop_shipping/i18n/pt_BR.po | 1 + purchase_fop_shipping/i18n/ro.po | 1 + purchase_fop_shipping/i18n/sl.po | 1 + purchase_fop_shipping/i18n/vi_VN.po | 1 + 14 files changed, 14 insertions(+) diff --git a/purchase_fop_shipping/i18n/de.po b/purchase_fop_shipping/i18n/de.po index 238c2eb71c2..1fa06c2a927 100644 --- a/purchase_fop_shipping/i18n/de.po +++ b/purchase_fop_shipping/i18n/de.po @@ -72,6 +72,7 @@ msgid "Purchase Order" msgstr "Bestellauftrag" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/es.po b/purchase_fop_shipping/i18n/es.po index 4f83a4913fa..890e4ed354b 100644 --- a/purchase_fop_shipping/i18n/es.po +++ b/purchase_fop_shipping/i18n/es.po @@ -72,6 +72,7 @@ msgid "Purchase Order" msgstr "Orden de Compra" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/es_PE.po b/purchase_fop_shipping/i18n/es_PE.po index 88d6c20ab8a..96d9434bcab 100644 --- a/purchase_fop_shipping/i18n/es_PE.po +++ b/purchase_fop_shipping/i18n/es_PE.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Orden de compra" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/fr.po b/purchase_fop_shipping/i18n/fr.po index 55c3cb20af8..87bbf745f47 100644 --- a/purchase_fop_shipping/i18n/fr.po +++ b/purchase_fop_shipping/i18n/fr.po @@ -72,6 +72,7 @@ msgid "Purchase Order" msgstr "Bon de commande" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/fr_BE.po b/purchase_fop_shipping/i18n/fr_BE.po index b4a949116c2..bf93cda6d0d 100644 --- a/purchase_fop_shipping/i18n/fr_BE.po +++ b/purchase_fop_shipping/i18n/fr_BE.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Commande fournisseur" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/gl.po b/purchase_fop_shipping/i18n/gl.po index 91e2c9e692c..fdc91275a3e 100644 --- a/purchase_fop_shipping/i18n/gl.po +++ b/purchase_fop_shipping/i18n/gl.po @@ -72,6 +72,7 @@ msgid "Purchase Order" msgstr "Orde de compra" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/hr.po b/purchase_fop_shipping/i18n/hr.po index bb28e47c7c5..9967e62ed71 100644 --- a/purchase_fop_shipping/i18n/hr.po +++ b/purchase_fop_shipping/i18n/hr.po @@ -74,6 +74,7 @@ msgid "Purchase Order" msgstr "Nabavni nalog" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index c3727d13185..5deabacb190 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Ordine di acquisto" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/nl.po b/purchase_fop_shipping/i18n/nl.po index c7969149ef8..bb168fa2b48 100644 --- a/purchase_fop_shipping/i18n/nl.po +++ b/purchase_fop_shipping/i18n/nl.po @@ -72,6 +72,7 @@ msgid "Purchase Order" msgstr "Inkooporder" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/nl_NL.po b/purchase_fop_shipping/i18n/nl_NL.po index ed8fd188d11..b14eb87f9db 100644 --- a/purchase_fop_shipping/i18n/nl_NL.po +++ b/purchase_fop_shipping/i18n/nl_NL.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Inkooporder" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po index 5627c5440d2..59320b243a3 100644 --- a/purchase_fop_shipping/i18n/pt_BR.po +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -74,6 +74,7 @@ msgid "Purchase Order" msgstr "Pedido de Compra" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/ro.po b/purchase_fop_shipping/i18n/ro.po index 506bd3aa2b4..32f99e178d8 100644 --- a/purchase_fop_shipping/i18n/ro.po +++ b/purchase_fop_shipping/i18n/ro.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Comandă achiziție" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/sl.po b/purchase_fop_shipping/i18n/sl.po index 9033a268156..242ee45d15f 100644 --- a/purchase_fop_shipping/i18n/sl.po +++ b/purchase_fop_shipping/i18n/sl.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Nabavni nalog" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" diff --git a/purchase_fop_shipping/i18n/vi_VN.po b/purchase_fop_shipping/i18n/vi_VN.po index 762e3ffcb8a..58189b33fab 100644 --- a/purchase_fop_shipping/i18n/vi_VN.po +++ b/purchase_fop_shipping/i18n/vi_VN.po @@ -73,6 +73,7 @@ msgid "Purchase Order" msgstr "Đơn hàng Mua" #. module: purchase_fop_shipping +#. odoo-python #: code:addons/purchase_fop_shipping/models/purchase.py:0 #, python-format msgid "" From a9aebf081a66b503d016b5c9b18e68872bfd7ad9 Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Thu, 12 Oct 2023 14:05:28 +0000 Subject: [PATCH 25/34] Translated using Weblate (Spanish) Currently translated at 100.0% (11 of 11 strings) Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_fop_shipping/es/ --- purchase_fop_shipping/i18n/es.po | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/purchase_fop_shipping/i18n/es.po b/purchase_fop_shipping/i18n/es.po index 890e4ed354b..dc03ad6d8c0 100644 --- a/purchase_fop_shipping/i18n/es.po +++ b/purchase_fop_shipping/i18n/es.po @@ -9,62 +9,63 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-18 07:33+0000\n" -"PO-Revision-Date: 2017-05-18 07:33+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2023-10-12 16:36+0000\n" +"Last-Translator: Ivorra78 \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" -msgstr "" +msgstr "Confirmar bajo FOP" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_res_partner msgid "Contact" -msgstr "" +msgstr "Contacto" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" -msgstr "" +msgstr "FOP alcanzado" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" -msgstr "" +msgstr "Envío FOP" #. module: purchase_fop_shipping #: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager msgid "FOP shipping Manager" -msgstr "" +msgstr "Gestor de envíos FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" -msgstr "" +msgstr "Forzar la confirmación de la orden de compra en envío Gratuito" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" -msgstr "" +msgstr "Envío gratuito alcanzado" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" -msgstr "" +msgstr "Importe mínimo de pedido para el envío FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" -msgstr "" +msgstr "Importe mínimo de pedido para el envío gratuito" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order @@ -79,3 +80,5 @@ msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " "confirm you must belongs to \"FOP shipping Manager\"." msgstr "" +"No se puede confirmar una orden de compra con importe por debajo del envío " +"FOP. Para forzar la confirmación debe pertenecer a \"FOP shipping Manager\"." From 934d933c0409c0d12dc76335caf896cbadd0fde6 Mon Sep 17 00:00:00 2001 From: cyrilmanuel Date: Mon, 30 Oct 2023 14:13:43 +0100 Subject: [PATCH 26/34] [FIX] purchase_fop_shipping: purchase fop should not block negative PO --- purchase_fop_shipping/models/purchase.py | 6 ++++++ .../tests/test_fop_shipping.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 82d2fd214ca..72cb8591614 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -35,6 +35,12 @@ class PurchaseOrder(models.Model): def _compute_fop_shipping_reached(self): digit_precision = self.env["decimal.precision"].precision_get("Account") for record in self: + if ( + float_compare(record.amount_total, 0, precision_digits=digit_precision) + < 0 + ): + record.fop_reached = True + continue record.fop_reached = ( float_compare( record.amount_total, diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 6f52774f4d2..41bacd1d7d7 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -64,3 +64,22 @@ def test_fop_shipping_reached2(self): self.assertTrue(po.fop_reached) po.button_approve() self.assertEqual(po.state, "purchase") + + def test_fop_shipping_negative(self): + po = self.Purchase.create({"partner_id": self.partner_3.id}) + self.PurchaseLine.create( + { + "order_id": po.id, + "product_id": self.product_1.id, + "date_planned": fields.Datetime.now(), + "name": "Test", + "product_qty": 1.0, + "product_uom": self.product_1.uom_id.id, + "price_unit": -100.0, + } + ) + + self.assertTrue(po.fop_reached) + + po.button_approve() + self.assertEqual(po.state, "purchase") From cbea3631ac7a0300078d605a3a7fccd85263d4a0 Mon Sep 17 00:00:00 2001 From: mymage Date: Wed, 20 Dec 2023 15:42:37 +0000 Subject: [PATCH 27/34] Translated using Weblate (Italian) Currently translated at 100.0% (11 of 11 strings) Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_fop_shipping/it/ --- purchase_fop_shipping/i18n/it.po | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index 5deabacb190..cce9e1b9a4c 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -9,63 +9,63 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-18 07:33+0000\n" -"PO-Revision-Date: 2023-01-02 12:45+0000\n" -"Last-Translator: Francesco Foresti \n" +"PO-Revision-Date: 2023-12-20 18:34+0000\n" +"Last-Translator: mymage \n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.14.1\n" +"X-Generator: Weblate 4.17\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" -msgstr "" +msgstr "Conferma con FOP" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_res_partner msgid "Contact" -msgstr "" +msgstr "Contatto" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" -msgstr "" +msgstr "FOP raggiunto" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" -msgstr "" +msgstr "Spedizione FOP" #. module: purchase_fop_shipping #: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager msgid "FOP shipping Manager" -msgstr "" +msgstr "Responsabile spedizione FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" -msgstr "" +msgstr "Forza conferma ordine acquisto in spedizione Free-Of-Payment" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" -msgstr "" +msgstr "Raggiunta spedizione Free-Of-Payment" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" -msgstr "" +msgstr "Importo minimo ordine acquisto per spedizione FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" -msgstr "" +msgstr "Importo minimo ordine acquisto per spedizione Free-Of-Payment" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order @@ -80,3 +80,6 @@ msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " "confirm you must belongs to \"FOP shipping Manager\"." msgstr "" +"Non è possibile confermare un ordine di acquisto con un importo inferiore " +"alla spedizione FOP. Per forzare la conferma bisogna essere un \"Responsabile" +" spedizine FOP\"." From 06081cc25838624ceefcd633232c1d64cd97c37b Mon Sep 17 00:00:00 2001 From: mymage Date: Fri, 5 Jan 2024 08:07:17 +0000 Subject: [PATCH 28/34] Translated using Weblate (Italian) Currently translated at 100.0% (11 of 11 strings) Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_fop_shipping/it/ --- purchase_fop_shipping/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/purchase_fop_shipping/i18n/it.po b/purchase_fop_shipping/i18n/it.po index cce9e1b9a4c..94eef1d3933 100644 --- a/purchase_fop_shipping/i18n/it.po +++ b/purchase_fop_shipping/i18n/it.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-18 07:33+0000\n" -"PO-Revision-Date: 2023-12-20 18:34+0000\n" +"PO-Revision-Date: 2024-01-05 10:37+0000\n" "Last-Translator: mymage \n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "Language: it\n" @@ -82,4 +82,4 @@ msgid "" msgstr "" "Non è possibile confermare un ordine di acquisto con un importo inferiore " "alla spedizione FOP. Per forzare la conferma bisogna essere un \"Responsabile" -" spedizine FOP\"." +" spedizione FOP\"." From 2c03d8fbe1101d620ae4683b666809c57ee0cf0a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 5 Apr 2024 07:35:38 +0000 Subject: [PATCH 29/34] [BOT] post-merge updates --- purchase_fop_shipping/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index b9a41fb0494..3186d09652b 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "16.0.1.0.0", + "version": "16.0.1.0.1", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", From 264addfe82d804560b27b1aa20738b7f5301aad1 Mon Sep 17 00:00:00 2001 From: Rodrigo Macedo Date: Wed, 29 May 2024 16:24:51 +0000 Subject: [PATCH 30/34] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (11 of 11 strings) Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_fop_shipping Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_fop_shipping/pt_BR/ --- purchase_fop_shipping/i18n/pt_BR.po | 31 ++++++++++++++++------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/purchase_fop_shipping/i18n/pt_BR.po b/purchase_fop_shipping/i18n/pt_BR.po index 59320b243a3..fee2c5ac57d 100644 --- a/purchase_fop_shipping/i18n/pt_BR.po +++ b/purchase_fop_shipping/i18n/pt_BR.po @@ -9,64 +9,65 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-24 07:53+0000\n" -"PO-Revision-Date: 2022-10-03 17:36+0000\n" -"Last-Translator: Douglas Custódio \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2024-05-29 18:37+0000\n" +"Last-Translator: Rodrigo Macedo \n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" +"23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.3.2\n" +"X-Generator: Weblate 4.17\n" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Confirm under FOP" -msgstr "" +msgstr "Confirme sob FOP" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_res_partner msgid "Contact" -msgstr "" +msgstr "Contato" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_reached msgid "FOP reached" -msgstr "" +msgstr "FOP alcançado" #. module: purchase_fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_purchase_order__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,field_description:purchase_fop_shipping.field_res_users__fop_shipping msgid "FOP shipping" -msgstr "" +msgstr "FOP enviado" #. module: purchase_fop_shipping #: model:res.groups,name:purchase_fop_shipping.group_fop_shipping_purchase_manager msgid "FOP shipping Manager" -msgstr "" +msgstr "Gerente de remessa FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__force_order_under_fop msgid "Force confirm purchase order under Free-Of-Payment shipping" -msgstr "" +msgstr "Forçar a confirmação do pedido de compra sob frete grátis" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_reached msgid "Free-Of-Payment shipping reached" -msgstr "" +msgstr "Envio sem pagamento alcançado" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_partner__fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_res_users__fop_shipping msgid "Min purchase order amount for FOP shipping" -msgstr "" +msgstr "Valor mínimo do pedido de compra para remessa FOP" #. module: purchase_fop_shipping #: model:ir.model.fields,help:purchase_fop_shipping.field_purchase_order__fop_shipping msgid "Min purchase order amount for Free-Of-Payment shipping" -msgstr "" +msgstr "Valor mínimo do pedido de compra para remessa sem pagamento" #. module: purchase_fop_shipping #: model:ir.model,name:purchase_fop_shipping.model_purchase_order @@ -81,3 +82,5 @@ msgid "" "You cannot confirm a purchase order with amount under FOP shipping. To force " "confirm you must belongs to \"FOP shipping Manager\"." msgstr "" +"Você não pode confirmar um pedido de compra com valor sob frete FOP. Para " +"forçar a confirmação você deve pertencer ao \"FOP Shipping Manager\"." From 90a5140f4f9eac98a84875329bd75041d2650d16 Mon Sep 17 00:00:00 2001 From: TraiTran Date: Thu, 4 Jul 2024 12:17:47 +0700 Subject: [PATCH 31/34] [IMP] purchase_fop_shipping: pre-commit auto fixes --- purchase_fop_shipping/models/purchase.py | 1 - purchase_fop_shipping/pyproject.toml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 purchase_fop_shipping/pyproject.toml diff --git a/purchase_fop_shipping/models/purchase.py b/purchase_fop_shipping/models/purchase.py index 72cb8591614..87ab0a35ff6 100644 --- a/purchase_fop_shipping/models/purchase.py +++ b/purchase_fop_shipping/models/purchase.py @@ -8,7 +8,6 @@ class PurchaseOrder(models.Model): - _inherit = "purchase.order" fop_reached = fields.Boolean( diff --git a/purchase_fop_shipping/pyproject.toml b/purchase_fop_shipping/pyproject.toml new file mode 100644 index 00000000000..4231d0cccb3 --- /dev/null +++ b/purchase_fop_shipping/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" From 29669468b4c3ed18851b5267819da7a9feb25388 Mon Sep 17 00:00:00 2001 From: TraiTran Date: Thu, 4 Jul 2024 18:21:35 +0700 Subject: [PATCH 32/34] [MIG] purchase_fop_shipping: Migration to 17.0 --- purchase_fop_shipping/__manifest__.py | 2 +- purchase_fop_shipping/tests/test_fop_shipping.py | 4 +++- purchase_fop_shipping/views/purchase_order.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index 3186d09652b..a36e0d74a19 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "16.0.1.0.1", + "version": "17.0.1.0.1", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/tests/test_fop_shipping.py b/purchase_fop_shipping/tests/test_fop_shipping.py index 41bacd1d7d7..eb230c9b095 100644 --- a/purchase_fop_shipping/tests/test_fop_shipping.py +++ b/purchase_fop_shipping/tests/test_fop_shipping.py @@ -4,13 +4,15 @@ from odoo import fields from odoo.exceptions import UserError +from odoo.tests import tagged from odoo.tests.common import TransactionCase +@tagged("post_install", "-at_install") class TestPurchaseOrder(TransactionCase): @classmethod def setUpClass(cls): - super(TestPurchaseOrder, cls).setUpClass() + super().setUpClass() cls.Product = cls.env["product.product"] cls.Purchase = cls.env["purchase.order"] cls.PurchaseLine = cls.env["purchase.order.line"] diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 926588692c8..540c05b67bc 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -56,7 +56,7 @@ From 79f67479663cfa30017463421e826b27f5636df8 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Sun, 15 Dec 2024 22:06:29 +0100 Subject: [PATCH 33/34] [IMP] purchase_fop_shipping: pre-commit auto fixes --- purchase_fop_shipping/views/purchase_order.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 540c05b67bc..741dc1f8214 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -53,14 +53,14 @@ /> - - + From 82417baccd10d1dcf4c488fa20daca178b9df51f Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Sun, 15 Dec 2024 22:07:28 +0100 Subject: [PATCH 34/34] [MIG] purchase_fop_shipping to v18 --- purchase_fop_shipping/__manifest__.py | 2 +- purchase_fop_shipping/views/purchase_order.xml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/purchase_fop_shipping/__manifest__.py b/purchase_fop_shipping/__manifest__.py index a36e0d74a19..22c0e7f2c42 100644 --- a/purchase_fop_shipping/__manifest__.py +++ b/purchase_fop_shipping/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Purchase Free-Of-Payment shipping", - "version": "17.0.1.0.1", + "version": "18.0.1.0.1", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", "maintainer": "Akretion", diff --git a/purchase_fop_shipping/views/purchase_order.xml b/purchase_fop_shipping/views/purchase_order.xml index 741dc1f8214..c2214486e48 100644 --- a/purchase_fop_shipping/views/purchase_order.xml +++ b/purchase_fop_shipping/views/purchase_order.xml @@ -1,11 +1,11 @@ - + purchase.order - tree + list - + fop_reached == False @@ -14,12 +14,12 @@ - + purchase.order - tree + list - + fop_reached == False @@ -28,12 +28,12 @@ - + purchase.order - tree + list - + fop_reached == False