diff --git a/stock_quant_merge/README.rst b/stock_quant_merge/README.rst index c9dd3c29a..641da82e9 100644 --- a/stock_quant_merge/README.rst +++ b/stock_quant_merge/README.rst @@ -1,8 +1,39 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=========== Quant merge =========== -This module allows to merge diferent quants if they meet some requirements. +Odoo splits quants each time a reservation is done: this module makes Odoo +merge them back if they still meet the following requirements: +* same product +* same serial number/lot +* same location +* same package + +Usage +===== + +The merge is done automatically when a reservation is undone. No user intervention is needed. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/153/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed `feedback +`_. Credits ======= @@ -11,4 +42,19 @@ Contributors ------------ * Oihane Crucelaegui * Pedro M. Baeza -* Ana Juaristi \ No newline at end of file +* Ana Juaristi + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://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 https://odoo-community.org. diff --git a/stock_quant_merge/__init__.py b/stock_quant_merge/__init__.py index 054c8853d..d50e8c06d 100644 --- a/stock_quant_merge/__init__.py +++ b/stock_quant_merge/__init__.py @@ -1,6 +1,7 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# © 2015 OdooMRP team +# © 2015 AvanzOSC +# © 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/stock_quant_merge/__openerp__.py b/stock_quant_merge/__openerp__.py index b05fb203e..cdf27c184 100644 --- a/stock_quant_merge/__openerp__.py +++ b/stock_quant_merge/__openerp__.py @@ -1,38 +1,21 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# 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/. -# -############################################################################## - +# -*- coding: utf-8 -*- +# © 2015 OdooMRP team +# © 2015 AvanzOSC +# © 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Stock - Quant merge", - "version": "1.0", + "version": "8.0.1.0.0", "depends": [ "stock", ], "author": "OdooMRP team," "AvanzOSC," - "Serv. Tecnol. Avanzados - Pedro M. Baeza", + "Serv. Tecnol. Avanzados - Pedro M. Baeza," + "Odoo Community Association (OCA)", "website": "http://www.odoomrp.com", - "contributors": [ - "Oihane Crucelaegui ", - "Pedro M. Baeza ", - "Ana Juaristi " - ], "category": "Warehouse Management", - "summary": "", - "data": [], "installable": True, + "license": "AGPL-3", + "images": [], } diff --git a/stock_quant_merge/models/__init__.py b/stock_quant_merge/models/__init__.py index 055886a14..5e5e22c5e 100644 --- a/stock_quant_merge/models/__init__.py +++ b/stock_quant_merge/models/__init__.py @@ -1,6 +1,7 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# © 2015 OdooMRP team +# © 2015 AvanzOSC +# © 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import stock diff --git a/stock_quant_merge/models/stock.py b/stock_quant_merge/models/stock.py index c2356fdae..5fed1152c 100644 --- a/stock_quant_merge/models/stock.py +++ b/stock_quant_merge/models/stock.py @@ -1,7 +1,8 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# © 2015 OdooMRP team +# © 2015 AvanzOSC +# © 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, api