Merge lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_src-dev-hbto into lp:~vauxoo/openerp-venezuela-localization/7.0-lp1251135_wh_core-dev-hbto

[hbto [Vauxoo] http://www.vauxoo.com]

=== modified file 'l10n_ve_withholding_src/model/invoice.py'
--- l10n_ve_withholding_src/model/invoice.py	2013-11-18 04:14:18 +0000
+++ l10n_ve_withholding_src/model/invoice.py	2013-12-11 15:35:19 +0000
@@ -41,19 +41,17 @@
         @param partner_bank_id: Partner bank id of the invoice                  
         @param company_id: Company id  
         """
-        p = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        u= self.pool.get('res.users').browse(cr, uid, uid)
-        c = u.company_id.partner_id
+        rp_obj = self.pool.get('res.partner')
         res = super(account_invoice,self).onchange_partner_id(cr, uid, ids, type, \
         partner_id, date_invoice,payment_term,partner_bank_id,company_id)
         
-        if p.wh_src_agent and type in ('out_invoice') and not p.supplier:
-            res['value']['wh_src_rate'] = p.wh_src_rate
-        elif c.wh_src_agent and type in ('in_invoice') and p.supplier:
-            res['value']['wh_src_rate'] = c.wh_src_rate
+        if type in ('out_invoice',):
+            p = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
+            res['value']['wh_src_rate'] = p.wh_src_agent and p.wh_src_rate or 0
         else:
-            res['value']['wh_src_rate'] = 0
-            
+            u= self.pool.get('res.users').browse(cr, uid, uid)
+            c = rp_obj._find_accounting_partner(u.company_id.partner_id)
+            res['value']['wh_src_rate'] = c.wh_src_agent and c.wh_src_rate or 0
         return res
     
     def _retenida(self, cr, uid, ids, name, args, context):
@@ -143,9 +141,10 @@
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
                             name, context=context)
+        rp_obj = self.pool.get('res.partner')
         if context.get('wh_src',False):
             invoice = self.browse(cr, uid, ids[0])
-            
+            acc_part_brw = rp_obj._find_accounting_partner(invoice.partner_id)
             types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
             direction = types[invoice.type]
 
@@ -155,15 +154,32 @@
                 else:
                     acc = tax_brw.wh_id.company_id.wh_src_paid_account_id and tax_brw.wh_id.company_id.wh_src_paid_account_id.id or False
                 if not acc:
-                    raise osv.except_osv(_('Missing Account in Tax!'),_("Tax [%s] has missing account. Please, fill the missing fields") % (tax_brw.wh_id.company_id.name,))
+                    raise osv.except_osv(_('Missing Account in Company!'),_("Your Company [%s] has missing account. Please, fill the missing fields") % (tax_brw.wh_id.company_id.name,))
                 res.append((0,0,{
                     'debit': direction * tax_brw.wh_amount<0 and - direction * tax_brw.wh_amount,
                     'credit': direction * tax_brw.wh_amount>0 and direction * tax_brw.wh_amount,
                     'account_id': acc,
-                    'partner_id': invoice.partner_id.id,
+                    'partner_id': acc_part_brw.id,
                     'ref':invoice.number,
                     'date': date,
                     'currency_id': False,
                     'name':name
                 }))
         return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Verify first if the invoice have a non cancel src withholding doc.
+        If it has then raise a error message. """
+        context = context or {}
+        for inv_brw in self.browse(cr, uid, ids, context=context):
+            if not inv_brw.wh_src_id:
+                super(account_invoice, self).action_cancel(cr, uid, ids,
+                                                           context=context)
+            else:
+                raise osv.except_osv(_("Error!"),
+                _("You can't cancel an invoice that have non cancel"
+                  " Src Withholding Document. Needs first cancel the invoice"
+                  " Src Withholding Document and then you can cancel this"
+                  " invoice."))
+        return True
+

=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2013-12-03 15:04:59 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2013-12-11 15:35:19 +0000
@@ -58,26 +58,27 @@
         return false in otherwise
         """
         context = context or {}
-        user_wh_agent = self.pool.get('res.users').browse(cr, uid, uid, context = context).company_id.partner_id.wh_src_agent
-        return user_wh_agent
+        rp_obj = self.pool.get('res.partner')
+        ru_obj = self.pool.get('res.users')
+        ru_brw = ru_obj.browse(cr, uid, uid, context = context)
+        acc_part_brw = rp_obj._find_accounting_partner(ru_brw.company_id.partner_id)
+        return acc_part_brw.wh_src_agent
 
     def _get_partner_agent(self, cr, uid, context=None):
         """ Return a list of browse partner depending of invoice type
         """
-        context = context or {}
-        
         obj_partner = self.pool.get('res.partner')
-        
-        if context.get('type') in ('out_invoice'):
-            partner_ids = obj_partner.search(cr, uid, [('wh_src_agent','=',True)])
-            partner_brw = self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context)
-        else:
-            partner_ids = obj_partner.search(cr, uid, [])
-            partner_brw = self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context)
-        
-        l = map(lambda x: x.id, partner_brw)
-        
-        return l
+        args = [('parent_id','=',False)]
+        context = context or {}
+        res = []
+        
+        if context.get('type') in ('out_invoice',):
+            args.append(('wh_src_agent','=',True))
+        partner_ids = obj_partner.search(cr, uid, args)
+        if partner_ids:
+            partner_brw = obj_partner.browse(cr, uid, partner_ids, context=context)
+            res = map(lambda x: x.id, partner_brw)
+        return res
 
     def default_get(self, cr, uid, fields, context=None):
         """ Update fields uid_wh_agent and partner_list to the create a
@@ -168,28 +169,34 @@
         @param partner_id: partner id
         """
         if context is None: context = {}    
+        acc_part_brw = False
         acc_id = False
         res = {}
         inv_obj = self.pool.get('account.invoice')
+        rp_obj = self.pool.get('res.partner')
         wh_line_obj = self.pool.get('account.wh.src.line')
         
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            acc_part_brw = rp_obj._find_accounting_partner(rp_obj.browse(cr, uid, partner_id))
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
+                acc_id = acc_part_brw.property_account_receivable and acc_part_brw.property_account_receivable.id or False
             else:
-                acc_id = p.property_account_payable and p.property_account_payable.id or False
-        
-        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
-        if wh_lines and p_id_prv != partner_id:
-            wh_line_obj.unlink(cr, uid, wh_lines)
-        
-        res = {'value': {
-            'account_id': acc_id,
-            }
+                acc_id = acc_part_brw.property_account_payable and acc_part_brw.property_account_payable.id or False
+
+        part_brw = ids and rp_obj._find_accounting_partner(self.browse(cr, uid, ids[0], context=context).partner_id)
+        wh_lines = ids and wh_line_obj.search(cr, uid, [('wh_id', '=', ids[0])])
+        if not partner_id: 
+            wh_lines and wh_line_obj.unlink(cr, uid, wh_lines)
+            wh_lines = []
+        if part_brw and acc_part_brw and part_brw.id != acc_part_brw.id:
+            wh_lines and wh_line_obj.unlink(cr, uid, wh_lines)
+            wh_lines = []
+        
+        return {'value': {
+                    'line_ids':wh_lines,
+                    'account_id': acc_id,
+                }
         }
-        return res
         
 
     def action_date_ret(self,cr,uid,ids,context=None):
@@ -255,12 +262,65 @@
         
         return self.write(cr,uid,ids,{'state':'done'})
         
-    def action_cancel(self,cr,uid,ids,context={}):
-        """ Still not allowed to cancel these withholdings
-        """
-        raise osv.except_osv(_('Invalid Procedure!'),_("For the moment, the systmen does not allow cancell these withholdings."))
-        return True
-        
+    def _dummy_cancel_check(self, cr, uid, ids, context=None):
+        '''
+        This will be the method that another developer should use to create new
+        check on Withholding Document
+        Make super to this method and create your own cases
+        '''
+        return True
+
+    def cancel_check(self, cr, uid, ids, context=None):
+        '''
+        Unique method to check if we can cancel the Withholding Document
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+
+        if not self._dummy_cancel_check(cr, uid, ids, context=context):
+            return False
+        return True
+
+    def cancel_move(self,cr,uid,ids, *args):
+        """ Delete move lines related with withholding vat and cancel
+        """
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        am_obj = self.pool.get('account.move')
+        for ret in self.browse(cr, uid, ids):
+            if ret.state == 'done':
+                for ret_line in ret.line_ids:
+                    ret_line.move_id and am_obj.button_cancel(cr, uid, [ret_line.move_id.id])
+                    ret_line.move_id and am_obj.unlink(cr, uid,[ret_line.move_id.id])
+            ret.write({'state':'cancel'})
+        return True    
+
+    def clear_wh_lines(self, cr, uid, ids, context=None):
+        """ Clear lines of current withholding document and delete wh document
+        information from the invoice.
+        """
+        context = context or {}
+        awsl_obj = self.pool.get('account.wh.src.line')
+        ai_obj = self.pool.get('account.invoice')
+        if ids:
+            awsl_ids = awsl_obj.search(cr, uid, [('wh_id', 'in', ids)],
+                    context=context)
+            ai_ids = awsl_ids and [ awsl.invoice_id.id
+                for awsl in awsl_obj.browse(cr, uid, awsl_ids, context=context) ]
+            ai_ids and ai_obj.write(cr, uid, ai_ids,
+                                    {'wh_src_id': False}, context=context)
+            awsl_ids and awsl_obj.unlink(cr, uid, awsl_ids, context=context)
+
+        return True
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Call cancel_move and return True
+        """
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        context = context or {}
+        self.cancel_move(cr, uid, ids)
+        self.clear_wh_lines(cr, uid, ids, context=context)
+        return True
+
     def copy(self,cr,uid,id,default,context=None):
         """ Lines can not be duplicated in this model
         """
@@ -302,7 +362,17 @@
         if not period_id:
             per_obj = self.pool.get('account.period')
             period_id = per_obj.find(cr, uid,ret.date_ret or time.strftime('%Y-%m-%d'))
-            period_id = per_obj.search(cr,uid,[('id','in',period_id),('special','=',False)])
+            #Due to the fact that demo data for periods sets 'special' as True on them, this little
+            #hack is necesary if this issue is solved we should ask directly for the 
+            #refer to this bug for more information 
+            #https://bugs.launchpad.net/openobject-addons/+bug/924200
+            demo_enabled = self.pool.get('ir.module.module').search(cr, uid,
+                                                            [('name', '=', 'base'),
+                                                             ('demo', '=', True)])
+            args = [('id','in',period_id)]
+            if not demo_enabled:
+                args.append(('special','=',False))
+            period_id = per_obj.search(cr,uid,args)
             if not period_id:
                 raise osv.except_osv(_('Missing Periods!'),\
                 _("There are not Periods created for the pointed day: %s!") %\

=== modified file 'l10n_ve_withholding_src/report/wh_src_report.py'
--- l10n_ve_withholding_src/report/wh_src_report.py	2013-04-12 20:19:03 +0000
+++ l10n_ve_withholding_src/report/wh_src_report.py	2013-12-11 15:35:19 +0000
@@ -21,10 +21,11 @@
     def get_empresa(self, partner_id):
         """ Get information company
         """
-        obj_addr = self.pool.get('res.partner')
-        res = {}
-        for row in obj_addr.browse(self.cr, self.uid, partner_id):
-            res = row.type == 'invoice' and {
+        partner_id = isinstance(partner_id, (int,long)) and [partner_id] or partner_id
+        rp_obj = self.pool.get('res.partner')
+        row = rp_obj.browse(self.cr, self.uid, partner_id[0])
+        row = rp_obj._find_accounting_partner(row)
+        return {
             'street':row.street,
             'phone':row.phone,
             'fax':row.fax,
@@ -33,7 +34,6 @@
             'name':row.name,
             'country':row.country_id.name,
             } 
-        return res
 
 report_sxw.report_sxw('report.wh.src.report',
                     'account.wh.src',

=== modified file 'l10n_ve_withholding_src/view/wh_src_view.xml'
--- l10n_ve_withholding_src/view/wh_src_view.xml	2013-12-03 14:25:17 +0000
+++ l10n_ve_withholding_src/view/wh_src_view.xml	2013-12-11 15:35:19 +0000
@@ -14,7 +14,10 @@
             <field name="arch" type="xml">
                 <tree string="Social Responsibility Commitment Withholding Lines" editable="bottom">
                     <field name="name"/>
-                    <field name="invoice_id" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" domain="[('wh_src_id', '=', False),('state', '=', 'open'),('partner_id','=',parent.partner_id),]"/>
+                    <field 
+                        name="invoice_id" 
+                        on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" 
+                        domain="[('wh_src_id', '=', False),('state', '=', 'open'),'|',('partner_id','=',parent.partner_id),('partner_id','child_of',parent.partner_id)]"/>
                     <field name="base_amount" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" sum="Total Base a Retener"/>
                     <field name="wh_src_rate" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
                     <field name="wh_amount" sum="Total Retenido"/>
@@ -30,7 +33,10 @@
                 <form string="Social Responsibility Commitment Withholding Lines" version="7.0">
                     <notebook>
                         <page string="Linea">
-                            <field name="invoice_id" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" domain="[('wh_src_id', '=', False),('state', '=', 'open'),('partner_id','=',parent.partner_id),]"/>
+                            <field 
+                                name="invoice_id" 
+                                on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)" 
+                                domain="[('wh_src_id', '=', False),('state', '=', 'open'),'|', ('partner_id','=',parent.partner_id), ('partner_id','child_of',parent.partner_id)]"/>
                             <field colspan="4" name="name" select="1"/>
                             <field name="base_amount" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
                             <field name="wh_src_rate" on_change="onchange_invoice_id(parent.type,invoice_id,base_amount,wh_src_rate)"/>
@@ -102,13 +108,26 @@
             <field name="model">account.wh.src</field>
             <field name="arch" type="xml">
                 <form string="Social Responsibility Commitment Withholding" version="7.0">
-                    <field name="uid_wh_agent" invisible="1"/>
-                    <field name="partner_list" string="Partners List" context="{'partner_list': partner_list} " invisible="1"/>
+                    <header>
+                        <button name="wh_src_confirmed" states="draft" string="Confirm"/>
+                        <button name="wh_src_done" states="confirmed" string="Done"/>
+                        <button name="wh_src_cancel" states="draft,confirmed,done" string="Cancel"/>
+                        <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft"/>
+                        <field 
+                            name="state" 
+                            widget="statusbar" 
+                            statusbar_visible="draft,confirmed,done" 
+                            statusbar_colors="{&quot;confirmed&quot;:&quot;blue&quot;}"/>
+                    </header>
                     <group colspan="4" col="6">
                         <field name="journal_id"/>
                         <field name="type" readonly="1"/>
                         <field name="code"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" attrs="{'readonly':['&amp;',('uid_wh_agent','=',False),('type','=','in_invoice')]}" domain="[('id','in',context.get('partner_list' , False))]"/>
+                        <field 
+                            name="partner_id" 
+                            on_change="onchange_partner_id(type,partner_id)" 
+                            attrs="{'readonly':['|','&amp;',('uid_wh_agent','=',False),('type','=','in_invoice'),('state','!=','draft')]}" 
+                            domain="[('id','in',context.get('partner_list' , False))]"/>
                         <field name="currency_id"/>
                         <field name="date_ret"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -116,27 +135,30 @@
                         <field name="period_id"/>
                         <field name="number" attrs="{'readonly':[('type','=','in_invoice')],'required':[('type','in',['out_invoice','out_refund'])]}"/>
                         <field name="date"/>
-                        <field name="wh_amount"/>
+                        <field 
+                            name="wh_amount"
+                            attrs="{'readonly':[('state','!=','draft')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Withholding">
-                            <field name="line_ids" default_get="{'lines': line_ids }" colspan="4" nolabel="1" height="275">
-<!--
-                            <field name="invoice_id" domain="[('wh_src_id', '!=', False),('state', '=', 'open'), ('partner_id','=',parent.partner_id),]"/>                            
--->
-                            </field>
-                            <group col="4" colspan="2">
-                                <field name="state"/>
-                            </group>
-                            <group col="4" colspan="2">
-                                <button name="wh_src_confirmed" states="draft" string="Confirm"/>
-                                <button name="wh_src_done" states="confirmed" string="Done"/>
-                                <button name="wh_src_cancel" states="done" string="Cancel"/>
-                                <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft"/>
-                            </group>
+                            <field 
+                                name="line_ids" 
+                                default_get="{'lines': line_ids }" 
+                                colspan="4" 
+                                nolabel="1" 
+                                height="275"
+                                attrs="{'readonly':[('state','!=','draft')]}"/>
                         </page>
                         <page string="Other Information">
-                            <field name="company_id"/>
+                            <field 
+                                name="company_id"
+                                attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="uid_wh_agent" invisible="1"/>
+                            <field 
+                                name="partner_list" 
+                                string="Partners List" 
+                                context="{'partner_list': partner_list} " 
+                                invisible="1"/>
                         </page>
                     </notebook>
                 </form>

=== modified file 'l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml'
--- l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_src/workflow/l10n_ve_wh_src_wf.xml	2013-12-11 15:35:19 +0000
@@ -26,8 +26,7 @@
         
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wh_src_wkf"/>
-            <field name="action">action_cancel()
-                write({'state':'cancel'})</field>
+            <field name="action">action_cancel()</field>
             <field name="kind">function</field>
             <field name="name">cancel</field>
         </record>
@@ -39,12 +38,23 @@
             <field name="name">done</field>
         </record>
 
-
         <record id="trans_draft_done" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">wh_src_confirmed</field>
         </record>
+
+        <record id="trans_confirmed_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">wh_src_cancel</field>
+        </record>
+
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">wh_src_cancel</field>
+        </record>
         
         <record id="trans_done_cancel" model="workflow.transition">
             <field name="act_from" ref="act_done"/>
@@ -72,4 +82,4 @@
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>