Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-procurement_order_merge-dev-julio into lp:addons-vauxoo/6.1

[Julio Serna-http://www.vauxoo.com]

crea wizard para agrupar procurements

[lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-procurement_order_merge-dev-julio]

515. By Julio Serna-http://www.vauxoo.com on 2012-10-12

[REF][procurement_order_merge] changed name files that have word group for merge

516. By Julio Serna-http://www.vauxoo.com on 2012-10-12

[REF][procurement_order_merge] modified fucntions wtih name group for merge

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

cambie group por merge

review: Needs Resubmitting

=== added directory 'procurement_order_merge'
=== added file 'procurement_order_merge/__init__.py'
--- procurement_order_merge/__init__.py	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/__init__.py	2012-10-12 18:09:18 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import procurement
+import wizard

=== added file 'procurement_order_merge/__openerp__.py'
--- procurement_order_merge/__openerp__.py	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/__openerp__.py	2012-10-12 18:09:18 +0000
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name": "Procurement Order Merge",
+    "version": "1.1",
+    "author" : "Vauxoo",
+    "category": "Generic Modules/Procurement",
+    "website" : "http://www.vauxoo.com/",
+    "description": """ Merge with wizard the procurement
+    """,
+    'depends': ['procurement'],
+    'init_xml': [],
+    'update_xml': [
+        'wizard/procurement_order_merge_view.xml',
+        ],
+    'demo_xml': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'procurement_order_merge/i18n'
=== added file 'procurement_order_merge/i18n/es_MX.po'
--- procurement_order_merge/i18n/es_MX.po	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/i18n/es_MX.po	2012-10-12 18:09:18 +0000
@@ -0,0 +1,98 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* procurement_order_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-12 17:58+0000\n"
+"PO-Revision-Date: 2012-10-12 13:02-0600\n"
+"Last-Translator: julio <[e-mail]>\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"
+
+#. module: procurement_order_merge
+#: view:procurement.order.merge:0
+msgid "Are you sure you want to merge these procurements ?"
+msgstr "Estas seguro de  querer mezclar estos abastecimientos ?"
+
+#. module: procurement_order_merge
+#: view:procurement.order.merge:0
+msgid "Merge Procurement"
+msgstr "Mezclar abastecimientos"
+
+#. module: procurement_order_merge
+#: model:ir.model,name:procurement_order_merge.model_procurement_order_merge
+msgid "procurement.order.merge"
+msgstr "procurement.order.merge"
+
+#. module: procurement_order_merge
+#: model:ir.actions.act_window,name:procurement_order_merge.create_procurement_merge_action
+#: model:ir.actions.act_window,name:procurement_order_merge.procurement_merge_wizard
+#: view:procurement.order.merge:0
+msgid "Procurement Merge"
+msgstr "Mezclar abastecimientos"
+
+#. module: procurement_order_merge
+#: model:ir.model,name:procurement_order_merge.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement_order_merge
+#: code:addons/procurement_order_merge/procurement.py:60
+#, python-format
+msgid "Procurements can not be merged"
+msgstr "Abastecimientos no pueden ser mezclados"
+
+#. module: procurement_order_merge
+#: code:addons/procurement_order_merge/wizard/procurement_order_merge.py:38
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr "Por Favor seleccione varios abastecimientos en la lista para mezclarlos."
+
+#. module: procurement_order_merge
+#: code:addons/procurement_order_merge/procurement.py:57
+#: code:addons/procurement_order_merge/procurement.py:60
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: procurement_order_merge
+#: view:procurement.order.merge:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: procurement_order_merge
+#: code:addons/procurement_order_merge/wizard/procurement_order_merge.py:37
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: procurement_order_merge
+#: code:addons/procurement_order_merge/procurement.py:57
+#, python-format
+msgid "Procurements must be in state draft"
+msgstr "Los abastecimientos deben de estar en estado borrador"
+
+#. module: procurement_order_merge
+#: view:procurement.order.merge:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Procurments Orders are in draft \n"
+" * Procurments Orders have same location \n"
+" * Procurments Orders have same procurement method \n"
+" * Procurments Orders have same product "
+msgstr ""
+"Por favor note que: \n"
+"Abastecimientos solo se mezclaran si: \n"
+" *Orden de abastecimiento esta en estado borrador \n"
+" * Orden de abastecimiento tienen la misma ubicacion \n"
+" * Orden de abastecimiento tienen el misma metodo de abastecimiento \n"
+" * Orden de abastecimiento tienen el mismo producto"
+

=== added file 'procurement_order_merge/procurement.py'
--- procurement_order_merge/procurement.py	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/procurement.py	2012-10-12 18:09:18 +0000
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv,fields
+from tools.translate import _
+import netsvc
+
+class procurement_order(osv.osv):
+    _inherit='procurement.order'
+    
+    def do_merge(self, cr, uid, ids, context={}):
+        procurement_order = self.pool.get('procurement.order')
+        
+        res_product = {}
+        res_location = {}
+        res_method = {}
+        res_name = []
+        res_origin = []
+        ok = False
+        
+        for procurement in procurement_order.browse(cr, uid, ids):
+            
+            if procurement.state <> 'draft':
+                ok = True
+                
+            res_product.setdefault(procurement.product_id.id, 0)
+            res_product[procurement.product_id.id] += self.pool.get('product.uom')._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, to_uom_id=procurement.product_id.uom_id.id)
+            res_location.setdefault(procurement.location_id.id, 1)
+            res_method.setdefault(procurement.procure_method, 1)
+            res_name.append(procurement.name)
+            res_origin.append(procurement.origin)
+            product_uom = procurement.product_id.uom_id.id
+            
+        if ok == True:
+            raise osv.except_osv(_('Error'), _('Procurements must be in state draft') )
+
+        if len(res_product) > 1 or len(res_location) > 1 or len(res_method) > 1:
+            raise osv.except_osv(_('Error'), _('Procurements can not be merged') )
+            
+        else:
+            procure_name = ','.join( map(str, res_name) )
+            procure_origin = ','.join( map(str, res_origin) )
+            procurement_order.create(cr, uid, {
+                'name' : procure_name,
+                'origin' : procure_origin,
+                'product_id' : res_product.items()[0][0],
+                'location_id' : res_location.keys()[0],
+                'product_qty' : res_product.items()[0][1],
+                'product_uom' : product_uom,
+                'procure_method' : res_method.keys()[0]
+            })
+        for proc in ids:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'procurement.order', proc, 'button_cancel', cr)
+    
+    
+procurement_order()
+

