From c93ae01986578fff16e401b30232a314ba6bfd4d Mon Sep 17 00:00:00 2001 From: Arnold Moyaux Date: Tue, 10 Jul 2018 15:43:32 +0200 Subject: [PATCH] [MOV] stock, mrp, purchase_stock: rename procurement in stock_rule Procurement rule do not reflect reality anymore since it is common for push and pull rules. We decide to rename it stock rule instead. --- addons/mrp/models/__init__.py | 2 +- addons/mrp/models/{procurement.py => stock_rule.py} | 0 addons/purchase_stock/__manifest__.py | 2 +- addons/purchase_stock/models/__init__.py | 2 +- addons/purchase_stock/models/{procurement.py => stock_rule.py} | 0 .../views/{procurement_views.xml => stock_rule_views.xml} | 0 addons/stock/__manifest__.py | 2 +- addons/stock/models/__init__.py | 2 +- addons/stock/models/{procurement.py => stock_rule.py} | 0 .../stock/views/{procurement_views.xml => stock_rule_views.xml} | 0 10 files changed, 5 insertions(+), 5 deletions(-) rename addons/mrp/models/{procurement.py => stock_rule.py} (100%) rename addons/purchase_stock/models/{procurement.py => stock_rule.py} (100%) rename addons/purchase_stock/views/{procurement_views.xml => stock_rule_views.xml} (100%) rename addons/stock/models/{procurement.py => stock_rule.py} (100%) rename addons/stock/views/{procurement_views.xml => stock_rule_views.xml} (100%) diff --git a/addons/mrp/models/__init__.py b/addons/mrp/models/__init__.py index 8a5125a85fe..68cab4c4a3d 100644 --- a/addons/mrp/models/__init__.py +++ b/addons/mrp/models/__init__.py @@ -11,12 +11,12 @@ from . import mrp_production from . import stock_traceability from . import mrp_unbuild from . import mrp_workorder -from . import procurement from . import product from . import res_company from . import stock_move from . import stock_picking from . import stock_production_lot +from . import stock_rule from . import stock_scrap from . import stock_warehouse from . import res_users diff --git a/addons/mrp/models/procurement.py b/addons/mrp/models/stock_rule.py similarity index 100% rename from addons/mrp/models/procurement.py rename to addons/mrp/models/stock_rule.py diff --git a/addons/purchase_stock/__manifest__.py b/addons/purchase_stock/__manifest__.py index 47cec1d1f4e..5cdf1b21680 100644 --- a/addons/purchase_stock/__manifest__.py +++ b/addons/purchase_stock/__manifest__.py @@ -16,8 +16,8 @@ 'data/mail_data.xml', 'views/purchase_views.xml', 'views/stock_views.xml', + 'views/stock_rule_views.xml', 'views/res_config_settings_views.xml', - 'views/procurement_views.xml', 'report/purchase_report_views.xml', 'report/purchase_report_templates.xml', ], diff --git a/addons/purchase_stock/models/__init__.py b/addons/purchase_stock/models/__init__.py index 7beabf2929a..1cfbfcbf891 100644 --- a/addons/purchase_stock/models/__init__.py +++ b/addons/purchase_stock/models/__init__.py @@ -2,8 +2,8 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import account_invoice -from . import procurement from . import product from . import purchase from . import res_config_settings from . import stock +from . import stock_rule diff --git a/addons/purchase_stock/models/procurement.py b/addons/purchase_stock/models/stock_rule.py similarity index 100% rename from addons/purchase_stock/models/procurement.py rename to addons/purchase_stock/models/stock_rule.py diff --git a/addons/purchase_stock/views/procurement_views.xml b/addons/purchase_stock/views/stock_rule_views.xml similarity index 100% rename from addons/purchase_stock/views/procurement_views.xml rename to addons/purchase_stock/views/stock_rule_views.xml diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py index eec6d02301a..4771977cf9a 100644 --- a/addons/stock/__manifest__.py +++ b/addons/stock/__manifest__.py @@ -62,7 +62,7 @@ 'views/res_config_settings_views.xml', 'views/report_stock_traceability.xml', 'views/stock_template.xml', - 'views/procurement_views.xml', + 'views/stock_rule_views.xml', 'views/res_users_views.xml', 'views/stock_package_level_views.xml', diff --git a/addons/stock/models/__init__.py b/addons/stock/models/__init__.py index 2fdb7c230ae..9c14ae1761f 100644 --- a/addons/stock/models/__init__.py +++ b/addons/stock/models/__init__.py @@ -2,7 +2,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import barcode -from . import procurement from . import product_strategy from . import res_company from . import res_partner @@ -15,6 +14,7 @@ from . import stock_move_line from . import stock_production_lot from . import stock_picking from . import stock_quant +from . import stock_rule from . import stock_traceability from . import stock_warehouse from . import stock_scrap diff --git a/addons/stock/models/procurement.py b/addons/stock/models/stock_rule.py similarity index 100% rename from addons/stock/models/procurement.py rename to addons/stock/models/stock_rule.py diff --git a/addons/stock/views/procurement_views.xml b/addons/stock/views/stock_rule_views.xml similarity index 100% rename from addons/stock/views/procurement_views.xml rename to addons/stock/views/stock_rule_views.xml