From cb5c370271453d28501f9ca335bb138a482088d8 Mon Sep 17 00:00:00 2001 From: oihane Date: Tue, 29 Jul 2014 18:28:56 +0200 Subject: [PATCH 01/18] [ADD] Nuevo modulo --- .../__init__.py | 21 +++ .../__openerp__.py | 43 ++++++ .../models/__init__.py | 21 +++ .../models/stock_inventory.py | 123 ++++++++++++++++++ .../views/stock_inventory_view.xml | 42 ++++++ 5 files changed, 250 insertions(+) create mode 100644 stock_inventory_preparation_filters/__init__.py create mode 100644 stock_inventory_preparation_filters/__openerp__.py create mode 100644 stock_inventory_preparation_filters/models/__init__.py create mode 100644 stock_inventory_preparation_filters/models/stock_inventory.py create mode 100644 stock_inventory_preparation_filters/views/stock_inventory_view.xml diff --git a/stock_inventory_preparation_filters/__init__.py b/stock_inventory_preparation_filters/__init__.py new file mode 100644 index 000000000..e16a7559a --- /dev/null +++ b/stock_inventory_preparation_filters/__init__.py @@ -0,0 +1,21 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## + +from . import models diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py new file mode 100644 index 000000000..9372f613a --- /dev/null +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -0,0 +1,43 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## + +{ + "name": "Extended Inventory Preparation Filters", + "version": "1.0", + "depends": [ + "stock", + ], + "author": "OdooMRP team", + "contributors": [ + "Oihane Crucelaegui ", + ], + "category": "Custom Module", + "website": "http://www.odoomrp.com", + "complexity": "normal", + "summary": "More filters for inventory adjustments", + "description": """ + This module adds more filters to the inventory adjustments + """, + "data": [ + "views/stock_inventory_view.xml", + ], + "installable": True, + "auto_install": False, +} diff --git a/stock_inventory_preparation_filters/models/__init__.py b/stock_inventory_preparation_filters/models/__init__.py new file mode 100644 index 000000000..b537890cf --- /dev/null +++ b/stock_inventory_preparation_filters/models/__init__.py @@ -0,0 +1,21 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## + +from . import stock_inventory \ No newline at end of file diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py new file mode 100644 index 000000000..a21199ba0 --- /dev/null +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -0,0 +1,123 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## + +from openerp.osv import orm, fields +from openerp.tools.translate import _ + + +class StockInventoryEmptyLines(orm.Model): + _name = 'stock.inventory.line.empty' + + _columns = { + 'product_code': fields.char('Product Code', size=64, required=True), + 'product_qty': fields.float('Quantity', required=True), + 'inventory_id': fields.many2one('stock.inventory', 'Inventory', + required=True, ondelete="cascade"), + } + + _defaults = { + 'product_qty': 1.0, + } + + +class StockInventoryFake(object): + def __init__(self, inventory, product=None, lot=None): + self.id = inventory.id + self.location_id = inventory.location_id + self.product_id = product + self.lot_id = lot + self.partner_id = inventory.partner_id + self.package_id = inventory.package_id + + +class StockInventory(orm.Model): + _inherit = 'stock.inventory' + + def _get_available_filters(self, cr, uid, context=None): + """ + This function will return the list of filter allowed according to + the options checked in 'Settings\Warehouse'. + + :rtype: list of tuple + """ + res_filter = super(StockInventory, + self)._get_available_filters(cr, uid, + context=context) + res_filter.append(('categories', _('Selected Categories'))) + res_filter.append(('products', _('Selected Products'))) + res_filter.append(('lots', _('Selected Lots'))) + res_filter.append(('empty', _('Empty list'))) + return res_filter + + _columns = { + 'filter': fields.selection(_get_available_filters, 'Selection Filter', + required=True), + 'categ_ids': fields.many2many('product.category', + 'rel_inventories_categories', + 'inventory_id', 'category_id', + 'Categories'), + 'product_ids': fields.many2many('product.product', + 'rel_inventories_products', + 'inventory_id', 'product_id', + 'Products'), + 'lot_ids': fields.many2many('stock.production.lot', + 'rel_inventories_lots', 'inventory_id', + 'lot_id', 'Lots'), + 'empty_line_ids': fields.one2many('stock.inventory.line.empty', + 'inventory_id', 'Capture Lines'), + } + + def _get_inventory_lines(self, cr, uid, inventory, context=None): + vals = [] + if not inventory.filter in ('categories', 'products', 'lots', 'empty'): + vals = super(StockInventory, self)._get_inventory_lines( + cr, uid, inventory, context=context) + elif inventory.filter in ('categories', 'products'): + product_tmpl_obj = self.pool['product.template'] + product_obj = self.pool['product.product'] + product_ids = [] + + if inventory.filter == 'categories': + product_tmpl_ids = product_tmpl_obj.search( + cr, uid, [('categ_id', 'in', inventory.categ_ids.ids)], + context=context) + product_ids = product_obj.search( + cr, uid, [('product_tmpl_id', 'in', product_tmpl_ids)], + context=context) + + elif inventory.filter == 'products': + product_ids = inventory.product_ids.ids + for product in product_obj.browse(cr, uid, product_ids, + context=context): + fake_inventory = StockInventoryFake(inventory, product=product) + vals += super(StockInventory, self)._get_inventory_lines( + cr, uid, fake_inventory, context=context) + + elif inventory.filter == 'lots': + for lot in inventory.lot_ids: + fake_inventory = StockInventoryFake(inventory, lot=lot) + vals += super(StockInventory, self)._get_inventory_lines( + cr, uid, fake_inventory, context=context) + elif inventory.filter == 'empty': + print "EMPTY LIST" + # TODO: además de calcular por linea y por producto actualizar + # la cantidad real + + return vals diff --git a/stock_inventory_preparation_filters/views/stock_inventory_view.xml b/stock_inventory_preparation_filters/views/stock_inventory_view.xml new file mode 100644 index 000000000..169b7b02b --- /dev/null +++ b/stock_inventory_preparation_filters/views/stock_inventory_view.xml @@ -0,0 +1,42 @@ + + + + + stock.inventory.form + stock.inventory + + + + + + + + {'invisible':[('state','=','draft')]} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 11f7a4cb159f80744dba74cf3bd6d32a1ce54d55 Mon Sep 17 00:00:00 2001 From: oihane Date: Wed, 30 Jul 2014 10:57:25 +0200 Subject: [PATCH 02/18] =?UTF-8?q?[MOD]=20A=C3=B1adida=20funcionalidad=20"l?= =?UTF-8?q?=C3=ADneas=20vacias"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__init__.py | 2 - .../__openerp__.py | 2 - .../models/__init__.py | 4 +- .../models/stock_inventory.py | 47 +++++++++++++++---- .../views/stock_inventory_view.xml | 2 +- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/stock_inventory_preparation_filters/__init__.py b/stock_inventory_preparation_filters/__init__.py index e16a7559a..7fc7c09f9 100644 --- a/stock_inventory_preparation_filters/__init__.py +++ b/stock_inventory_preparation_filters/__init__.py @@ -1,8 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, or diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index 9372f613a..51ba4604f 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -1,8 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, or diff --git a/stock_inventory_preparation_filters/models/__init__.py b/stock_inventory_preparation_filters/models/__init__.py index b537890cf..6149c9932 100644 --- a/stock_inventory_preparation_filters/models/__init__.py +++ b/stock_inventory_preparation_filters/models/__init__.py @@ -1,8 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, or @@ -18,4 +16,4 @@ # ############################################################################## -from . import stock_inventory \ No newline at end of file +from . import stock_inventory diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index a21199ba0..b410d5e5e 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -1,8 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, or @@ -62,7 +60,9 @@ class StockInventory(orm.Model): context=context) res_filter.append(('categories', _('Selected Categories'))) res_filter.append(('products', _('Selected Products'))) - res_filter.append(('lots', _('Selected Lots'))) + for filter in res_filter: + if filter[0] == 'lot': + res_filter.append(('lots', _('Selected Lots'))) res_filter.append(('empty', _('Empty list'))) return res_filter @@ -86,12 +86,14 @@ class StockInventory(orm.Model): def _get_inventory_lines(self, cr, uid, inventory, context=None): vals = [] + product_tmpl_obj = self.pool['product.template'] + product_obj = self.pool['product.product'] + if not inventory.filter in ('categories', 'products', 'lots', 'empty'): vals = super(StockInventory, self)._get_inventory_lines( cr, uid, inventory, context=context) + elif inventory.filter in ('categories', 'products'): - product_tmpl_obj = self.pool['product.template'] - product_obj = self.pool['product.product'] product_ids = [] if inventory.filter == 'categories': @@ -115,9 +117,38 @@ class StockInventory(orm.Model): fake_inventory = StockInventoryFake(inventory, lot=lot) vals += super(StockInventory, self)._get_inventory_lines( cr, uid, fake_inventory, context=context) + elif inventory.filter == 'empty': - print "EMPTY LIST" - # TODO: además de calcular por linea y por producto actualizar - # la cantidad real + values = [] + tmp_lines = {} + empty_line_obj = self.pool['stock.inventory.line.empty'] + + for empty_line in inventory.empty_line_ids: + if empty_line.product_code in tmp_lines: + tmp_lines[empty_line.product_code] += empty_line.product_qty + else: + tmp_lines[empty_line.product_code] = empty_line.product_qty + empty_line_obj.unlink(cr, uid, empty_line.id, context=context) + + for product_code in tmp_lines.keys(): + product_id = product_obj.search( + cr, uid, [('default_code', '=', product_code)], + context=context)[0] + product = product_obj.browse(cr, uid, product_id, + context=context) + fake_inventory = StockInventoryFake(inventory, product=product) + values = super(StockInventory, self)._get_inventory_lines( + cr, uid, fake_inventory, context=context) + if values: + values[0]['product_qty'] = tmp_lines[product_code] + tmp_lines.pop(product_code) + else: + empty_line_obj.create( + cr, uid, { + 'product_code': product_code, + 'product_qty': tmp_lines[product_code], + 'inventory_id': inventory.id, + }, context=context) + vals += values return vals diff --git a/stock_inventory_preparation_filters/views/stock_inventory_view.xml b/stock_inventory_preparation_filters/views/stock_inventory_view.xml index 169b7b02b..fade33342 100644 --- a/stock_inventory_preparation_filters/views/stock_inventory_view.xml +++ b/stock_inventory_preparation_filters/views/stock_inventory_view.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + From f191e0b99963c67e854d101d0fed0e87d893b533 Mon Sep 17 00:00:00 2001 From: oihane Date: Wed, 30 Jul 2014 10:59:49 +0200 Subject: [PATCH 03/18] =?UTF-8?q?[MOD]=20A=C3=B1adidas=20traducciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/en_US.po | 118 ++++++++++++++++++ .../i18n/es.po | 118 ++++++++++++++++++ .../stock_inventory_preparation_filters.pot | 118 ++++++++++++++++++ 3 files changed, 354 insertions(+) create mode 100644 stock_inventory_preparation_filters/i18n/en_US.po create mode 100644 stock_inventory_preparation_filters/i18n/es.po create mode 100644 stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot diff --git a/stock_inventory_preparation_filters/i18n/en_US.po b/stock_inventory_preparation_filters/i18n/en_US.po new file mode 100644 index 000000000..73aebd936 --- /dev/null +++ b/stock_inventory_preparation_filters/i18n/en_US.po @@ -0,0 +1,118 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_inventory_preparation_filters +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0rc1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-30 08:58+0000\n" +"PO-Revision-Date: 2014-07-30 08:58+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: stock_inventory_preparation_filters +#: view:stock.inventory:0 +#: field:stock.inventory,empty_line_ids:0 +msgid "Capture Lines" +msgstr "Capture Lines" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,categ_ids:0 +msgid "Categories" +msgstr "Categories" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_uid:0 +msgid "Created by" +msgstr "Created by" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_date:0 +msgid "Created on" +msgstr "Created on" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 +#, python-format +msgid "Empty list" +msgstr "Empty list" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,id:0 +msgid "ID" +msgstr "ID" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory +#: field:stock.inventory.line.empty,inventory_id:0 +msgid "Inventory" +msgstr "Inventory" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "Inventory Details" +msgstr "Inventory Details" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_uid:0 +msgid "Last Updated by" +msgstr "Last Updated by" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_date:0 +msgid "Last Updated on" +msgstr "Last Updated on" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,lot_ids:0 +msgid "Lots" +msgstr "Lots" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_code:0 +msgid "Product Code" +msgstr "Product Code" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,product_ids:0 +msgid "Products" +msgstr "Products" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_qty:0 +msgid "Quantity" +msgstr "Quantity" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 +#, python-format +msgid "Selected Categories" +msgstr "Selected Categories" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 +#, python-format +msgid "Selected Lots" +msgstr "Selected Lots" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 +#, python-format +msgid "Selected Products" +msgstr "Selected Products" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty +msgid "stock.inventory.line.empty" +msgstr "stock.inventory.line.empty" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "{'invisible':[('state','=','draft')]}" +msgstr "{'invisible':[('state','=','draft')]}" + diff --git a/stock_inventory_preparation_filters/i18n/es.po b/stock_inventory_preparation_filters/i18n/es.po new file mode 100644 index 000000000..c63a0c2ab --- /dev/null +++ b/stock_inventory_preparation_filters/i18n/es.po @@ -0,0 +1,118 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_inventory_preparation_filters +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0rc1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-30 08:59+0000\n" +"PO-Revision-Date: 2014-07-30 08:59+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: stock_inventory_preparation_filters +#: view:stock.inventory:0 +#: field:stock.inventory,empty_line_ids:0 +msgid "Capture Lines" +msgstr "Capture Lines" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,categ_ids:0 +msgid "Categories" +msgstr "Categories" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_uid:0 +msgid "Created by" +msgstr "Created by" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_date:0 +msgid "Created on" +msgstr "Created on" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 +#, python-format +msgid "Empty list" +msgstr "Empty list" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,id:0 +msgid "ID" +msgstr "ID" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory +#: field:stock.inventory.line.empty,inventory_id:0 +msgid "Inventory" +msgstr "Inventario" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "Inventory Details" +msgstr "Inventory Details" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_uid:0 +msgid "Last Updated by" +msgstr "Last Updated by" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_date:0 +msgid "Last Updated on" +msgstr "Last Updated on" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,lot_ids:0 +msgid "Lots" +msgstr "Lots" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_code:0 +msgid "Product Code" +msgstr "Product Code" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,product_ids:0 +msgid "Products" +msgstr "Products" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_qty:0 +msgid "Quantity" +msgstr "Quantity" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 +#, python-format +msgid "Selected Categories" +msgstr "Selected Categories" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 +#, python-format +msgid "Selected Lots" +msgstr "Selected Lots" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 +#, python-format +msgid "Selected Products" +msgstr "Selected Products" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty +msgid "stock.inventory.line.empty" +msgstr "stock.inventory.line.empty" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "{'invisible':[('state','=','draft')]}" +msgstr "{'invisible':[('state','=','draft')]}" + diff --git a/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot b/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot new file mode 100644 index 000000000..1fef11c8b --- /dev/null +++ b/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot @@ -0,0 +1,118 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_inventory_preparation_filters +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0rc1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-30 08:58+0000\n" +"PO-Revision-Date: 2014-07-30 08:58+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: stock_inventory_preparation_filters +#: view:stock.inventory:0 +#: field:stock.inventory,empty_line_ids:0 +msgid "Capture Lines" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,categ_ids:0 +msgid "Categories" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_uid:0 +msgid "Created by" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_date:0 +msgid "Created on" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 +#, python-format +msgid "Empty list" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,id:0 +msgid "ID" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory +#: field:stock.inventory.line.empty,inventory_id:0 +msgid "Inventory" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "Inventory Details" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_uid:0 +msgid "Last Updated by" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_date:0 +msgid "Last Updated on" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,lot_ids:0 +msgid "Lots" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_code:0 +msgid "Product Code" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,product_ids:0 +msgid "Products" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_qty:0 +msgid "Quantity" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 +#, python-format +msgid "Selected Categories" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 +#, python-format +msgid "Selected Lots" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 +#, python-format +msgid "Selected Products" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty +msgid "stock.inventory.line.empty" +msgstr "" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "{'invisible':[('state','=','draft')]}" +msgstr "" + From 9d29d5ac6478baa77e536bfb435a1df34f82748e Mon Sep 17 00:00:00 2001 From: oihane Date: Wed, 30 Jul 2014 11:02:21 +0200 Subject: [PATCH 04/18] =?UTF-8?q?[MOD]=20Traducci=C3=B3n=20actualizada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/es.po | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/stock_inventory_preparation_filters/i18n/es.po b/stock_inventory_preparation_filters/i18n/es.po index c63a0c2ab..807b1a1b3 100644 --- a/stock_inventory_preparation_filters/i18n/es.po +++ b/stock_inventory_preparation_filters/i18n/es.po @@ -7,40 +7,40 @@ msgstr "" "Project-Id-Version: Odoo Server 8.0rc1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-30 08:59+0000\n" -"PO-Revision-Date: 2014-07-30 08:59+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2014-07-30 11:01+0100\n" +"Last-Translator: Oihane \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" #. module: stock_inventory_preparation_filters #: view:stock.inventory:0 #: field:stock.inventory,empty_line_ids:0 msgid "Capture Lines" -msgstr "Capture Lines" +msgstr "Líneas capturadas" #. module: stock_inventory_preparation_filters #: field:stock.inventory,categ_ids:0 msgid "Categories" -msgstr "Categories" +msgstr "Categorias" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,create_uid:0 msgid "Created by" -msgstr "Created by" +msgstr "Creado por" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,create_date:0 msgid "Created on" -msgstr "Created on" +msgstr "Creado el" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 #, python-format msgid "Empty list" -msgstr "Empty list" +msgstr "Lista Vacia" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,id:0 @@ -56,55 +56,55 @@ msgstr "Inventario" #. module: stock_inventory_preparation_filters #: view:stock.inventory:0 msgid "Inventory Details" -msgstr "Inventory Details" +msgstr "Detalles del Inventario" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,write_uid:0 msgid "Last Updated by" -msgstr "Last Updated by" +msgstr "Actualizado por" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,write_date:0 msgid "Last Updated on" -msgstr "Last Updated on" +msgstr "Actualizado el" #. module: stock_inventory_preparation_filters #: field:stock.inventory,lot_ids:0 msgid "Lots" -msgstr "Lots" +msgstr "Lotes" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,product_code:0 msgid "Product Code" -msgstr "Product Code" +msgstr "Codigo de Producto" #. module: stock_inventory_preparation_filters #: field:stock.inventory,product_ids:0 msgid "Products" -msgstr "Products" +msgstr "Productos" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,product_qty:0 msgid "Quantity" -msgstr "Quantity" +msgstr "Cantidad" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 #, python-format msgid "Selected Categories" -msgstr "Selected Categories" +msgstr "Categorias Seleccionadas" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 #, python-format msgid "Selected Lots" -msgstr "Selected Lots" +msgstr "Lotes Seleccionados" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 #, python-format msgid "Selected Products" -msgstr "Selected Products" +msgstr "Productos Seleccionados" #. module: stock_inventory_preparation_filters #: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty From 0713250276fc63ba2f1ee43e60446c96ef08b29d Mon Sep 17 00:00:00 2001 From: oihane Date: Wed, 30 Jul 2014 16:50:58 +0200 Subject: [PATCH 05/18] [MOD] Cambios realizados --- .../__openerp__.py | 13 +- .../i18n/en_US.po | 118 ------------------ .../i18n/es.po | 17 +-- .../stock_inventory_preparation_filters.pot | 5 - .../models/stock_inventory.py | 48 +++---- 5 files changed, 42 insertions(+), 159 deletions(-) delete mode 100644 stock_inventory_preparation_filters/i18n/en_US.po diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index 51ba4604f..470d306cd 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -28,10 +28,19 @@ ], "category": "Custom Module", "website": "http://www.odoomrp.com", - "complexity": "normal", "summary": "More filters for inventory adjustments", "description": """ - This module adds more filters to the inventory adjustments + More preparation filters for inventories + ======================================== + + Includes more options for making an inventory out of: + + * Multiple products. + * Products of a category. + * Multiple lots + + It also allows to make an inventory based on scanned products, adding a + line with product code and quantity """, "data": [ "views/stock_inventory_view.xml", diff --git a/stock_inventory_preparation_filters/i18n/en_US.po b/stock_inventory_preparation_filters/i18n/en_US.po deleted file mode 100644 index 73aebd936..000000000 --- a/stock_inventory_preparation_filters/i18n/en_US.po +++ /dev/null @@ -1,118 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * stock_inventory_preparation_filters -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-30 08:58+0000\n" -"PO-Revision-Date: 2014-07-30 08:58+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: stock_inventory_preparation_filters -#: view:stock.inventory:0 -#: field:stock.inventory,empty_line_ids:0 -msgid "Capture Lines" -msgstr "Capture Lines" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory,categ_ids:0 -msgid "Categories" -msgstr "Categories" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,create_uid:0 -msgid "Created by" -msgstr "Created by" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,create_date:0 -msgid "Created on" -msgstr "Created on" - -#. module: stock_inventory_preparation_filters -#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 -#, python-format -msgid "Empty list" -msgstr "Empty list" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,id:0 -msgid "ID" -msgstr "ID" - -#. module: stock_inventory_preparation_filters -#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory -#: field:stock.inventory.line.empty,inventory_id:0 -msgid "Inventory" -msgstr "Inventory" - -#. module: stock_inventory_preparation_filters -#: view:stock.inventory:0 -msgid "Inventory Details" -msgstr "Inventory Details" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,write_uid:0 -msgid "Last Updated by" -msgstr "Last Updated by" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,write_date:0 -msgid "Last Updated on" -msgstr "Last Updated on" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory,lot_ids:0 -msgid "Lots" -msgstr "Lots" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,product_code:0 -msgid "Product Code" -msgstr "Product Code" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory,product_ids:0 -msgid "Products" -msgstr "Products" - -#. module: stock_inventory_preparation_filters -#: field:stock.inventory.line.empty,product_qty:0 -msgid "Quantity" -msgstr "Quantity" - -#. module: stock_inventory_preparation_filters -#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 -#, python-format -msgid "Selected Categories" -msgstr "Selected Categories" - -#. module: stock_inventory_preparation_filters -#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 -#, python-format -msgid "Selected Lots" -msgstr "Selected Lots" - -#. module: stock_inventory_preparation_filters -#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 -#, python-format -msgid "Selected Products" -msgstr "Selected Products" - -#. module: stock_inventory_preparation_filters -#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty -msgid "stock.inventory.line.empty" -msgstr "stock.inventory.line.empty" - -#. module: stock_inventory_preparation_filters -#: view:stock.inventory:0 -msgid "{'invisible':[('state','=','draft')]}" -msgstr "{'invisible':[('state','=','draft')]}" - diff --git a/stock_inventory_preparation_filters/i18n/es.po b/stock_inventory_preparation_filters/i18n/es.po index 807b1a1b3..baa74a0f9 100644 --- a/stock_inventory_preparation_filters/i18n/es.po +++ b/stock_inventory_preparation_filters/i18n/es.po @@ -40,7 +40,7 @@ msgstr "Creado el" #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 #, python-format msgid "Empty list" -msgstr "Lista Vacia" +msgstr "Lista vacía" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,id:0 @@ -56,7 +56,7 @@ msgstr "Inventario" #. module: stock_inventory_preparation_filters #: view:stock.inventory:0 msgid "Inventory Details" -msgstr "Detalles del Inventario" +msgstr "Detalles del inventario" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,write_uid:0 @@ -76,7 +76,7 @@ msgstr "Lotes" #. module: stock_inventory_preparation_filters #: field:stock.inventory.line.empty,product_code:0 msgid "Product Code" -msgstr "Codigo de Producto" +msgstr "Codigo de producto" #. module: stock_inventory_preparation_filters #: field:stock.inventory,product_ids:0 @@ -92,27 +92,22 @@ msgstr "Cantidad" #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 #, python-format msgid "Selected Categories" -msgstr "Categorias Seleccionadas" +msgstr "Categorias seleccionadas" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 #, python-format msgid "Selected Lots" -msgstr "Lotes Seleccionados" +msgstr "Lotes seleccionados" #. module: stock_inventory_preparation_filters #: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 #, python-format msgid "Selected Products" -msgstr "Productos Seleccionados" +msgstr "Productos seleccionados" #. module: stock_inventory_preparation_filters #: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty msgid "stock.inventory.line.empty" msgstr "stock.inventory.line.empty" -#. module: stock_inventory_preparation_filters -#: view:stock.inventory:0 -msgid "{'invisible':[('state','=','draft')]}" -msgstr "{'invisible':[('state','=','draft')]}" - diff --git a/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot b/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot index 1fef11c8b..4a7f7738d 100644 --- a/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot +++ b/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot @@ -111,8 +111,3 @@ msgstr "" msgid "stock.inventory.line.empty" msgstr "" -#. module: stock_inventory_preparation_filters -#: view:stock.inventory:0 -msgid "{'invisible':[('state','=','draft')]}" -msgstr "" - diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index b410d5e5e..0bfd9d2bb 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -123,32 +123,34 @@ class StockInventory(orm.Model): tmp_lines = {} empty_line_obj = self.pool['stock.inventory.line.empty'] - for empty_line in inventory.empty_line_ids: - if empty_line.product_code in tmp_lines: - tmp_lines[empty_line.product_code] += empty_line.product_qty + for line in inventory.empty_line_ids: + if line.product_code in tmp_lines: + tmp_lines[line.product_code] += line.product_qty else: - tmp_lines[empty_line.product_code] = empty_line.product_qty - empty_line_obj.unlink(cr, uid, empty_line.id, context=context) + tmp_lines[line.product_code] = line.product_qty + empty_line_obj.unlink(cr, uid, inventory.empty_line_ids.ids, + context=context) for product_code in tmp_lines.keys(): - product_id = product_obj.search( + product_ids = product_obj.search( cr, uid, [('default_code', '=', product_code)], - context=context)[0] - product = product_obj.browse(cr, uid, product_id, - context=context) - fake_inventory = StockInventoryFake(inventory, product=product) - values = super(StockInventory, self)._get_inventory_lines( - cr, uid, fake_inventory, context=context) - if values: - values[0]['product_qty'] = tmp_lines[product_code] - tmp_lines.pop(product_code) - else: - empty_line_obj.create( - cr, uid, { - 'product_code': product_code, - 'product_qty': tmp_lines[product_code], - 'inventory_id': inventory.id, - }, context=context) - vals += values + context=context) + if product_ids: + product = product_obj.browse(cr, uid, product_ids[0], + context=context) + fake_inventory = StockInventoryFake(inventory, + product=product) + values = super(StockInventory, self)._get_inventory_lines( + cr, uid, fake_inventory, context=context) + if values: + values[0]['product_qty'] = tmp_lines[product_code] + else: + empty_line_obj.create( + cr, uid, { + 'product_code': product_code, + 'product_qty': tmp_lines[product_code], + 'inventory_id': inventory.id, + }, context=context) + vals += values return vals From 4050ff719c4067a56694031229892693610722df Mon Sep 17 00:00:00 2001 From: oihane Date: Fri, 1 Aug 2014 09:21:43 +0200 Subject: [PATCH 06/18] =?UTF-8?q?[MOD]=20Peque=C3=B1as=20correcciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stock_inventory_preparation_filters/__openerp__.py | 5 ++--- .../models/stock_inventory.py | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index 470d306cd..03c80a880 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -34,13 +34,12 @@ ======================================== Includes more options for making an inventory out of: - * Multiple products. * Products of a category. * Multiple lots - It also allows to make an inventory based on scanned products, adding a - line with product code and quantity + It also allows to make an inventory based on scanned products, adding a + line with product code and quantity """, "data": [ "views/stock_inventory_view.xml", diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index 0bfd9d2bb..52ff31016 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -88,14 +88,11 @@ class StockInventory(orm.Model): vals = [] product_tmpl_obj = self.pool['product.template'] product_obj = self.pool['product.product'] - if not inventory.filter in ('categories', 'products', 'lots', 'empty'): vals = super(StockInventory, self)._get_inventory_lines( cr, uid, inventory, context=context) - elif inventory.filter in ('categories', 'products'): product_ids = [] - if inventory.filter == 'categories': product_tmpl_ids = product_tmpl_obj.search( cr, uid, [('categ_id', 'in', inventory.categ_ids.ids)], @@ -103,7 +100,6 @@ class StockInventory(orm.Model): product_ids = product_obj.search( cr, uid, [('product_tmpl_id', 'in', product_tmpl_ids)], context=context) - elif inventory.filter == 'products': product_ids = inventory.product_ids.ids for product in product_obj.browse(cr, uid, product_ids, @@ -111,18 +107,15 @@ class StockInventory(orm.Model): fake_inventory = StockInventoryFake(inventory, product=product) vals += super(StockInventory, self)._get_inventory_lines( cr, uid, fake_inventory, context=context) - elif inventory.filter == 'lots': for lot in inventory.lot_ids: fake_inventory = StockInventoryFake(inventory, lot=lot) vals += super(StockInventory, self)._get_inventory_lines( cr, uid, fake_inventory, context=context) - elif inventory.filter == 'empty': values = [] tmp_lines = {} empty_line_obj = self.pool['stock.inventory.line.empty'] - for line in inventory.empty_line_ids: if line.product_code in tmp_lines: tmp_lines[line.product_code] += line.product_qty @@ -130,7 +123,6 @@ class StockInventory(orm.Model): tmp_lines[line.product_code] = line.product_qty empty_line_obj.unlink(cr, uid, inventory.empty_line_ids.ids, context=context) - for product_code in tmp_lines.keys(): product_ids = product_obj.search( cr, uid, [('default_code', '=', product_code)], @@ -152,5 +144,4 @@ class StockInventory(orm.Model): 'inventory_id': inventory.id, }, context=context) vals += values - return vals From 9ce5d0324c462b01e89e71f8dee6104b3c86edd4 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 6 Aug 2014 02:49:46 +0200 Subject: [PATCH 07/18] [FIX] stock_inventory_preparation_filters: Module description --- .../__openerp__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index 03c80a880..5cf92a4e2 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -30,16 +30,17 @@ "website": "http://www.odoomrp.com", "summary": "More filters for inventory adjustments", "description": """ - More preparation filters for inventories - ======================================== +More preparation filters for inventories +======================================== - Includes more options for making an inventory out of: - * Multiple products. - * Products of a category. - * Multiple lots +Includes more options for making an inventory out of: - It also allows to make an inventory based on scanned products, adding a - line with product code and quantity + * Multiple products. + * Products of a category. + * Multiple lots + +It also allows to make an inventory based on scanned products, adding a line +with product code and quantity """, "data": [ "views/stock_inventory_view.xml", From 3e350b4203d326c4e08a6313bd102ddd1e630286 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 28 Sep 2014 14:07:18 +0200 Subject: [PATCH 08/18] [IMP] Some flake8 --- .../models/stock_inventory.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index 52ff31016..2ede73184 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -88,10 +88,7 @@ class StockInventory(orm.Model): vals = [] product_tmpl_obj = self.pool['product.template'] product_obj = self.pool['product.product'] - if not inventory.filter in ('categories', 'products', 'lots', 'empty'): - vals = super(StockInventory, self)._get_inventory_lines( - cr, uid, inventory, context=context) - elif inventory.filter in ('categories', 'products'): + if inventory.filter in ('categories', 'products'): product_ids = [] if inventory.filter == 'categories': product_tmpl_ids = product_tmpl_obj.search( @@ -144,4 +141,7 @@ class StockInventory(orm.Model): 'inventory_id': inventory.id, }, context=context) vals += values + else: + vals = super(StockInventory, self)._get_inventory_lines( + cr, uid, inventory, context=context) return vals From 60cbd6b79da9a5208d90d85bd2cb9d47effd10a8 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 28 Sep 2014 18:02:50 +0200 Subject: [PATCH 09/18] [IMP] PEP8 --- stock_inventory_preparation_filters/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index 5cf92a4e2..ce2c077c1 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -39,7 +39,7 @@ Includes more options for making an inventory out of: * Products of a category. * Multiple lots -It also allows to make an inventory based on scanned products, adding a line +It also allows to make an inventory based on scanned products, adding a line with product code and quantity """, "data": [ From 51d7e10a43c887350b720cfcdbd8ebc40ceb6afa Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 28 Sep 2014 18:45:28 +0200 Subject: [PATCH 10/18] [FIX] Travis --- stock_inventory_preparation_filters/__openerp__.py | 1 + .../models/stock_inventory.py | 12 +++++------- .../security/ir.model.access.csv | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 stock_inventory_preparation_filters/security/ir.model.access.csv diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index ce2c077c1..deaed665b 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -44,6 +44,7 @@ with product code and quantity """, "data": [ "views/stock_inventory_view.xml", + "security/ir.model.access.csv", ], "installable": True, "auto_install": False, diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index 2ede73184..0812a7220 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -49,15 +49,13 @@ class StockInventory(orm.Model): _inherit = 'stock.inventory' def _get_available_filters(self, cr, uid, context=None): - """ - This function will return the list of filter allowed according to - the options checked in 'Settings\Warehouse'. + """This function will return the list of filter allowed according to + the options checked in 'Settings\Warehouse'. - :rtype: list of tuple + :return: list of tuple """ - res_filter = super(StockInventory, - self)._get_available_filters(cr, uid, - context=context) + res_filter = super(StockInventory, self)._get_available_filters( + cr, uid, context=context) res_filter.append(('categories', _('Selected Categories'))) res_filter.append(('products', _('Selected Products'))) for filter in res_filter: diff --git a/stock_inventory_preparation_filters/security/ir.model.access.csv b/stock_inventory_preparation_filters/security/ir.model.access.csv new file mode 100644 index 000000000..723cb2057 --- /dev/null +++ b/stock_inventory_preparation_filters/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_stock_inventory_line_empty_user,access_stock_inventory_line_empty_user,model_stock_inventory_line_empty,stock.group_stock_user,1,0,0,0 +access_stock_inventory_line_empty_manager,access_stock_inventory_line_empty_manager,model_stock_inventory_line_empty,stock.group_stock_manager,1,1,1,1 From f5cf1b81e750dee60f476d027117a10d25248110 Mon Sep 17 00:00:00 2001 From: oihane Date: Mon, 20 Oct 2014 09:18:43 +0200 Subject: [PATCH 11/18] [FIX] Flake8 failing fixed --- stock_inventory_preparation_filters/models/stock_inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index 0812a7220..82b31963d 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -137,7 +137,7 @@ class StockInventory(orm.Model): 'product_code': product_code, 'product_qty': tmp_lines[product_code], 'inventory_id': inventory.id, - }, context=context) + }, context=context) vals += values else: vals = super(StockInventory, self)._get_inventory_lines( From 720cf3a1e3c2bbb2c67a7dac9307a9779c575ceb Mon Sep 17 00:00:00 2001 From: oihane Date: Thu, 13 Nov 2014 11:13:52 +0100 Subject: [PATCH 12/18] [FIX] Pylint fixing --- stock_inventory_preparation_filters/models/stock_inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index 82b31963d..c616586d0 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -50,7 +50,7 @@ class StockInventory(orm.Model): def _get_available_filters(self, cr, uid, context=None): """This function will return the list of filter allowed according to - the options checked in 'Settings\Warehouse'. + the options checked in 'Settings/Warehouse'. :return: list of tuple """ From 63050c84ef5c984f7dfbaeb1e9e048111f71651a Mon Sep 17 00:00:00 2001 From: oihane Date: Thu, 13 Nov 2014 11:18:43 +0100 Subject: [PATCH 13/18] [FIX] Pylint fixing --- .../models/stock_inventory.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filters/models/stock_inventory.py index c616586d0..2c8c5d0e0 100644 --- a/stock_inventory_preparation_filters/models/stock_inventory.py +++ b/stock_inventory_preparation_filters/models/stock_inventory.py @@ -54,15 +54,15 @@ class StockInventory(orm.Model): :return: list of tuple """ - res_filter = super(StockInventory, self)._get_available_filters( + res_filters = super(StockInventory, self)._get_available_filters( cr, uid, context=context) - res_filter.append(('categories', _('Selected Categories'))) - res_filter.append(('products', _('Selected Products'))) - for filter in res_filter: - if filter[0] == 'lot': - res_filter.append(('lots', _('Selected Lots'))) - res_filter.append(('empty', _('Empty list'))) - return res_filter + res_filters.append(('categories', _('Selected Categories'))) + res_filters.append(('products', _('Selected Products'))) + for res_filter in res_filters: + if res_filter[0] == 'lot': + res_filters.append(('lots', _('Selected Lots'))) + res_filters.append(('empty', _('Empty list'))) + return res_filters _columns = { 'filter': fields.selection(_get_available_filters, 'Selection Filter', From 7516d7e7a8ae885720dd552a6fc69a98f71d43c4 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 25 Mar 2015 20:48:43 +0100 Subject: [PATCH 14/18] [IMP] Expand AUTHORS --- stock_inventory_preparation_filters/__openerp__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filters/__openerp__.py index deaed665b..523e6baae 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filters/__openerp__.py @@ -22,7 +22,9 @@ "depends": [ "stock", ], - "author": "OdooMRP team", + "author": "OdooMRP team," + "AvanzOSC," + "Serv. Tecnol. Avanzados - Pedro M. Baeza", "contributors": [ "Oihane Crucelaegui ", ], From e29a79d0195e1dfc93f0abd878d4f1e9ba4ad645 Mon Sep 17 00:00:00 2001 From: Antoine Morit Date: Sat, 27 Jun 2015 11:15:03 +0200 Subject: [PATCH 15/18] French translation of stock_inventory_preparation_filters --- .../i18n/fr.po | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 stock_inventory_preparation_filters/i18n/fr.po diff --git a/stock_inventory_preparation_filters/i18n/fr.po b/stock_inventory_preparation_filters/i18n/fr.po new file mode 100644 index 000000000..84c7e2eca --- /dev/null +++ b/stock_inventory_preparation_filters/i18n/fr.po @@ -0,0 +1,112 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_inventory_preparation_filters +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0rc1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-30 08:59+0000\n" +"PO-Revision-Date: 2015-06-27 11:09+0100\n" +"Last-Translator: Antoine Morit \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 1.5.4\n" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 field:stock.inventory,empty_line_ids:0 +msgid "Capture Lines" +msgstr "Lignes extraites" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,categ_ids:0 +msgid "Categories" +msgstr "Catégories" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_uid:0 +msgid "Created by" +msgstr "Créé par" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,create_date:0 +msgid "Created on" +msgstr "Créé le" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:66 +#, python-format +msgid "Empty list" +msgstr "Liste vide" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,id:0 +msgid "ID" +msgstr "ID" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory +#: field:stock.inventory.line.empty,inventory_id:0 +msgid "Inventory" +msgstr "Inventaire" + +#. module: stock_inventory_preparation_filters +#: view:stock.inventory:0 +msgid "Inventory Details" +msgstr "Détails de l'inventaire" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_uid:0 +msgid "Last Updated by" +msgstr "Dernière màj par" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,write_date:0 +msgid "Last Updated on" +msgstr "Dernière màj le" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,lot_ids:0 +msgid "Lots" +msgstr "Lots" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_code:0 +msgid "Product Code" +msgstr "Code produit" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory,product_ids:0 +msgid "Products" +msgstr "Produits" + +#. module: stock_inventory_preparation_filters +#: field:stock.inventory.line.empty,product_qty:0 +msgid "Quantity" +msgstr "Quantité" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:61 +#, python-format +msgid "Selected Categories" +msgstr "Catégories sélectionnées" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:65 +#, python-format +msgid "Selected Lots" +msgstr "Lots sélectionnés" + +#. module: stock_inventory_preparation_filters +#: code:addons/stock_inventory_preparation_filters/models/stock_inventory.py:62 +#, python-format +msgid "Selected Products" +msgstr "Produits sélectionnés" + +#. module: stock_inventory_preparation_filters +#: model:ir.model,name:stock_inventory_preparation_filters.model_stock_inventory_line_empty +msgid "stock.inventory.line.empty" +msgstr "stock.inventory.line.empty" From 3e4a254631f68ff216b9125e7ff675835c67db31 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 27 Jun 2015 20:42:48 +0200 Subject: [PATCH 16/18] [IMP] stock_inventory_preparation_filter: Preparation for OCA --- stock_inventory_preparation_filter/README.rst | 35 ++++++++++++++++++ .../__init__.py | 0 .../__openerp__.py | 20 ++-------- .../i18n/es.po | 0 .../i18n/fr.po | 0 .../stock_inventory_preparation_filters.pot | 0 .../models/__init__.py | 0 .../models/stock_inventory.py | 0 .../security/ir.model.access.csv | 0 .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/stock_inventory_view.xml | 0 11 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 stock_inventory_preparation_filter/README.rst rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/__init__.py (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/__openerp__.py (74%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/i18n/es.po (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/i18n/fr.po (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/i18n/stock_inventory_preparation_filters.pot (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/models/__init__.py (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/models/stock_inventory.py (100%) rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/security/ir.model.access.csv (100%) create mode 100644 stock_inventory_preparation_filter/static/description/icon.png rename {stock_inventory_preparation_filters => stock_inventory_preparation_filter}/views/stock_inventory_view.xml (100%) diff --git a/stock_inventory_preparation_filter/README.rst b/stock_inventory_preparation_filter/README.rst new file mode 100644 index 000000000..dfc3503f2 --- /dev/null +++ b/stock_inventory_preparation_filter/README.rst @@ -0,0 +1,35 @@ +More preparation filters for inventories +======================================== + +Includes more options for making an inventory out of: + + * Multiple products. + * Products of a category. + * Multiple lots + +It also allows to make an inventory based on scanned products, adding a line +with product code and quantity + +Credits +======= + +Contributors +------------ + +* Oihane Crucelaegui +* Pedro M. Baeza + +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. diff --git a/stock_inventory_preparation_filters/__init__.py b/stock_inventory_preparation_filter/__init__.py similarity index 100% rename from stock_inventory_preparation_filters/__init__.py rename to stock_inventory_preparation_filter/__init__.py diff --git a/stock_inventory_preparation_filters/__openerp__.py b/stock_inventory_preparation_filter/__openerp__.py similarity index 74% rename from stock_inventory_preparation_filters/__openerp__.py rename to stock_inventory_preparation_filter/__openerp__.py index 523e6baae..430b2e983 100644 --- a/stock_inventory_preparation_filters/__openerp__.py +++ b/stock_inventory_preparation_filter/__openerp__.py @@ -24,30 +24,18 @@ ], "author": "OdooMRP team," "AvanzOSC," - "Serv. Tecnol. Avanzados - Pedro M. Baeza", + "Serv. Tecnol. Avanzados - Pedro M. Baeza," + "Odoo Community Association (OCA)", "contributors": [ "Oihane Crucelaegui ", + "Pedro M. Baeza ", ], - "category": "Custom Module", + "category": "Inventory, Logistic, Storage", "website": "http://www.odoomrp.com", "summary": "More filters for inventory adjustments", - "description": """ -More preparation filters for inventories -======================================== - -Includes more options for making an inventory out of: - - * Multiple products. - * Products of a category. - * Multiple lots - -It also allows to make an inventory based on scanned products, adding a line -with product code and quantity - """, "data": [ "views/stock_inventory_view.xml", "security/ir.model.access.csv", ], "installable": True, - "auto_install": False, } diff --git a/stock_inventory_preparation_filters/i18n/es.po b/stock_inventory_preparation_filter/i18n/es.po similarity index 100% rename from stock_inventory_preparation_filters/i18n/es.po rename to stock_inventory_preparation_filter/i18n/es.po diff --git a/stock_inventory_preparation_filters/i18n/fr.po b/stock_inventory_preparation_filter/i18n/fr.po similarity index 100% rename from stock_inventory_preparation_filters/i18n/fr.po rename to stock_inventory_preparation_filter/i18n/fr.po diff --git a/stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot b/stock_inventory_preparation_filter/i18n/stock_inventory_preparation_filters.pot similarity index 100% rename from stock_inventory_preparation_filters/i18n/stock_inventory_preparation_filters.pot rename to stock_inventory_preparation_filter/i18n/stock_inventory_preparation_filters.pot diff --git a/stock_inventory_preparation_filters/models/__init__.py b/stock_inventory_preparation_filter/models/__init__.py similarity index 100% rename from stock_inventory_preparation_filters/models/__init__.py rename to stock_inventory_preparation_filter/models/__init__.py diff --git a/stock_inventory_preparation_filters/models/stock_inventory.py b/stock_inventory_preparation_filter/models/stock_inventory.py similarity index 100% rename from stock_inventory_preparation_filters/models/stock_inventory.py rename to stock_inventory_preparation_filter/models/stock_inventory.py diff --git a/stock_inventory_preparation_filters/security/ir.model.access.csv b/stock_inventory_preparation_filter/security/ir.model.access.csv similarity index 100% rename from stock_inventory_preparation_filters/security/ir.model.access.csv rename to stock_inventory_preparation_filter/security/ir.model.access.csv diff --git a/stock_inventory_preparation_filter/static/description/icon.png b/stock_inventory_preparation_filter/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 diff --git a/stock_inventory_preparation_filters/views/stock_inventory_view.xml b/stock_inventory_preparation_filter/views/stock_inventory_view.xml similarity index 100% rename from stock_inventory_preparation_filters/views/stock_inventory_view.xml rename to stock_inventory_preparation_filter/views/stock_inventory_view.xml From 515cfe4952eda1d8ff095414a0c13cd2c4972aa1 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 27 Jun 2015 20:51:24 +0200 Subject: [PATCH 17/18] [IMP] stock_inventory_preparation_filter: Pass to new API --- .../models/stock_inventory.py | 120 ++++++++---------- .../views/stock_inventory_view.xml | 15 ++- 2 files changed, 63 insertions(+), 72 deletions(-) diff --git a/stock_inventory_preparation_filter/models/stock_inventory.py b/stock_inventory_preparation_filter/models/stock_inventory.py index 2c8c5d0e0..00e0d147b 100644 --- a/stock_inventory_preparation_filter/models/stock_inventory.py +++ b/stock_inventory_preparation_filter/models/stock_inventory.py @@ -16,23 +16,19 @@ # ############################################################################## -from openerp.osv import orm, fields -from openerp.tools.translate import _ +from openerp import models, fields, api, _ -class StockInventoryEmptyLines(orm.Model): +class StockInventoryEmptyLines(models.Model): _name = 'stock.inventory.line.empty' - _columns = { - 'product_code': fields.char('Product Code', size=64, required=True), - 'product_qty': fields.float('Quantity', required=True), - 'inventory_id': fields.many2one('stock.inventory', 'Inventory', - required=True, ondelete="cascade"), - } - - _defaults = { - 'product_qty': 1.0, - } + product_code = fields.Char( + string='Product Code', size=64, required=True) + product_qty = fields.Float( + string='Quantity', required=True, default=1.0) + inventory_id = fields.Many2one( + comodel_name='stock.inventory', string='Inventory', + required=True, ondelete="cascade") class StockInventoryFake(object): @@ -45,17 +41,17 @@ class StockInventoryFake(object): self.package_id = inventory.package_id -class StockInventory(orm.Model): +class StockInventory(models.Model): _inherit = 'stock.inventory' - def _get_available_filters(self, cr, uid, context=None): - """This function will return the list of filter allowed according to + @api.model + def _get_available_filters(self): + """This function will return the list of filters allowed according to the options checked in 'Settings/Warehouse'. :return: list of tuple """ - res_filters = super(StockInventory, self)._get_available_filters( - cr, uid, context=context) + res_filters = super(StockInventory, self)._get_available_filters() res_filters.append(('categories', _('Selected Categories'))) res_filters.append(('products', _('Selected Products'))) for res_filter in res_filters: @@ -64,82 +60,74 @@ class StockInventory(orm.Model): res_filters.append(('empty', _('Empty list'))) return res_filters - _columns = { - 'filter': fields.selection(_get_available_filters, 'Selection Filter', - required=True), - 'categ_ids': fields.many2many('product.category', - 'rel_inventories_categories', - 'inventory_id', 'category_id', - 'Categories'), - 'product_ids': fields.many2many('product.product', - 'rel_inventories_products', - 'inventory_id', 'product_id', - 'Products'), - 'lot_ids': fields.many2many('stock.production.lot', - 'rel_inventories_lots', 'inventory_id', - 'lot_id', 'Lots'), - 'empty_line_ids': fields.one2many('stock.inventory.line.empty', - 'inventory_id', 'Capture Lines'), - } + filter = fields.Selection( + selection=_get_available_filters, string='Selection Filter', + required=True) + categ_ids = fields.Many2many( + comodel_name='product.category', relation='rel_inventories_categories', + column1='inventory_id', column2='category_id', string='Categories') + product_ids = fields.Many2many( + comodel_name='product.product', relation='rel_inventories_products', + column1='inventory_id', column2='product_id', string='Products') + lot_ids = fields.Many2many( + comodel_name='stock.production.lot', relation='rel_inventories_lots', + column1='inventory_id', column2='lot_id', string='Lots') + empty_line_ids = fields.One2many( + comodel_name='stock.inventory.line.empty', inverse_name='inventory_id', + string='Capture Lines') - def _get_inventory_lines(self, cr, uid, inventory, context=None): + @api.model + def _get_inventory_lines(self, inventory): vals = [] - product_tmpl_obj = self.pool['product.template'] - product_obj = self.pool['product.product'] + product_tmpl_obj = self.env['product.template'] + product_obj = self.env['product.product'] if inventory.filter in ('categories', 'products'): - product_ids = [] + products = product_obj if inventory.filter == 'categories': - product_tmpl_ids = product_tmpl_obj.search( - cr, uid, [('categ_id', 'in', inventory.categ_ids.ids)], - context=context) - product_ids = product_obj.search( - cr, uid, [('product_tmpl_id', 'in', product_tmpl_ids)], - context=context) + product_tmpls = product_tmpl_obj.search( + [('categ_id', 'in', inventory.categ_ids.ids)]) + products = product_obj.search( + [('product_tmpl_id', 'in', product_tmpls.ids)]) elif inventory.filter == 'products': - product_ids = inventory.product_ids.ids - for product in product_obj.browse(cr, uid, product_ids, - context=context): + products = inventory.product_ids + for product in products: fake_inventory = StockInventoryFake(inventory, product=product) vals += super(StockInventory, self)._get_inventory_lines( - cr, uid, fake_inventory, context=context) + fake_inventory) elif inventory.filter == 'lots': for lot in inventory.lot_ids: fake_inventory = StockInventoryFake(inventory, lot=lot) vals += super(StockInventory, self)._get_inventory_lines( - cr, uid, fake_inventory, context=context) + fake_inventory) elif inventory.filter == 'empty': - values = [] tmp_lines = {} - empty_line_obj = self.pool['stock.inventory.line.empty'] + empty_line_obj = self.env['stock.inventory.line.empty'] for line in inventory.empty_line_ids: if line.product_code in tmp_lines: tmp_lines[line.product_code] += line.product_qty else: tmp_lines[line.product_code] = line.product_qty - empty_line_obj.unlink(cr, uid, inventory.empty_line_ids.ids, - context=context) + inventory.empty_line_ids.unlink() for product_code in tmp_lines.keys(): - product_ids = product_obj.search( - cr, uid, [('default_code', '=', product_code)], - context=context) - if product_ids: - product = product_obj.browse(cr, uid, product_ids[0], - context=context) - fake_inventory = StockInventoryFake(inventory, - product=product) + products = product_obj.search( + [('default_code', '=', product_code)]) + if products: + product = products[0] + fake_inventory = StockInventoryFake( + inventory, product=product) values = super(StockInventory, self)._get_inventory_lines( - cr, uid, fake_inventory, context=context) + fake_inventory) if values: values[0]['product_qty'] = tmp_lines[product_code] else: empty_line_obj.create( - cr, uid, { + { 'product_code': product_code, 'product_qty': tmp_lines[product_code], 'inventory_id': inventory.id, - }, context=context) + }) vals += values else: vals = super(StockInventory, self)._get_inventory_lines( - cr, uid, inventory, context=context) + inventory) return vals diff --git a/stock_inventory_preparation_filter/views/stock_inventory_view.xml b/stock_inventory_preparation_filter/views/stock_inventory_view.xml index fade33342..cb9109413 100644 --- a/stock_inventory_preparation_filter/views/stock_inventory_view.xml +++ b/stock_inventory_preparation_filter/views/stock_inventory_view.xml @@ -15,12 +15,15 @@ - - - + + + From 9f02782a74911e256d8c44ecbae7f5f10b67850e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 27 Jun 2015 22:04:31 +0200 Subject: [PATCH 18/18] [IMP] stock_inventory_preparation_filter: Added tests --- .../tests/__init__.py | 17 ++ ...test_stock_inventory_preparation_filter.py | 147 ++++++++++++++++++ 2 files changed, 164 insertions(+) create mode 100644 stock_inventory_preparation_filter/tests/__init__.py create mode 100644 stock_inventory_preparation_filter/tests/test_stock_inventory_preparation_filter.py diff --git a/stock_inventory_preparation_filter/tests/__init__.py b/stock_inventory_preparation_filter/tests/__init__.py new file mode 100644 index 000000000..79299bb59 --- /dev/null +++ b/stock_inventory_preparation_filter/tests/__init__.py @@ -0,0 +1,17 @@ +############################################################################## +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from . import test_stock_inventory_preparation_filter diff --git a/stock_inventory_preparation_filter/tests/test_stock_inventory_preparation_filter.py b/stock_inventory_preparation_filter/tests/test_stock_inventory_preparation_filter.py new file mode 100644 index 000000000..5ef493c3f --- /dev/null +++ b/stock_inventory_preparation_filter/tests/test_stock_inventory_preparation_filter.py @@ -0,0 +1,147 @@ +############################################################################## +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +import openerp.tests.common as common + + +class TestStockInventoryPreparationFilterCategories(common.TransactionCase): + + def setUp(self): + super(TestStockInventoryPreparationFilterCategories, self).setUp() + self.inventory_model = self.env['stock.inventory'] + # Create a category + self.category = self.env['product.category'].create( + { + 'name': 'Category for inventory', + 'type': 'normal', + }) + # Create some products in the category + self.product1 = self.env['product.product'].create( + { + 'name': 'Product for inventory 1', + 'type': 'product', + 'categ_id': self.category.id, + 'default_code': 'PROD1', + } + ) + self.product2 = self.env['product.product'].create( + { + 'name': 'Product for inventory 2', + 'type': 'product', + 'categ_id': self.category.id, + 'default_code': 'PROD2', + } + ) + # And have some stock in a location + self.location = self.env['stock.location'].create( + { + 'name': 'Inventory tests', + 'usage': 'internal', + } + ) + inventory = self.inventory_model.create( + { + 'name': 'Product1 inventory', + 'filter': 'product', + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 2.0, + 'location_id': self.location.id, + }), + (0, 0, { + 'product_id': self.product2.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 4.0, + 'location_id': self.location.id, + }), + ], + }) + inventory.action_done() + + def test_inventory_category_filter(self): + inventory = self.inventory_model.create( + { + 'name': 'Category inventory', + 'filter': 'categories', + 'location_id': self.location.id, + 'categ_ids': [(6, 0, [self.category.id])], + } + ) + inventory.prepare_inventory() + self.assertEqual(len(inventory.line_ids), 2) + line1 = inventory.line_ids[0] + self.assertEqual(line1.product_id, self.product1) + self.assertEqual(line1.theoretical_qty, 2.0) + self.assertEqual(line1.location_id, self.location) + line2 = inventory.line_ids[1] + self.assertEqual(line2.product_id, self.product2) + self.assertEqual(line2.theoretical_qty, 4.0) + self.assertEqual(line2.location_id, self.location) + + def test_inventory_products_filter(self): + inventory = self.inventory_model.create( + { + 'name': 'Products inventory', + 'filter': 'products', + 'location_id': self.location.id, + 'product_ids': [(6, 0, [self.product1.id, self.product2.id])], + } + ) + inventory.prepare_inventory() + self.assertEqual(len(inventory.line_ids), 2) + line1 = inventory.line_ids[0] + self.assertEqual(line1.product_id, self.product1) + self.assertEqual(line1.theoretical_qty, 2.0) + self.assertEqual(line1.location_id, self.location) + line2 = inventory.line_ids[1] + self.assertEqual(line2.product_id, self.product2) + self.assertEqual(line2.theoretical_qty, 4.0) + self.assertEqual(line2.location_id, self.location) + + def test_inventory_empty_filter(self): + inventory = self.inventory_model.create( + { + 'name': 'Products inventory', + 'filter': 'empty', + 'location_id': self.location.id, + 'empty_line_ids': [ + (0, 0, { + 'product_code': 'PROD1', + 'product_qty': 3.0, + }), + (0, 0, { + 'product_code': 'PROD2', + 'product_qty': 7.0, + }), + ], + } + ) + inventory.prepare_inventory() + self.assertEqual(len(inventory.line_ids), 2) + line1 = inventory.line_ids[0] + self.assertEqual(line1.product_id, self.product1) + self.assertEqual(line1.theoretical_qty, 2.0) + self.assertEqual(line1.product_qty, 3.0) + self.assertEqual(line1.location_id, self.location) + line2 = inventory.line_ids[1] + self.assertEqual(line2.product_id, self.product2) + self.assertEqual(line2.theoretical_qty, 4.0) + self.assertEqual(line2.product_qty, 7.0) + self.assertEqual(line2.location_id, self.location)