=== added directory 'procurement_order_merge/wizard'
=== added file 'procurement_order_merge/wizard/__init__.py'
--- procurement_order_merge/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/wizard/__init__.py	2012-10-12 18:09:18 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import procurement_order_merge

=== added file 'procurement_order_merge/wizard/procurement_order_merge.py'
--- procurement_order_merge/wizard/procurement_order_merge.py	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/wizard/procurement_order_merge.py	2012-10-12 18:09:18 +0000
@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv, fields
+from tools.translate import _
+
+class procurement_order_merge(osv.osv_memory):
+    _name='procurement.order.merge'
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context={}
+        res = super(procurement_order_merge, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context.get('active_model','') == 'procurement.order' and len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select multiple order to merge in the list view.'))
+        return res
+    
+    def procurement_merge(self, cr, uid, ids, context=None):
+        procurement_order = self.pool.get('procurement.order')
+        if context is None:
+            context = {}
+        procurement_ids = context.get('active_ids', [])
+        procurement_order.do_merge(cr, uid, procurement_ids, context=context)
+        return {}
+    
+procurement_order_merge()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

=== added file 'procurement_order_merge/wizard/procurement_order_merge_view.xml'
--- procurement_order_merge/wizard/procurement_order_merge_view.xml	1970-01-01 00:00:00 +0000
+++ procurement_order_merge/wizard/procurement_order_merge_view.xml	2012-10-12 18:09:18 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="procurement_order_merge_form" model="ir.ui.view">
+            <field name="name">procurement.order.merge.form</field>
+            <field name="model">procurement.order.merge</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Procurement Merge">
+                    <separator string="Are you sure you want to merge these procurements ?" colspan="4"/>
+                       <newline/>
+                    <label string="
+Please note that: &#10; &#10;
+Orders will only be merged if: &#10;
+* Procurments Orders are in draft &#10;
+* Procurments Orders have same location &#10;
+* Procurments Orders have same procurement method &#10;
+* Procurments Orders have same product
+" colspan="4"/>                
+                    <newline/>                    
+                    <separator string="" colspan="4" />              
+			<button string="Cancel" icon="gtk-cancel" type="object" special="cancel"/>
+			<button string="Merge Procurement" icon="gtk-ok" name="procurement_merge" type="object"/>
+
+                </form>
+            </field>
+        </record>
+
+	<act_window id="procurement_merge_wizard"
+		name="Procurement Merge"
+		src_model="procurement.order"
+		res_model="procurement.order.merge"
+		view_mode="form"
+		target="new"
+		key2="client_action_multi"
+		/>
+
+
+       <record id="create_procurement_merge_action" model="ir.actions.act_window">
+            <field name="name">Procurement Merge</field>
+            <field name="res_model">procurement.order.merge</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
+