From 07ce39a3fdd0ae65b6830500aee360851bc4a7b0 Mon Sep 17 00:00:00 2001 From: cubells Date: Mon, 26 Nov 2018 10:10:38 +0100 Subject: [PATCH 01/37] [ADD] purchase_order_line_deep_sort: new module --- purchase_order_line_deep_sort/README.rst | 101 ++++ purchase_order_line_deep_sort/__init__.py | 1 + purchase_order_line_deep_sort/__manifest__.py | 21 + purchase_order_line_deep_sort/i18n/es.po | 135 ++++++ .../i18n/purchase_order_line_deep_sort.pot | 136 ++++++ .../models/__init__.py | 3 + .../models/purchase_order.py | 52 ++ .../models/res_company.py | 34 ++ .../models/res_config_settings.py | 17 + .../readme/CONFIGURE.rst | 4 + .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 5 + .../readme/ROADMAP.rst | 1 + .../readme/USAGE.rst | 5 + .../static/description/index.html | 453 ++++++++++++++++++ .../tests/__init__.py | 1 + .../test_purchase_order_line_deep_sort.py | 158 ++++++ .../views/purchase_order_views.xml | 22 + .../views/res_config_settings_views.xml | 33 ++ 19 files changed, 1185 insertions(+) create mode 100644 purchase_order_line_deep_sort/README.rst create mode 100644 purchase_order_line_deep_sort/__init__.py create mode 100644 purchase_order_line_deep_sort/__manifest__.py create mode 100644 purchase_order_line_deep_sort/i18n/es.po create mode 100644 purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot create mode 100644 purchase_order_line_deep_sort/models/__init__.py create mode 100644 purchase_order_line_deep_sort/models/purchase_order.py create mode 100644 purchase_order_line_deep_sort/models/res_company.py create mode 100644 purchase_order_line_deep_sort/models/res_config_settings.py create mode 100644 purchase_order_line_deep_sort/readme/CONFIGURE.rst create mode 100644 purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst create mode 100644 purchase_order_line_deep_sort/readme/DESCRIPTION.rst create mode 100644 purchase_order_line_deep_sort/readme/ROADMAP.rst create mode 100644 purchase_order_line_deep_sort/readme/USAGE.rst create mode 100644 purchase_order_line_deep_sort/static/description/index.html create mode 100644 purchase_order_line_deep_sort/tests/__init__.py create mode 100644 purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py create mode 100644 purchase_order_line_deep_sort/views/purchase_order_views.xml create mode 100644 purchase_order_line_deep_sort/views/res_config_settings_views.xml diff --git a/purchase_order_line_deep_sort/README.rst b/purchase_order_line_deep_sort/README.rst new file mode 100644 index 00000000000..3d3b68db5e2 --- /dev/null +++ b/purchase_order_line_deep_sort/README.rst @@ -0,0 +1,101 @@ +============================= +Purchase Order Line Deep Sort +============================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/purchase-workflow/tree/11.0/purchase_order_line_deep_sort + :alt: OCA/purchase-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/purchase-workflow-11-0/purchase-workflow-11-0-purchase_order_line_deep_sort + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/142/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module was written to extend the functionality of purchase order and allow +you to manage sort of lines. + +You can set the default sort order for the current company or you can set sort +order for a particular purchase order. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +* Sort criteria items can be defined with a dot notation. This means that you + can define an order as follows: **product_id.default_code**. But the field + defined must exist in database. If you define, e.g., a calculated field, sort + criteria won't work. + +Usage +===== + +#. Go to **Purchase > Settings > Default Sort Criteria** and select one. +#. You must select sort direction too. +#. Create a new purchase and add several lines. +#. On saving purchase order you must see how the purchase lines are ordered + with your selected sort order. + +Known issues / Roadmap +====================== + +* Add support for ordering purchase lines by partner. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_: + + * Vicent Cubells + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +This module is part of the `OCA/purchase-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_order_line_deep_sort/__init__.py b/purchase_order_line_deep_sort/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/purchase_order_line_deep_sort/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/purchase_order_line_deep_sort/__manifest__.py b/purchase_order_line_deep_sort/__manifest__.py new file mode 100644 index 00000000000..9660a8241fe --- /dev/null +++ b/purchase_order_line_deep_sort/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2018 Tecnativa - Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 + +{ + 'name': 'Purchase Order Line Deep Sort', + 'version': '11.0.1.0.0', + "author": "Tecnativa," + "Odoo Community Association (OCA)", + 'license': 'AGPL-3', + 'category': 'Purchase Management', + 'website': 'https://github.com/OCA/purchase-workflow', + 'summary': 'Purchase Order Line Sort', + 'depends': [ + 'purchase', + ], + 'data': [ + 'views/res_config_settings_views.xml', + 'views/purchase_order_views.xml', + ], + 'installable': True, +} diff --git a/purchase_order_line_deep_sort/i18n/es.po b/purchase_order_line_deep_sort/i18n/es.po new file mode 100644 index 00000000000..bd0fc6d8f30 --- /dev/null +++ b/purchase_order_line_deep_sort/i18n/es.po @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_order_line_deep_sort +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-26 09:12+0000\n" +"PO-Revision-Date: 2018-11-26 09:12+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_order_line_deep_sort +#: selection:purchase.order,line_direction:0 +#: selection:res.company,default_po_line_direction:0 +msgid "Ascending" +msgstr "Ascendente" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By date planned" +msgstr "Por fecha planificada" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By name" +msgstr "Por nombre" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By price" +msgstr "Por precio" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By product name" +msgstr "Por nombre de producto" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By product reference" +msgstr "Por referencia del producto" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By quantity" +msgstr "Por cantidad" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_res_company +msgid "Companies" +msgstr "Compañías" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Default Sort Criteria" +msgstr "Criterio de ordenación por defecto" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Default sort criteria for purchase order lines" +msgstr "Criterio de ordenación por defecto de las líneas del pedido de compra" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_direction:0 +#: selection:res.company,default_po_line_direction:0 +msgid "Descending" +msgstr "Descendente" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Direction" +msgstr "Dirección" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_company_default_po_line_order +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_order +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Line Order" +msgstr "Línea de pedido" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.purchase_order_form +msgid "Other Info" +msgstr "Otra información" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_purchase_order +msgid "Purchase Order" +msgstr "Pedido de compra" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Select a default sort criteria for purchase order lines." +msgstr "Selecciona un criterio de ordenación por defecto de las línieas del pedido de compra." + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_order +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_order +msgid "Select a sorting criteria for purchase order lines." +msgstr "Selecciona un criterio de ordenación de las línieas del pedido de compra." + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_direction +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_direction +msgid "Select a sorting direction for purchase order lines." +msgstr "Selecciona una dirección de ordenación de las línieas del pedido de compra." + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_purchase_order_line_direction +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_company_default_po_line_direction +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_direction +msgid "Sort Direction" +msgstr "Dirección de ordenación" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_purchase_order_line_order +msgid "Sort Lines By" +msgstr "Ordenar las líneas por" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_res_config_settings +msgid "res.config.settings" +msgstr "res.config.settings" diff --git a/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot new file mode 100644 index 00000000000..aada90a19d3 --- /dev/null +++ b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot @@ -0,0 +1,136 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_order_line_deep_sort +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-26 09:12+0000\n" +"PO-Revision-Date: 2018-11-26 09:12+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_order_line_deep_sort +#: selection:purchase.order,line_direction:0 +#: selection:res.company,default_po_line_direction:0 +msgid "Ascending" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By date planned" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By name" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By price" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By product name" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By product reference" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_order:0 +#: selection:res.company,default_po_line_order:0 +msgid "By quantity" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_res_company +msgid "Companies" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Default Sort Criteria" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Default sort criteria for purchase order lines" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: selection:purchase.order,line_direction:0 +#: selection:res.company,default_po_line_direction:0 +msgid "Descending" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Direction" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_company_default_po_line_order +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_order +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Line Order" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.purchase_order_form +msgid "Other Info" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form +msgid "Select a default sort criteria for purchase order lines." +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_order +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_order +msgid "Select a sorting criteria for purchase order lines." +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_direction +#: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_direction +msgid "Select a sorting direction for purchase order lines." +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_purchase_order_line_direction +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_company_default_po_line_direction +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_direction +msgid "Sort Direction" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_purchase_order_line_order +msgid "Sort Lines By" +msgstr "" + +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_res_config_settings +msgid "res.config.settings" +msgstr "" + diff --git a/purchase_order_line_deep_sort/models/__init__.py b/purchase_order_line_deep_sort/models/__init__.py new file mode 100644 index 00000000000..8b19d0da10e --- /dev/null +++ b/purchase_order_line_deep_sort/models/__init__.py @@ -0,0 +1,3 @@ +from . import purchase_order +from . import res_company +from . import res_config_settings diff --git a/purchase_order_line_deep_sort/models/purchase_order.py b/purchase_order_line_deep_sort/models/purchase_order.py new file mode 100644 index 00000000000..5dd8bb0f4d1 --- /dev/null +++ b/purchase_order_line_deep_sort/models/purchase_order.py @@ -0,0 +1,52 @@ +# Copyright 2018 Tecnativa - Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 + +from odoo import api, fields, models +from .res_company import SORTING_CRITERIA, SORTING_DIRECTION + + +class PurchaseOrder(models.Model): + _inherit = 'purchase.order' + + line_order = fields.Selection( + selection=SORTING_CRITERIA, + string='Sort Lines By', + default=lambda self: self.env.user.company_id.default_po_line_order, + ) + line_direction = fields.Selection( + selection=SORTING_DIRECTION, + string='Sort Direction', + default=lambda self: + self.env.user.company_id.default_po_line_direction, + ) + + @api.onchange('line_order') + def onchange_line_order(self): + if not self.line_order: + self.line_direction = False + + @api.multi + def _sort_purchase_line(self): + if not self.line_order and not self.line_direction: + return + order = self.line_order + reverse = self.line_direction == 'desc' + sequence = 0 + key = eval("lambda p: p.%s" % order) + for line in self.order_line.sorted(key=key, reverse=reverse): + sequence += 10 + line.sequence = sequence + + @api.multi + def write(self, values): + res = super(PurchaseOrder, self).write(values) + if 'order_line' in values or 'line_order' in values or \ + 'line_direction' in values: + self._sort_purchase_line() + return res + + @api.model + def create(self, values): + purchase = super(PurchaseOrder, self).create(values) + purchase._sort_purchase_line() + return purchase diff --git a/purchase_order_line_deep_sort/models/res_company.py b/purchase_order_line_deep_sort/models/res_company.py new file mode 100644 index 00000000000..b0af53f4ff5 --- /dev/null +++ b/purchase_order_line_deep_sort/models/res_company.py @@ -0,0 +1,34 @@ +# Copyright 2018 Tecnativa - Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 + +from odoo import fields, models + + +SORTING_CRITERIA = [ + ('name', 'By name'), + ('product_id.name', 'By product name'), + ('product_id.default_code', 'By product reference'), + ('date_planned', 'By date planned'), + ('price_unit', 'By price'), + ('product_qty', 'By quantity'), +] + +SORTING_DIRECTION = [ + ('asc', 'Ascending'), + ('desc', 'Descending'), +] + + +class ResCompany(models.Model): + _inherit = 'res.company' + + default_po_line_order = fields.Selection( + selection=SORTING_CRITERIA, + string='Line Order', + help='Select a sorting criteria for purchase order lines.' + ) + default_po_line_direction = fields.Selection( + selection=SORTING_DIRECTION, + string='Sort Direction', + help='Select a sorting direction for purchase order lines.' + ) diff --git a/purchase_order_line_deep_sort/models/res_config_settings.py b/purchase_order_line_deep_sort/models/res_config_settings.py new file mode 100644 index 00000000000..f07030490ff --- /dev/null +++ b/purchase_order_line_deep_sort/models/res_config_settings.py @@ -0,0 +1,17 @@ +# Copyright 2018 Tecnativa - Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + default_po_line_order = fields.Selection( + related='company_id.default_po_line_order', + string="Line Order", + ) + default_po_line_direction = fields.Selection( + related='company_id.default_po_line_direction', + string="Sort Direction", + ) diff --git a/purchase_order_line_deep_sort/readme/CONFIGURE.rst b/purchase_order_line_deep_sort/readme/CONFIGURE.rst new file mode 100644 index 00000000000..102dc1866f7 --- /dev/null +++ b/purchase_order_line_deep_sort/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +* Sort criteria items can be defined with a dot notation. This means that you + can define an order as follows: **product_id.default_code**. But the field + defined must exist in database. If you define, e.g., a calculated field, sort + criteria won't work. diff --git a/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst b/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..9b6785dda97 --- /dev/null +++ b/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + + * Vicent Cubells diff --git a/purchase_order_line_deep_sort/readme/DESCRIPTION.rst b/purchase_order_line_deep_sort/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..30a6cc53362 --- /dev/null +++ b/purchase_order_line_deep_sort/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +This module was written to extend the functionality of purchase order and allow +you to manage sort of lines. + +You can set the default sort order for the current company or you can set sort +order for a particular purchase order. diff --git a/purchase_order_line_deep_sort/readme/ROADMAP.rst b/purchase_order_line_deep_sort/readme/ROADMAP.rst new file mode 100644 index 00000000000..073d75e19d4 --- /dev/null +++ b/purchase_order_line_deep_sort/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Add support for ordering purchase lines by partner. diff --git a/purchase_order_line_deep_sort/readme/USAGE.rst b/purchase_order_line_deep_sort/readme/USAGE.rst new file mode 100644 index 00000000000..f719e1dba61 --- /dev/null +++ b/purchase_order_line_deep_sort/readme/USAGE.rst @@ -0,0 +1,5 @@ +#. Go to **Purchase > Settings > Default Sort Criteria** and select one. +#. You must select sort direction too. +#. Create a new purchase and add several lines. +#. On saving purchase order you must see how the purchase lines are ordered + with your selected sort order. diff --git a/purchase_order_line_deep_sort/static/description/index.html b/purchase_order_line_deep_sort/static/description/index.html new file mode 100644 index 00000000000..b920bd94bf1 --- /dev/null +++ b/purchase_order_line_deep_sort/static/description/index.html @@ -0,0 +1,453 @@ + + + + + + +Purchase Order Line Deep Sort + + + +
+

