Merge lp:~vauxoo/openerp-venezuela-localization/7.0-minor_fixes-rev03-hbto into lp:openerp-venezuela-localization

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

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Este Merge proposal es superado por

https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-wh-all-ref-1704-kty/+merge/225228

review: Disapprove

Unmerged revisions

=== modified file 'l10n_ve_fiscal_book/model/fiscal_book.py'
--- l10n_ve_fiscal_book/model/fiscal_book.py	2014-05-15 18:24:33 +0000
+++ l10n_ve_fiscal_book/model/fiscal_book.py	2014-05-19 15:26:08 +0000
@@ -185,6 +185,17 @@
                 res[fb_brw.id]['get_previous_wh_sum']
         return res
 
+    def _get_do_adjustment_vat_tax_sum(self, cr, uid, ids, field_name, arg,
+                                       context=None):
+        res = {}
+        for fb_brw in self.browse(cr, uid, ids, context=context):
+            avts = 0
+            for fbl_brw in fb_brw.fbl_ids:
+                if fbl_brw.doc_type == 'AJST':
+                    avts += fbl_brw.get_wh_vat
+            res[fb_brw.id] = avts
+        return res
+
     _description = "Venezuela's Sale & Purchase Fiscal Books"
     _name = 'fiscal.book'
     _inherit = ['mail.thread']
@@ -439,6 +450,9 @@
             " For Purchase Book it sums Reduced VAT Tax column for domestic" \
             " transactions. For Sale Book it sums Tax Payer and Non-Tax Payer" \
             " Reduced VAT Tax columns"),
+        'do_adjustment_vat_tax_sum': fields.function(
+            _get_do_adjustment_vat_tax_sum, method=True, type='float',
+            string='Adjustment VAT Taxed Amount'),
 
         #~ Apply only for sale book
         #~ Totalization fields for tax payer and Non-Tax Payer transactions
@@ -759,7 +773,7 @@
 
     def get_order_criteria_adjustment(self, cr, uid, type, context=None):
         return type == 'sale' \
-            and 'accounting_date asc, invoice_number asc' \
+            and 'accounting_date asc, nro_ctrl asc' \
             or 'emission_date asc, invoice_number asc'
 
     def get_order_criteria(self, cr, uid, type, context=None):
