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

[Moisés López - http://www.vauxoo.com]

Purchase Double Validation Multi-Currency

[lp:~vauxoo/openobject-addons/purchase_double_validation_multicurrency-dev-julio]

6879. By Julio Serna-http://www.vauxoo.com on 2012-07-17

[IMP][pruchase_double_validation] add default amount_type

6880. By Julio Serna-http://www.vauxoo.com on 2012-07-17

[FIX][purchase_double_validation] resolved fix when there is no validation of minimum amount

6881. By Julio Serna-http://www.vauxoo.com on 2012-07-31

[FIX][purchase_double_validation] changed function search for sql query

[Nhomar - Vauxoo (nhomar)]

Moy.

Can we do this for trunk please, i think it is a good improvement.
I will reject this MP, branches must be declared as

runbot.openerp.com/register.html

review: Disapprove

Unmerged revisions

6881. By Julio Serna-http://www.vauxoo.com on 2012-07-31

[FIX][purchase_double_validation] changed function search for sql query

6880. By Julio Serna-http://www.vauxoo.com on 2012-07-17

[FIX][purchase_double_validation] resolved fix when there is no validation of minimum amount

6879. By Julio Serna-http://www.vauxoo.com on 2012-07-17

[IMP][pruchase_double_validation] add default amount_type

6878. By Moisés López - http://www.vauxoo.com on 2012-07-17

[REF][purchase_double_validation] Change function to lambda function

6877. By Moisés López - http://www.vauxoo.com on 2012-07-17

[MERGE] [purchase_double_validation] Add currency_id field

6876. By Julio Serna-http://www.vauxoo.com on 2012-07-04

[INIT]

=== modified file 'purchase_double_validation/__init__.py'
--- purchase_double_validation/__init__.py	2010-12-22 11:05:42 +0000
+++ purchase_double_validation/__init__.py	2012-07-31 19:32:23 +0000
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import purchase_double_validation_installer
+import purchase
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'purchase_double_validation/purchase.py'
--- purchase_double_validation/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_double_validation/purchase.py	2012-07-31 19:32:23 +0000
@@ -0,0 +1,71 @@
+# -*- 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
+
+
+class purchase_order(osv.osv):
+    _inherit='purchase.order'
+    def purchase_amount_validate_ok(self, cr, uid, ids, context={}):
+        purchase_installer=self.pool.get('purchase.double.validation.installer')
+        for order in self.browse(cr,uid,ids):
+            cr.execute(""" select max(id) as purchase_validation_id from purchase_double_validation_installer """)
+            dat = cr.dictfetchall()
+            purchase_validation_id=dat and dat[0]['purchase_validation_id'] or False
+            if purchase_validation_id:
+                purchase_validation=purchase_installer.browse(cr,uid,purchase_validation_id)
+                amount_total = self.pool.get('res.currency').compute(cr, uid, order.pricelist_id.currency_id.id, order.company_id.currency_id.id, order[purchase_validation.amount_type],
+                        round=True, currency_rate_type_from=False, currency_rate_type_to=False, context=None)
+                if amount_total >= purchase_validation.limit_amount:
+                    return False
+            return -1
+        return True
+        
+    def purchase_amount_validate_signal(self, cr, uid, ids, context={}):
+        validate_ok = self.purchase_amount_validate_ok(cr, uid, ids, context={})
+        if validate_ok==-1:
+            return True
+        return not validate_ok
+    
+    def purchase_amount_validate(self, cr, uid, ids, context={}):
+        validate_ok = self.purchase_amount_validate_ok(cr, uid, ids, context={})
+        if validate_ok == -1:
+            return True
+        return validate_ok
+purchase_order()
+
+
+
+
+
+
+
+
+
+
+
+
+

=== modified file 'purchase_double_validation/purchase_double_validation_installer.py'
--- purchase_double_validation/purchase_double_validation_installer.py	2010-12-31 06:26:40 +0000
+++ purchase_double_validation/purchase_double_validation_installer.py	2012-07-31 19:32:23 +0000
@@ -24,28 +24,22 @@
 class purchase_double_validation_installer(osv.osv_memory):
     _name = 'purchase.double.validation.installer'
     _inherit = 'res.config'
+    _order = 'id desc'
+    
     _columns = {
         'limit_amount': fields.integer('Maximum Purchase Amount', required=True, help="Maximum amount after which validation of purchase is required."),
+        'amount_type' : fields.selection([('amount_untaxed','Amount Untaxed'), ('amount_total', 'Amount Total')], 'Amount Type', required=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True)
     }
 
     _defaults = {
         'limit_amount': 5000,
+        'amount_type' : 'amount_untaxed',
+        'currency_id': lambda self, cr, uid, context=None: self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
     }
 
     def execute(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, context=context)
-        if not data:
-            return {}
-        amt = data[0]['limit_amount']
-        data_pool = self.pool.get('ir.model.data')
-        transition_obj = self.pool.get('workflow.transition')
-        waiting = data_pool._get_id(cr, uid, 'purchase', 'trans_confirmed_router')
-        waiting_id = data_pool.browse(cr, uid, waiting, context=context).res_id
-        confirm = data_pool._get_id(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
-        confirm_id = data_pool.browse(cr, uid, confirm, context=context).res_id
-        transition_obj.write(cr, uid, waiting_id, {'condition': 'amount_total>=%s' % (amt)})
-        transition_obj.write(cr, uid, confirm_id, {'condition': 'amount_total<%s' % (amt)})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 purchase_double_validation_installer()
 

=== modified file 'purchase_double_validation/purchase_double_validation_installer.xml'
--- purchase_double_validation/purchase_double_validation_installer.xml	2011-10-16 01:28:00 +0000
+++ purchase_double_validation/purchase_double_validation_installer.xml	2012-07-31 19:32:23 +0000
@@ -24,6 +24,8 @@
                   </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="limit_amount"/>
+                  <field name="amount_type"/>
+                  <field name="currency_id"/>
                   <newline/>
                 </group>
               </data>

=== modified file 'purchase_double_validation/purchase_double_validation_workflow.xml'
--- purchase_double_validation/purchase_double_validation_workflow.xml	2010-12-30 17:23:02 +0000
+++ purchase_double_validation/purchase_double_validation_workflow.xml	2012-07-31 19:32:23 +0000
@@ -3,7 +3,7 @@
     <data>
 
          <record id="purchase.trans_confirmed_router" model="workflow.transition">
-            <field name="condition">amount_untaxed &gt;= 1000</field>
+            <field name="condition">purchase_amount_validate_signal()</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
@@ -11,7 +11,7 @@
         <record id="trans_waiting_confirmed" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
             <field name="act_to" ref="purchase.act_router"/>
-            <field name="condition">amount_untaxed &lt; 1000</field>
+            <field name="condition">purchase_amount_validate()</field>
         </record>
 
     </data>