Purchase Order Line Deep Sort

+ + +

Beta License: AGPL-3 OCA/purchase-workflow Translate me on Weblate Try me on Runbot

+

This module was written to extend the functionality of purchase order and allow +you to manage sort of lines.

+

You can set the default sort order for the current company or you can set sort +order for a particular purchase order.

+

Table of contents

+ +
+

Configuration

+
    +
  • Sort criteria items can be defined with a dot notation. This means that you +can define an order as follows: product_id.default_code. But the field +defined must exist in database. If you define, e.g., a calculated field, sort +criteria won’t work.
    • +
+
+
+

Usage

+
    +
  1. Go to Purchase > Settings > Default Sort Criteria and select one.
    2. +
  2. You must select sort direction too.
    3. +
  3. Create a new purchase and add several lines.
    4. +
  4. On saving purchase order you must see how the purchase lines are ordered +with your selected sort order.
    5. +
+
+
+

Known issues / Roadmap

+
    +
  • Add support for ordering purchase lines by partner.
    • +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/purchase-workflow project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/purchase_order_line_deep_sort/tests/__init__.py b/purchase_order_line_deep_sort/tests/__init__.py new file mode 100644 index 00000000000..d49bc46f73d --- /dev/null +++ b/purchase_order_line_deep_sort/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purchase_order_line_deep_sort diff --git a/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py new file mode 100644 index 00000000000..0041d6f5c7e --- /dev/null +++ b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py @@ -0,0 +1,158 @@ +# Copyright 2018 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestPurchaseOrderLineDeepSort(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestPurchaseOrderLineDeepSort, cls).setUpClass() + + po_model = cls.env['purchase.order'] + cls.po_line_model = cls.env['purchase.order.line'] + cls.product_1 = cls.env['product.product'].create({ + 'name': 'Test product 1', + 'default_code': 'CDE', + 'standard_price': 7.5, + }) + cls.product_2 = cls.env['product.product'].create({ + 'name': 'Test product 2', + 'default_code': 'BCD', + 'standard_price': 7.3, + }) + cls.product_3 = cls.env['product.product'].create({ + 'name': 'Test product 3', + 'default_code': 'ABC', + 'standard_price': 7.4, + }) + supplier = cls.env['res.partner'].create({ + 'name': 'Supplier', + 'supplier': True, + }) + cls.po = po_model.create({ + 'partner_id': supplier.id, + }) + cls.po_line_1 = cls.po_line_model.create({ + 'order_id': cls.po.id, + 'product_id': cls.product_1.id, + 'date_planned': '2018-11-01', + 'name': 'Test 1', + 'product_qty': 3.0, + 'product_uom': cls.product_1.uom_id.id, + 'price_unit': 10.0, + }) + cls.po_line_2 = cls.po_line_model.create({ + 'order_id': cls.po.id, + 'product_id': cls.product_2.id, + 'date_planned': '2018-11-05', + 'name': 'Test 2', + 'product_qty': 4.0, + 'product_uom': cls.product_2.uom_id.id, + 'price_unit': 6.0, + }) + cls.po_line_3 = cls.po_line_model.create({ + 'order_id': cls.po.id, + 'product_id': cls.product_3.id, + 'date_planned': '2018-11-03', + 'name': 'Test 3', + 'product_qty': 2.0, + 'product_uom': cls.product_3.uom_id.id, + 'price_unit': 3.0, + }) + + def _check_value(self, lines, value1, value2): + self.assertEqual(lines[0].product_id, value1) + self.assertEqual(lines[2].product_id, value2) + + def test_without_line_order(self): + self.assertEqual(self.po.order_line[0].product_id, self.product_1) + self.assertEqual(self.po.order_line[2].product_id, self.product_3) + for line in self.po.order_line: + self.assertEqual(line.sequence, 10) + + def test_line_by_name(self): + """ Test if lines are ordered by purchase line name""" + self.po.write({ + 'line_order': 'name', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_1, self.product_3) + self.assertEqual(lines[1].name, 'Test 2') + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_3, self.product_1) + self.assertEqual(lines[1].name, 'Test 2') + + def test_line_by_product_name(self): + """ Test if lines are ordered by product name""" + self.po.write({ + 'line_order': 'product_id.name', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_1, self.product_3) + self.assertEqual(lines[1].product_id.name, 'Test product 2') + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)], + order='sequence') + self._check_value(lines, self.product_3, self.product_1) + self.assertEqual(lines[1].product_id.name, 'Test product 2') + + def test_line_by_product_code(self): + """ Test if lines are ordered by product code""" + self.po.write({ + 'line_order': 'product_id.default_code', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_3, self.product_1) + self.assertEqual(lines[1].product_id.default_code, 'BCD') + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_1, self.product_3) + self.assertEqual(lines[1].product_id.default_code, 'BCD') + + def test_line_by_date_planned(self): + """ Test if lines are ordered by purchase line date planned""" + self.po.write({ + 'line_order': 'date_planned', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_1, self.product_2) + self.assertEqual(lines[1].date_planned[:10], '2018-11-03') + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_2, self.product_1) + self.assertEqual(lines[1].date_planned[:10], '2018-11-03') + + def test_line_by_price_unit(self): + """ Test if lines are ordered by purchase line price""" + self.po.write({ + 'line_order': 'price_unit', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_3, self.product_1) + self.assertAlmostEqual(lines[1].price_unit, 6.0) + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_1, self.product_3) + self.assertAlmostEqual(lines[1].price_unit, 6.0) + + def test_line_by_product_qty(self): + """ Test if lines are ordered by purchase line product_qty""" + self.po.write({ + 'line_order': 'product_qty', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_3, self.product_2) + self.assertAlmostEqual(lines[1].product_qty, 3.0) + self.po.write({'line_direction': 'desc'}) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self._check_value(lines, self.product_2, self.product_3) + self.assertAlmostEqual(lines[1].product_qty, 3.0) diff --git a/purchase_order_line_deep_sort/views/purchase_order_views.xml b/purchase_order_line_deep_sort/views/purchase_order_views.xml new file mode 100644 index 00000000000..b1ff2fb4a44 --- /dev/null +++ b/purchase_order_line_deep_sort/views/purchase_order_views.xml @@ -0,0 +1,22 @@ + + + + + purchase.order + + + + + + + + + + + + diff --git a/purchase_order_line_deep_sort/views/res_config_settings_views.xml b/purchase_order_line_deep_sort/views/res_config_settings_views.xml new file mode 100644 index 00000000000..e0fa3cc1049 --- /dev/null +++ b/purchase_order_line_deep_sort/views/res_config_settings_views.xml @@ -0,0 +1,33 @@ + + + + + res.config.settings.view.form.inherit.purchase.sort + res.config.settings + + + +