@@ -850,10 +864,8 @@
         """
         context = context or {}
         data = []
-        my_rank = 1
         iwdl_obj = self.pool.get('account.wh.iva.line')
         cf_obj = self.pool.get('customs.form')
-        fbl_obj = self.pool.get('fiscal.book.line')
         fb_brw = self.browse(cr, uid, fb_id, context=context)
         rp_obj = self.pool.get('res.partner')
 
@@ -871,7 +883,6 @@
                 rp_brw =  rp_obj._find_accounting_partner(iwdl_brw.retention_id.partner_id)
                 values = {
                     'iwdl_id': iwdl_brw.id,
-                    'rank': my_rank,
                     'type': t_type,
                     'accounting_date': iwdl_brw.date_ret or False,
                     'emission_date': iwdl_brw.date or iwdl_brw.date_ret or False,
@@ -889,7 +900,6 @@
                                              or iwdl_brw.invoice_id.date_invoice,
                     'wh_rate': iwdl_brw.wh_iva_rate,
                 }
-                my_rank += 1
                 data.append((0, 0, values))
 
         #~ add book lines for invoices
@@ -901,6 +911,7 @@
                                                 context=context)
             doc_type = self.get_doc_type(cr, uid, inv_id=inv_brw.id,
                                          context=context)
+
             rp_brw =  rp_obj._find_accounting_partner(inv_brw.partner_id)
 
             iwdl_brw = iwdl_obj.browse(cr, uid, iwdl_id, context=context) if \
@@ -908,7 +919,6 @@
 
             values = {
                 'invoice_id': inv_brw.id,
-                'rank': my_rank,
                 'emission_date': (not imex_invoice) \
                                  and (inv_brw.date_document or inv_brw.date_invoice) \
                                  or False,
@@ -948,7 +958,6 @@
                 'wh_number': iwdl_brw and iwdl_brw.retention_id.number or '',
                 'wh_rate': iwdl_brw and iwdl_brw.wh_iva_rate or 0.0,
             }
-            my_rank += 1
             data.append((0, 0, values))
 
         #~ add book lines for customs forms
@@ -1225,20 +1234,18 @@
 
         for fbl in self.browse(cr, uid, fb_id, context=context).fbl_ids:
             if fbl.invoice_id:
+                sign = 1 if fbl.doc_type != 'N/CR' else -1
                 tax_lines = fbl.type in ['im','ex'] \
                     and fbl.invoice_id.imex_tax_line \
-                    or fbl.invoice_id.tax_line 
+                    or fbl.invoice_id.tax_line
                 for ait in tax_lines:
                     if ait.tax_id.appl_type:
                         base_sum[fbl.type][ait.tax_id.appl_type] += \
-                            ait.base_amount
+                            ait.base_amount * sign
                         tax_sum[fbl.type][ait.tax_id.appl_type] += \
-                            ait.tax_amount
-            elif fbl.cf_id:
-                if fbl.type != 'do':
-                    raise osv.except_osv(_('Programing Error!'),
-                    _("Customs form lines are domestic transacctions"))
-                base_sum['do']['sdcf'] += fbl.vat_sdcf
+                            ait.tax_amount * sign
+                    else:
+                        raise osv.except_osv(_('Error!'),_('You must assign the Aliquot Type to: %s')%(ait.tax_id.name))
 
         data = [ (0, 0, {'tax_type': ttype, 'op_type': optype,
                          'base_amount_sum': base_sum[optype][ttype],
@@ -1260,16 +1267,17 @@
         data = {}
         #~ totalization of book tax amount and base amount fields
         tax_amount = base_amount = 0.0
-        for fbl in self.browse(cr, uid, fb_id, context=context).fbl_ids:
-            if fbl.invoice_id:
-                taxes = fbl.type in ['im','ex'] \
-                        and fbl.invoice_id.imex_tax_line \
-                        or fbl.invoice_id.tax_line
+        for fbl_brw in self.browse(cr, uid, fb_id, context=context).fbl_ids:
+            sign = 1 if fbl_brw.doc_type != 'N/CR' else -1
+            if fbl_brw.invoice_id:
+                taxes = fbl_brw.type in ['im','ex'] \
+                        and fbl_brw.invoice_id.imex_tax_line \
+                        or fbl_brw.invoice_id.tax_line
                 for ait in taxes:
                     if ait.tax_id:
-                        base_amount += ait.base_amount
+                        base_amount += ait.base_amount * sign
                         if ait.tax_id.ret:
-                            tax_amount += ait.tax_amount
+                            tax_amount += ait.tax_amount * sign
 
         data['tax_amount'] = tax_amount
         data['base_amount'] = base_amount
@@ -1394,7 +1402,7 @@
         """
         context = context or {}
         res = 0.0
-        fbts_obj = self.pool.get('fiscal.book.taxes.summary')
+        #~ fbts_obj = self.pool.get('fiscal.book.taxes.summary')
 
         #~ Identifying the field
         field_info = field_name[:-4].split('_')
@@ -1428,22 +1436,24 @@
         data = []
         for fbl in self.browse(cr, uid, fb_id, context=context).fbl_ids:
             if fbl.invoice_id:
+                sign = 1 if fbl.doc_type != 'N/CR' else -1
                 amount_field_data = \
