Merge lp:~vauxoo/openerp-venezuela-localization/miguel-Bug918565 into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

fix 918565

=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py	2012-01-14 22:45:30 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2012-01-19 17:54:27 +0000
@@ -149,6 +149,22 @@
             'wh_iva_rate': wh_iva_rate,
         })
 
+    def action_wh_iva_supervisor(self, cr, uid, ids, *args):
+        user_obj= self.pool.get('res.users')
+        user_brw= user_obj.browse(cr,uid,uid)
+        print 
+        for inv in self.browse(cr, uid, ids):
+            if inv.amount_total==0.0 and inv.currency_id.id != user_brw.company_id.currency_id.id:
+                raise osv.except_osv('Invalid Action !', _('The currency of the invoice does not match with the currency of the company. Check this please'))
+
+            elif inv.amount_total==0.0 or inv.currency_id.id != user_brw.company_id.currency_id.id:
+                if inv.amount_total==0.0:
+                    raise osv.except_osv('Invalid Action !', _('This invoice has total amount %s %s check the products price')%(inv.amount_total,inv.currency_id.symbol))
+                elif inv.currency_id.id != user_brw.company_id.currency_id.id:
+                    raise osv.except_osv('Invalid Action !', _('The currency of the invoice does not match with the currency of the company. Check this please'))
+        return True
+
+
     def action_wh_iva_create(self, cr, uid, ids, *args):
         wh_iva_obj = self.pool.get('account.wh.iva')
         for inv in self.browse(cr, uid, ids):
 
=== modified file 'l10n_ve_withholding_iva/workflow/account_workflow.xml'
--- l10n_ve_withholding_iva/workflow/account_workflow.xml	2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/workflow/account_workflow.xml	2012-01-19 17:54:27 +0000
@@ -14,7 +14,7 @@
             <field name="name">Withholding Vat</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" ref="wh_iva_order"/>
-            <field name="action">action_wh_iva_create()</field>
+            <field name="action">action_wh_iva_supervisor() and action_wh_iva_create()</field>
         </record>