+
+
+
+
+ + + + + From 0abbb89bd035532be43c7f93b0c260ac82c7672b Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 25 Feb 2019 18:23:46 +0100 Subject: [PATCH 02/37] [IMP] purchase_order_line_deep_sort: Don't eval --- purchase_order_line_deep_sort/README.rst | 1 + .../models/purchase_order.py | 16 +++++++++++++--- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 1 + .../tests/test_purchase_order_line_deep_sort.py | 7 ++++--- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/purchase_order_line_deep_sort/README.rst b/purchase_order_line_deep_sort/README.rst index 3d3b68db5e2..668509affbd 100644 --- a/purchase_order_line_deep_sort/README.rst +++ b/purchase_order_line_deep_sort/README.rst @@ -82,6 +82,7 @@ Contributors * `Tecnativa `_: * Vicent Cubells + * Pedro M. Baeza Maintainers ~~~~~~~~~~~ diff --git a/purchase_order_line_deep_sort/models/purchase_order.py b/purchase_order_line_deep_sort/models/purchase_order.py index 5dd8bb0f4d1..f83bf11e3e9 100644 --- a/purchase_order_line_deep_sort/models/purchase_order.py +++ b/purchase_order_line_deep_sort/models/purchase_order.py @@ -1,4 +1,5 @@ # Copyright 2018 Tecnativa - Vicent Cubells +# Copyright 2019 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 from odoo import api, fields, models @@ -27,13 +28,22 @@ def onchange_line_order(self): @api.multi def _sort_purchase_line(self): + def resolve_subfields(obj, line_order): + subfields = line_order.split('.') + res = obj + for subfield in subfields: + res = getattr(res, subfield) + return res + if not self.line_order and not self.line_direction: return - order = self.line_order reverse = self.line_direction == 'desc' sequence = 0 - key = eval("lambda p: p.%s" % order) - for line in self.order_line.sorted(key=key, reverse=reverse): + sorted_lines = self.order_line.sorted( + key=lambda p: resolve_subfields(p, self.line_order), + reverse=reverse, + ) + for line in sorted_lines: sequence += 10 line.sequence = sequence diff --git a/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst b/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst index 9b6785dda97..36eba6551c4 100644 --- a/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst +++ b/purchase_order_line_deep_sort/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ * `Tecnativa `_: * Vicent Cubells + * Pedro M. Baeza diff --git a/purchase_order_line_deep_sort/static/description/index.html b/purchase_order_line_deep_sort/static/description/index.html index b920bd94bf1..1d847994b11 100644 --- a/purchase_order_line_deep_sort/static/description/index.html +++ b/purchase_order_line_deep_sort/static/description/index.html @@ -433,6 +433,7 @@