-                    { 'total_with_iva': fbl.invoice_id.amount_untaxed,
+                    { 'total_with_iva': fbl.invoice_id.amount_untaxed * sign,
                       'vat_sdcf': 0.0, 'vat_exempt': 0.0 }
                 taxes = fbl.type in ['im','ex'] \
                     and fbl.invoice_id.imex_tax_line \
                     or fbl.invoice_id.tax_line
                 for ait in taxes:
                     if ait.tax_id:
+
                         data.append((0, 0, {'fb_id': fb_id,
                                             'fbl_id': fbl.id,
                                             'ait_id': ait.id}))
-                        amount_field_data['total_with_iva'] += ait.tax_amount
+                        amount_field_data['total_with_iva'] += ait.tax_amount * sign
                         if ait.tax_id.appl_type == 'sdcf':
-                            amount_field_data['vat_sdcf'] += ait.base_amount
+                            amount_field_data['vat_sdcf'] += ait.base_amount * sign
                         if ait.tax_id.appl_type == 'exento':
-                            amount_field_data['vat_exempt'] += ait.base_amount
+                            amount_field_data['vat_exempt'] += ait.base_amount * sign
                     else:
                         data.append((0, 0, {'fb_id':
                                     fb_id, 'fbl_id': False, 'ait_id': ait.id}))
@@ -1469,14 +1479,15 @@
         tax_type = {'reduced': 'reducido', 'general': 'general',
                     'additional': 'adicional'}
         for fbl_brw in self.browse(cr, uid, fb_id, context=context).fbl_ids:
+            sign = 1 if fbl_brw.doc_type != 'N/CR' else -1
             data = {}.fromkeys(field_names, 0.0)
             for fbt_brw in fbl_brw.fbt_ids:
                 for field_name in field_names:
                     field_tax, field_amount = field_name[4:].split('_')
                     if fbt_brw.ait_id.tax_id.appl_type == tax_type[field_tax]:
                         data[field_name] += field_amount == 'base' \
-                            and fbt_brw.base_amount \
-                            or fbt_brw.tax_amount
+                            and fbt_brw.base_amount * sign \
+                            or fbt_brw.tax_amount * sign
             fbl_obj.write(cr, uid, fbl_brw.id, data, context=context)
         return True
 
@@ -1643,7 +1654,7 @@
             inv_brw = inv_obj.browse(cr, uid, inv_id, context=context)
             if (inv_brw.type in ["in_invoice"] and inv_brw.parent_id) \
                     or inv_brw.type in ["in_refund"]:
-                res = "N/DE"
+                res = "N/DB"
             elif (inv_brw.type in ["out_invoice"] and inv_brw.parent_id) or \
                     inv_brw.type in ["out_refund"]:
                 res = "N/CR"
@@ -1671,7 +1682,7 @@
 
     def is_invoice_imex(self, cr, uid, inv_id, context=None):
         """ Boolean method that verify is a invoice is imported by cheking the
-        customs form associated. 
+        customs form associated.
         @param inv_id: invoice id
         """
         context = context or {}
@@ -1724,8 +1735,9 @@
         context = context or {}
         res = {}.fromkeys(ids, 0.0)
         for fbl_brw in self.browse(cr, uid, ids, context=context):
+            sign = 1 if fbl_brw.doc_type != 'AJST' else -1
             if fbl_brw.iwdl_id:
-                res[fbl_brw.id] = fbl_brw.iwdl_id.amount_tax_ret
+                res[fbl_brw.id] = fbl_brw.iwdl_id.amount_tax_ret * sign
         return res
 
     def _get_based_tax_debit(self, cr, uid, ids, field_name, arg,
@@ -1740,8 +1752,9 @@
         awilt_obj = self.pool.get("account.wh.iva.line.tax")
         for fbl_brw in self.browse(cr, uid, ids, context=context):
             if fbl_brw.iwdl_id:
+                sign = 1 if fbl_brw.doc_type != 'AJST' else -1
                 for tax in fbl_brw.iwdl_id.tax_line:
-                    res[fbl_brw.id] += tax.amount
+                    res[fbl_brw.id] += tax.amount * sign
         return res
 
     def _compute_vat_rates(self, cr, uid, ids, field_name, arg, context=None):
@@ -1890,11 +1903,11 @@
             help="Vat reduced tax rate "),
         'vat_general_rate': fields.function(
             _compute_vat_rates, method=True, type='float',
-            string='Reduced rate', multi='all',
+            string='General rate', multi='all',
             help="Vat general tax rate "),
         'vat_additional_rate': fields.function(
             _compute_vat_rates, method=True, type='float',
-            string='Reduced rate', multi='all',
+            string='Additional rate', multi='all',
             help="Vat plus additional tax rate "),
     }
 

=== modified file 'l10n_ve_fiscal_book/view/fiscal_book.xml'
--- l10n_ve_fiscal_book/view/fiscal_book.xml	2013-06-14 16:46:51 +0000
+++ l10n_ve_fiscal_book/view/fiscal_book.xml	2014-05-19 15:26:08 +0000
@@ -240,9 +240,10 @@
                     </page>
 
                 </notebook>
-                <group string="Total Taxing Base &amp; Total Taxed Amount" col="4">
+                <group string="Total Taxing Base &amp; Total Taxed Amount" col="6">
                     <field name="base_amount"/>
                     <field name="tax_amount"/>
+                    <field name="do_adjustment_vat_tax_sum"/>
                 </group>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>

=== modified file 'l10n_ve_imex/model/customs_form.py'
--- l10n_ve_imex/model/customs_form.py	2013-12-11 19:25:04 +0000
+++ l10n_ve_imex/model/customs_form.py	2014-05-19 15:26:08 +0000
@@ -120,8 +120,6 @@
                                    readonly=True,
                                    help="The move of this entry line."),
         'narration': fields.text('Notes', readonly=False),
-        'invoice_ids': fields.one2many('account.invoice', 'customs_form_id',
-                                       'Related invoices', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open'),
                                    ('done', 'Done'), ('cancel', 'Cancelled')],
                                   string='State', required=True,
