Merge lp:~vauxoo/openerp-venezuela-localization/marvi-joyza-src-withholding into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[[SISB] Marvi Diaz]

[IMP]modificacion sobre el modulo de src

=== modified file 'l10n_ve_withholding_src/__openerp__.py'
--- l10n_ve_withholding_src/__openerp__.py	2012-01-27 15:31:37 +0000
+++ l10n_ve_withholding_src/__openerp__.py	2012-02-22 12:45:22 +0000
@@ -65,7 +65,6 @@
                 'view/account_invoice_view.xml',
                 'view/company_view.xml',
                 'workflow/l10n_ve_wh_src_wf.xml',
-                'data/wh_src_sequence.xml',
                 'data/data.xml',
                 'wh_src_report.xml',
     ],
 
=== modified file 'l10n_ve_withholding_src/data/data.xml'
--- l10n_ve_withholding_src/data/data.xml	2012-01-30 20:48:44 +0000
+++ l10n_ve_withholding_src/data/data.xml	2012-02-22 12:45:22 +0000
@@ -42,7 +42,26 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="seq_account_retencion_src_customer"/>
         </record>
-        
+
+        <!-- Sequences type for account.wh.src --> 
+
+
+        <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type">
+            <field name="name">Withholding local.supplier</field>
+            <field name="code">account.wh.src.in_invoice</field>
+        </record>
+
+        <!-- Sequences for account.wh.src --> 
+
+
+        <record id="seq_account_retencion_src_customer" model="ir.sequence">
+            <field name="name">Withholding local customer</field>
+            <field name="code">account.wh.src.in_invoice</field>
+            <field name="prefix">RET-SRC</field>
+            <field name="padding">8</field>
+            <field name="number_increment">1</field>
+        </record>
+
         
     </data>
 </openerp>
 
=== removed file 'l10n_ve_withholding_src/data/wh_src_sequence.xml'
--- l10n_ve_withholding_src/data/wh_src_sequence.xml	2012-01-30 20:48:44 +0000
+++ l10n_ve_withholding_src/data/wh_src_sequence.xml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- Sequences type for account.wh.src --> 
-
-
-        <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type">
-            <field name="name">Withholding local.supplier</field>
-            <field name="code">account.wh.src.in_invoice</field>
-        </record>
-
-        <!-- Sequences for account.wh.src --> 
-
-
-        <record id="seq_account_retencion_src_customer" model="ir.sequence">
-            <field name="name">Withholding local customer</field>
-            <field name="code">account.wh.src.in_invoice</field>
-            <field name="prefix">RET-SRC</field>
-            <field name="padding">8</field>
-            <field name="number_increment">1</field>
-        </record>
-
-
-    </data>
-</openerp>
 
=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2012-02-20 13:57:58 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2012-02-22 12:45:22 +0000
@@ -125,9 +125,6 @@
         
         wh_lines = ids and wh_line_obj.search(cr, uid, [('wh_id', '=', ids[0])]) or False
         p_id_prv = ids and self.browse(cr, uid, ids[0], context=context).partner_id.id or False
-        print 'idssssssssss, ',ids
-        print 'partner_id, ',partner_id
-        print 'p_id_prv, ',p_id_prv
         if wh_lines and p_id_prv != partner_id:
             wh_line_obj.unlink(cr, uid, wh_lines)
         
@@ -139,9 +136,6 @@
         
 
     def action_date_ret(self,cr,uid,ids,context=None):
-        #~ TO-CHECK
-        #~ SI EL DOCUMENTO YA TIENE FECHA SE DEVUELVE LA MISMA FECHA,
-        #~ NO SE DEBE HACER NADA
         for wh in self.browse(cr, uid, ids, context):
             wh.date_ret or self.write(cr, uid, [wh.id], {'date_ret':time.strftime('%Y-%m-%d')})
         return True
@@ -150,7 +144,6 @@
     def action_draft(self, cr, uid, ids, context={}):
         if context is None:
             context={}
-        print 'ENTROOOOOO EN SET TO DRAFT'
         inv_obj = self.pool.get('account.invoice')
         
         brw = self.browse(cr,uid,ids[0],context)
@@ -190,7 +183,7 @@
     def action_done(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        #~ 
+
         self.action_date_ret(cr, uid, ids, context=context)
         self.action_number(cr, uid, ids)
         self.action_move_create(cr, uid, ids, context=context)
@@ -219,11 +212,7 @@
         context.update({'src_wh':True})
         
         ret = self.browse(cr, uid, ids[0], context)
-        #~ TO-CHECK 
-        #~ SI EL DOCUMENTO YA TIENE UN ASIENTO CONTABLE,
-        #~ PRIMERO SE DEBE DESTRUIR, Y ANTES DE DESTRUIR,
-        #~ SE DEBE CUMPLIR CON UNA SERIE DE CONDICIONES 
-        #~ PARA SU DESTRUCCION
+
         for line in ret.line_ids:
             if line.move_id:
                 raise osv.except_osv(_('Invoice already withhold !'),\
@@ -268,20 +257,20 @@
         return True
 
     def action_number(self, cr, uid, ids, *args):
-        #~ TO-CHECK
-        #~ SI EL DOCUMENTO YA TIENE NUMERO 
-        #~ SE DEVUELVE TRUE UNA VEZ
         obj_ret = self.browse(cr, uid, ids)[0]
         if obj_ret.type == 'in_invoice':
             cr.execute('SELECT id, number ' \
                     'FROM account_wh_src ' \
                     'WHERE id IN ('+','.join(map(str,ids))+')')
 
+
             for (id, number) in cr.fetchall():
                 if not number:
                     number = self.pool.get('ir.sequence').get(cr, uid, 'account.wh.src.%s' % obj_ret.type)
                 cr.execute('UPDATE account_wh_src SET number=%s ' \
                         'WHERE id=%s', (number, id))
+
+                
         return True