Contributors

diff --git a/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py index 0041d6f5c7e..ee47679cd5d 100644 --- a/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py +++ b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py @@ -12,17 +12,18 @@ def setUpClass(cls): po_model = cls.env['purchase.order'] cls.po_line_model = cls.env['purchase.order.line'] - cls.product_1 = cls.env['product.product'].create({ + cls.product_obj = cls.env['product.product'] + cls.product_1 = cls.product_obj.create({ 'name': 'Test product 1', 'default_code': 'CDE', 'standard_price': 7.5, }) - cls.product_2 = cls.env['product.product'].create({ + cls.product_2 = cls.product_obj.create({ 'name': 'Test product 2', 'default_code': 'BCD', 'standard_price': 7.3, }) - cls.product_3 = cls.env['product.product'].create({ + cls.product_3 = cls.product_obj.create({ 'name': 'Test product 3', 'default_code': 'ABC', 'standard_price': 7.4, From 80177ef2080d8e451ae09849e51d1d02c07bf097 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 26 Feb 2019 15:51:52 +0000 Subject: [PATCH 03/37] [UPD] Update purchase_order_line_deep_sort.pot --- purchase_order_line_deep_sort/i18n/es.po | 13 +++++++++---- .../i18n/purchase_order_line_deep_sort.pot | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/purchase_order_line_deep_sort/i18n/es.po b/purchase_order_line_deep_sort/i18n/es.po index bd0fc6d8f30..b29de525339 100644 --- a/purchase_order_line_deep_sort/i18n/es.po +++ b/purchase_order_line_deep_sort/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * purchase_order_line_deep_sort +# * purchase_order_line_deep_sort # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-11-26 09:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -103,19 +104,23 @@ msgstr "Pedido de compra" #. module: purchase_order_line_deep_sort #: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form msgid "Select a default sort criteria for purchase order lines." -msgstr "Selecciona un criterio de ordenación por defecto de las línieas del pedido de compra." +msgstr "" +"Selecciona un criterio de ordenación por defecto de las línieas del pedido " +"de compra." #. module: purchase_order_line_deep_sort #: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_order #: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_order msgid "Select a sorting criteria for purchase order lines." -msgstr "Selecciona un criterio de ordenación de las línieas del pedido de compra." +msgstr "" +"Selecciona un criterio de ordenación de las línieas del pedido de compra." #. module: purchase_order_line_deep_sort #: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_company_default_po_line_direction #: model:ir.model.fields,help:purchase_order_line_deep_sort.field_res_config_settings_default_po_line_direction msgid "Select a sorting direction for purchase order lines." -msgstr "Selecciona una dirección de ordenación de las línieas del pedido de compra." +msgstr "" +"Selecciona una dirección de ordenación de las línieas del pedido de compra." #. module: purchase_order_line_deep_sort #: model:ir.model.fields,field_description:purchase_order_line_deep_sort.field_purchase_order_line_direction diff --git a/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot index aada90a19d3..c6d4aa94f30 100644 --- a/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot +++ b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot @@ -6,8 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-26 09:12+0000\n" -"PO-Revision-Date: 2018-11-26 09:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" From be05a3183c35707e1a19e6088656f0003b893059 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 3 Apr 2019 03:16:11 +0000 Subject: [PATCH 04/37] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 purchase_order_line_deep_sort/static/description/icon.png diff --git a/purchase_order_line_deep_sort/static/description/icon.png b/purchase_order_line_deep_sort/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 6c0eec09af44aca5cd28cc20d8f360809c93e069 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Tue, 7 May 2019 09:48:57 +0200 Subject: [PATCH 05/37] [11.0][FIX] purchase_order_line_deep_sort: Fix compute order when order lines are created directly --- .../models/purchase_order.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/purchase_order_line_deep_sort/models/purchase_order.py b/purchase_order_line_deep_sort/models/purchase_order.py index f83bf11e3e9..80693fbc66d 100644 --- a/purchase_order_line_deep_sort/models/purchase_order.py +++ b/purchase_order_line_deep_sort/models/purchase_order.py @@ -1,5 +1,6 @@ # Copyright 2018 Tecnativa - Vicent Cubells # Copyright 2019 Tecnativa - Pedro M. Baeza +# Copyright 2019 Tecnativa - Sergio Teruel # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3 from odoo import api, fields, models @@ -45,6 +46,8 @@ def resolve_subfields(obj, line_order): ) for line in sorted_lines: sequence += 10 + if line.sequence == sequence: + continue line.sequence = sequence @api.multi @@ -60,3 +63,13 @@ def create(self, values): purchase = super(PurchaseOrder, self).create(values) purchase._sort_purchase_line() return purchase + + +class PurchaseOrderLine(models.Model): + _inherit = 'purchase.order.line' + + @api.model + def create(self, vals): + line = super(PurchaseOrderLine, self).create(vals) + line.order_id._sort_purchase_line() + return line From 7df1a7c2fa3f22ad0cd1588e7478d96335fd82ab Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 9 May 2019 16:06:06 +0000 Subject: [PATCH 06/37] [UPD] Update purchase_order_line_deep_sort.pot --- purchase_order_line_deep_sort/i18n/es.po | 7 +++++++ .../i18n/purchase_order_line_deep_sort.pot | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/purchase_order_line_deep_sort/i18n/es.po b/purchase_order_line_deep_sort/i18n/es.po index b29de525339..6cbf5d4be83 100644 --- a/purchase_order_line_deep_sort/i18n/es.po +++ b/purchase_order_line_deep_sort/i18n/es.po @@ -101,6 +101,13 @@ msgstr "Otra información" msgid "Purchase Order" msgstr "Pedido de compra" +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_purchase_order_line +#, fuzzy +#| msgid "Purchase Order" +msgid "Purchase Order Line" +msgstr "Pedido de compra" + #. module: purchase_order_line_deep_sort #: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form msgid "Select a default sort criteria for purchase order lines." diff --git a/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot index c6d4aa94f30..071c5c1d857 100644 --- a/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot +++ b/purchase_order_line_deep_sort/i18n/purchase_order_line_deep_sort.pot @@ -98,6 +98,11 @@ msgstr "" msgid "Purchase Order" msgstr "" +#. module: purchase_order_line_deep_sort +#: model:ir.model,name:purchase_order_line_deep_sort.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "" + #. module: purchase_order_line_deep_sort #: model:ir.ui.view,arch_db:purchase_order_line_deep_sort.res_config_settings_view_form msgid "Select a default sort criteria for purchase order lines." From 209bedbed161133896c55b36aaf010ec379da3e3 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Thu, 6 Jun 2019 18:34:25 +0200 Subject: [PATCH 07/37] [11.0][FIX] purchase_order_line_deep_sort: Fix sorted with string and False values --- .../models/purchase_order.py | 6 +++++- .../test_purchase_order_line_deep_sort.py | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/purchase_order_line_deep_sort/models/purchase_order.py b/purchase_order_line_deep_sort/models/purchase_order.py index 80693fbc66d..9f468e8c037 100644 --- a/purchase_order_line_deep_sort/models/purchase_order.py +++ b/purchase_order_line_deep_sort/models/purchase_order.py @@ -32,8 +32,12 @@ def _sort_purchase_line(self): def resolve_subfields(obj, line_order): subfields = line_order.split('.') res = obj + str_fields = ('text', 'varchar', 'timestamp', 'date') for subfield in subfields: - res = getattr(res, subfield) + if res._fields[subfield].column_type[0] in str_fields: + res = getattr(res, subfield) or '' + else: + res = getattr(res, subfield) return res if not self.line_order and not self.line_direction: diff --git a/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py index ee47679cd5d..3eae371183c 100644 --- a/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py +++ b/purchase_order_line_deep_sort/tests/test_purchase_order_line_deep_sort.py @@ -157,3 +157,24 @@ def test_line_by_product_qty(self): lines = self.po_line_model.search([('order_id', '=', self.po.id)]) self._check_value(lines, self.product_2, self.product_3) self.assertAlmostEqual(lines[1].product_qty, 3.0) + + def test_product_sort_false_values(self): + """ + Test purchase order lines sorted lines with False values and + string values (default_code). + Test sort lines with numeric values with False values + """ + self.product_2.default_code = False + self.po.write({ + 'line_order': 'product_id.default_code', + 'line_direction': 'asc', + }) + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self.assertEqual(lines[0].product_id, self.product_2) + self.po.write({ + 'line_order': 'price_unit', + 'line_direction': 'asc', + }) + self.po_line_3.price_unit = 0.0 + lines = self.po_line_model.search([('order_id', '=', self.po.id)]) + self.assertEqual(lines[0], self.po_line_3) From e22583bbc4d90a77d5850cfd772cfaa327f02838 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:31:02 +0000 Subject: [PATCH 08/37] [UPD] README.rst --- purchase_order_line_deep_sort/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_order_line_deep_sort/static/description/index.html b/purchase_order_line_deep_sort/static/description/index.html index 1d847994b11..352a1938885 100644 --- a/purchase_order_line_deep_sort/static/description/index.html +++ b/purchase_order_line_deep_sort/static/description/index.html @@ -3,7 +3,7 @@ - + Purchase Order Line Deep Sort