@@ -150,7 +148,6 @@
         lines = []
         context = context or {}
         company_id = context.get('f86_company_id')
-        f86_cfg = context.get('f86_config')
         rp_obj = self.pool.get('res.partner')
 
         #~ expenses
@@ -159,13 +156,15 @@
             acc_part_brw = rp_obj._find_accounting_partner(line.tax_code.partner_id)
             if line.tax_code.vat_detail:
                 for vat in line.imex_tax_line:
-                    debits.append(
-                        {'account_id': vat.tax_id.account_collected_id.id,
-                         'amount': vat.tax_amount,
-                         'tax_info': ' (%s)' % vat.tax_id.name})
+                    if vat.tax_amount:
+                        debits.append(
+                            {'account_id': vat.tax_id.account_collected_id.id,
+                             'amount': vat.tax_amount,
+                             'tax_info': ' (%s)' % vat.tax_id.name})
             else:
-                debits.append({'account_id': line.tax_code.account_id.id,
-                               'amount': line.amount, 'tax_info': ''})
+                if line.amount:
+                    debits.append({'account_id': line.tax_code.account_id.id,
+                                   'amount': line.amount, 'tax_info': ''})
 
             credit_account_id = \
                 acc_part_brw.property_account_payable.id
@@ -201,8 +200,6 @@
         obj_cfg = self.pool.get('customs.form.config')
         company_id = self.pool.get('res.users').browse(
             cr, uid, uid, context=context).company_id.id
-        company = self.pool.get('res.company').browse(cr, uid, company_id,
-                                                      context=context)
         cfg_id = obj_cfg.search(cr, uid, [('company_id', '=', company_id)],
                                 context=context)
         if cfg_id:
@@ -211,7 +208,6 @@
             raise osv.except_osv(_('Error!'),
                                  _('Please set a valid configuration in \
                                  the imex settings'))
-        date = time.strftime('%Y-%m-%d')
         context.update({'f86_company_id': company_id, 'f86_config': f86_cfg})
         move_ids = []
         for f86 in so_brw:
@@ -222,24 +218,17 @@
                 'company_id': company_id,
                 'state': 'draft',
                 'to_check': False,
-                'narration': _('Form 86 # %s\n\tReference: %s\n\tBroker: \
-                %s\n\nRelated invoices:')
+                'narration': _('Form 86 # %s\n\tReference: %s\n\tBroker: %s')
                 % (f86.name, f86.ref or '', f86.broker_id.name or ''),
             }
-            for inv in f86.invoice_ids:
-                str_inv = _('\n\tSupplier: %-40s Reference: %s') % \
-                (inv.partner_id.name, inv.supplier_invoice_number)
-                move['narration'] = '%s%s' % (move['narration'], str_inv)
-            lines = self.create_account_move_lines(cr, uid, f86,
-                                                   context=context)
+            lines = self.create_account_move_lines(cr, uid, f86, context=context)
             if lines:
                 move.update({'line_id': lines})
                 move_id = obj_move.create(cr, uid, move, context=context)
                 obj_move.post(cr, uid, [move_id], context=context)
                 if move_id:
                     move_ids.append(move_id)
-                    self.write(cr, uid, f86.id, {'move_id': move_id},
-                               context=context)
+                    self.write(cr, uid, f86.id, {'move_id': move_id}, context=context)
         return move_ids
 
     def button_draft(self, cr, uid, ids, context=None):
@@ -263,7 +252,6 @@
         f86 = self.browse(cr, uid, ids[0], context=context)
         f86_move_id = f86.move_id.id if f86 and f86.move_id else False
         vals = {'state': 'cancel', 'move_id': 0}
-        res = self.write(cr, uid, ids, vals, context=context)
         if f86_move_id:
             self.pool.get('account.move').unlink(cr, uid, [f86_move_id],
                                                  context=context)
@@ -273,12 +261,11 @@
         return True
 
     def test_open(self, cr, uid, ids, *args):
-        so_brw = self.browse(cr, uid, ids, context={})
-        for f86 in so_brw:
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        for f86 in self.browse(cr, uid, ids, context={}):
             if f86.amount_total <= 0:
                 raise osv.except_osv(_('Warning!'),
                                      _('You must indicate a amount'))
-            f86_invoices = [i.id for i in f86.invoice_ids]  # related inv list
             vat_invoices = []  # for tax (vat) related invoices
             for line in f86.cfl_ids:
                 if line.vat_detail:
