Merge lp:~vauxoo/openerp-venezuela-localization/miguel-l10n-ve-wh-iva into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

[ADD] the copy method to copy the supplier invoice without wh_iva_id
[ADD] a method to verify if the amount is greater than the tax
[IMP] change the fields name for form view

[Javier Duran (javieredm)]

Se esta presentando un error en la línea 324, revisar

review: Needs Fixing

[lp:~vauxoo/openerp-venezuela-localization/miguel-l10n-ve-wh-iva]

440. By Miguel Delgado (Vauxoo) on 2011-10-17

[IMP] the logic to calculate the withholding amount

[Miguel Delgado (Vauxoo) (miguel-delgado07)]

El error ha sido corregido satisfactoriamente.

review: Needs Resubmitting

[Javier Duran (javieredm)]

Merged en el trunk:

revno: 440 [merge]
revision-id: javier@squezee-vir-20111017175208-snkylelbltfvr8x7

review: Approve

=== modified file 'l10n_ve_withholding_iva/invoice.py'
--- l10n_ve_withholding_iva/invoice.py	2011-10-03 02:58:44 +0000
+++ l10n_ve_withholding_iva/invoice.py	2011-10-17 17:26:26 +0000
@@ -93,8 +93,14 @@
             partner = self.pool.get('res.partner').browse(cr, uid,partner_id)
             vals['wh_iva_rate'] = partner.wh_iva_rate
         return super(account_invoice, self).create(cr, uid, vals, context)
-    
-    
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'wh_iva_id':False})
+        return super(account_invoice, self).copy(cr, uid, id, default, context)
+
     def test_retenida(self, cr, uid, ids, *args):     
         type2journal = {'out_invoice': 'iva_sale', 'in_invoice': 'iva_purchase', 'out_refund': 'iva_sale', 'in_refund': 'iva_purchase'}
         type_inv = self.browse(cr, uid, ids[0]).type

=== modified file 'l10n_ve_withholding_iva/security/wh_iva_security.xml'
--- l10n_ve_withholding_iva/security/wh_iva_security.xml	2011-09-09 20:25:27 +0000
+++ l10n_ve_withholding_iva/security/wh_iva_security.xml	2011-10-17 17:26:26 +0000
@@ -8,6 +8,5 @@
     <record id="group_account_wh_iva_manager" model="res.groups">
         <field name="name">Withhold VAT / Manager</field>
     </record>
-
 </data>
 </openerp>

=== modified file 'l10n_ve_withholding_iva/wh_iva.py'
--- l10n_ve_withholding_iva/wh_iva.py	2011-10-03 02:58:44 +0000
+++ l10n_ve_withholding_iva/wh_iva.py	2011-10-17 17:26:26 +0000
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 import time
+from tools.translate import _
 import decimal_precision as dp
 
 
@@ -80,8 +81,8 @@
             ('done','Done'),
             ('cancel','Cancelled')
             ],'State', readonly=True, help="Withholding State"),
-        'date_ret': fields.date('Withholding date', readonly=True, states={'draft':[('readonly',False)]}, help="Keep empty to use the current date"),
-        'date': fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Date"),
+        'date_ret': fields.date('Accounting date', readonly=True, states={'draft':[('readonly',False)]}, help="Keep empty to use the current date"),
+        'date': fields.date('Voucher Date', readonly=True, states={'draft':[('readonly',False)]}, help="Date"),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True, states={'draft':[('readonly',False)]}, help="Keep empty to use the period of the validation(Withholding date) date."),
         'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The pay account used for this withholding."),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, required=True, states={'draft':[('readonly',False)]}, help="Withholding customer/supplier"),
@@ -317,14 +318,14 @@
 
         return res
 
-#    def _retention_rate(self, cr, uid, ids, name, args, context=None):
-#        res = {}
-#        for ret_line in self.browse(cr, uid, ids, context=context):
-#            if ret_line.invoice_id:
-#                res[ret_line.id] = ret_line.invoice_id.p_ret
-#            else:
-#                res[ret_line.id] = 0.0
-#        return res
+    def check_a_retention(self, cr, uid, ids, context=None):
+        amount = 0.0
+        for tax_line in self.browse(cr,uid, ids[0]).tax_line:
+            amount+= tax_line.amount
+        wh_vat_line=self.browse(cr, uid, ids, context)[0]
+        if wh_vat_line.amount_base_wh > amount:
+            raise osv.except_osv(_('Amount Error'),_('the amount is greater than the tax'))
+        return True
 
 
     _name = "account.wh.iva.line"

=== modified file 'l10n_ve_withholding_iva/wh_iva_view.xml'
--- l10n_ve_withholding_iva/wh_iva_view.xml	2011-10-03 21:26:50 +0000
+++ l10n_ve_withholding_iva/wh_iva_view.xml	2011-10-17 17:26:26 +0000
@@ -57,6 +57,7 @@
                                 <field name="amount_base_wh"/>
                                 <field name="amount_tax_wh"/>
                             </group>
+                            <button name="check_a_retention" string="Validate Amount Retention" type="object"  icon="gtk-ok"/>
                         </page>
                     </notebook>
                 </form>
@@ -155,8 +156,8 @@
                                 <button colspan="2" name="compute_amount_wh" states="draft" string="Compute Withholding Vat" type="object" icon="terp-stock_format-scientific"/>
                                 <field name="amount_base_ret"/>
                                 <field name="total_tax_ret"/>
-                                <field name="tot_amount_base_wh"/>
-                                <field name="tot_amount_tax_wh"/>
+                                <field name="tot_amount_base_wh" groups='l10n_ve_withholding_iva.group_account_wh_iva_manager'/>
+                                <field name="tot_amount_tax_wh" groups='l10n_ve_withholding_iva.group_account_wh_iva_manager'/>
                             </group>
                         </page>
                         <page string="Other Information">