@@ -290,17 +277,8 @@
                     if abs(vat_total) > 0.001:
                         raise osv.except_osv(
                             _('Warning!'),
-                            _('The vat detail data does not correspond with \
-                            vat amount in line: %s') % line.tax_code.name)
-            #~ Validate related invoices vs invoice_ids (if vat)
-            if set(f86_invoices) != set(vat_invoices):
-                #~ No todas las facturas relacionadas con la planilla de
-                #~ importación se corresponden con las facturas relacionadas
-                #~ al IVA
-                raise osv.except_osv(
-                    _('Warning!'),
-                    _('Not all invoices related to the import spreadsheet \
-                    correspond to invoices relating to VAT'))
+                            _('The vat detail data does not correspond with '
+                              'vat amount in line: %s') % line.tax_code.name)
         return True
 
     def test_done(self, cr, uid, ids, *args):
@@ -311,21 +289,13 @@
             raise osv.except_osv(
                 _('Error!'),
                 _('Multiple operations not allowed'))
-        for f86 in self.browse(cr, uid, ids, context={}):
+        for f86 in self.browse(cr, uid, ids, context=None):
             #~ Validate account_move.state != draft
             if f86.move_id and f86.move_id.state != 'draft':
                 raise osv.except_osv(
                     _('Error!'),
                     _('Can\'t cancel a import while account move state <> \
                     "Draft" (%s)') % f86.move_id.name)
-            #~ Validate state of related invoices (only state = draft)
-            for inv in f86.invoice_ids:
-                if inv.state != 'draft':
-                    raise osv.except_osv(
-                        _('Error!'),
-                        _('Can\'t cancel a import while invoice state <> \
-                        "Draft" ([%s] %s, %s)') % inv.name,
-                        inv.partner_id.name, inv.supplier_invoice_number)
         return True
 
 

=== modified file 'l10n_ve_imex/model/invoice.py'
--- l10n_ve_imex/model/invoice.py	2014-03-17 12:57:59 +0000
+++ l10n_ve_imex/model/invoice.py	2014-05-19 15:26:08 +0000
@@ -34,19 +34,38 @@
 
     _inherit = "account.invoice"
 
+    def _get_imex_invoices(self, cr, uid, ids, name, args, context=None):
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        res = {}.fromkeys(ids, False)
+        for inv in self.browse(cr, uid, ids, context={}):
+            for ait in inv.imex_tax_line:
+                res[inv.id] = ait.cfl_id.customs_form_id.id
+        return res
+
+    def _get_inv_from_ait(self, cr, uid, ids, context=None):
+        '''
+        Returns
+        '''
+        context = context or {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        ait_obj = self.pool.get('account.invoice.tax')
+        ait_brw = ait_obj.browse(cr, uid, ids, context=context)
+        return list(set([i.invoice_id.id for i in ait_brw if i.imex_inv_id]))
+
     _columns = {
-        'customs_form_id': fields.many2one(
-            'customs.form', 'Customs form', change_default=True,
-            required=False, readonly=True,
-            states={'draft': [('readonly', False)]}, ondelete='restrict',
-            domain=[('state', '=', ('draft'))],
-            help="The related form 86 for this import invoice (only draft)"),
+        'customs_form_id': fields.function(
+            _get_imex_invoices, method=True,
+            type='many2one', relation='customs.form',
+            string='Customs form',
+            store={
+                'account.invoice.tax':(_get_inv_from_ait, ['imex_inv_id'], 50),
+            }, help="This is the VAT Withholding Document where this invoice is being withheld"),
         'imex_tax_line': fields.one2many(
             'account.invoice.tax', 'imex_inv_id', 'Vat lines', readonly=True,
             attrs="{'readonly':[('vat_detail','=',True)], \
             'required':[('vat_detail','=',True)]}",),
-        'expedient':fields.boolean('Dossier', readonly=True,
-                                   states={'draft':[('readonly',False)]},
+        'expedient':fields.boolean('Dossier',
                                    help="If it is true, it means this is a \
                                    landindg form, you will need to load this \
                                    format as an purchase invoice to declarate \

=== modified file 'l10n_ve_imex/view/customs_form.xml'
--- l10n_ve_imex/view/customs_form.xml	2013-06-10 20:53:35 +0000
+++ l10n_ve_imex/view/customs_form.xml	2014-05-19 15:26:08 +0000
@@ -78,7 +78,6 @@
                         <page string="Other">
                             <label string="Notes" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
-                            <field name="invoice_ids" colspan="4" nolabel="1"/>
                             <field name="move_id"/>
                             <field name="company_id"/>
                         </page>