Merge lp:~openerp-dev/openobject-addons/trunk-bug-731671-skh into lp:openobject-addons

[Somesh Khare]

Hello,

Fix : incorrect xml for Annual Listing Of VAT-Subjected Customers.

Thanks,
skh

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

check modified query

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-731671-skh]

4613. By Somesh Khare on 2011-04-04

[FIX] incorrect xml for Annual Listing Of VAT-Subjected Customers

[Somesh Khare (somesh.khare)]

Hello,

[Fix] : I have made the changes, Please check

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

@ qdp: please check the modified query as it is customers so it takes sum(l.credit) ... I am not sure about this change.

other things are ok.

thanks,
mra

review: Approve

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

We have proper fixed as per the changes also from 5.0 and that proposal to be merge for l10n_be fix.

thanks,
mra

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-l10n_be-mra/+merge/56720

=== modified file 'l10n_be/wizard/l10_be_partner_vat_listing.py'
--- l10n_be/wizard/l10_be_partner_vat_listing.py	2011-01-14 00:11:01 +0000
+++ l10n_be/wizard/l10_be_partner_vat_listing.py	2011-04-04 13:39:32 +0000
@@ -58,8 +58,8 @@
         obj_vat_lclient = self.pool.get('vat.listing.clients')
         obj_model_data = self.pool.get('ir.model.data')
         data  = self.read(cursor, user, ids)[0]
-        period = obj_period.search(cursor, user, [('fiscalyear_id', '=', data['fyear'])], context=context)
-        p_id_list = obj_partner.search(cursor, user, [('vat_subjected', '!=', False)], context=context)
+        period = obj_period.search(cursor, user, [('fiscalyear_id', '=', data['fyear'][0])], context=context)
+        p_id_list = obj_partner.search(cursor, user, [('vat_subjected', '=', True),('customer','=',True)], context=context)
         if not p_id_list:
              raise osv.except_osv(_('Data Insufficient!'), _('No partner has a VAT Number asociated with him.'))
         partners = []
@@ -77,7 +77,8 @@
                     break
             if not go_ahead:
                 continue
-            cursor.execute('select b.code, sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code IN %s and l.partner_id=%s and l.period_id IN %s group by b.code',(('produit','tax'),obj_partner.id,tuple(period),))
+#            cursor.execute('select b.code,sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code IN %s and l.partner_id=%s and l.period_id IN %s group by b.code,l.credit, l.debit',(('produit','tax'),obj_partner.id,tuple(period),))
+            cursor.execute('select b.code, sum(l.credit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code IN %s and l.partner_id=%s and l.period_id IN %s group by b.code,l.credit, l.debit',(('produit','tax'),obj_partner.id,tuple(period),))
             line_info = cursor.fetchall()
             if not line_info:
                 continue
@@ -87,9 +88,10 @@
             #it seems that this listing is only for belgian customers
             record['country'] = 'BE'
 
-            record['amount'] = 0
-            record['turnover'] = 0
+            record['amount'] = 0.0
+            record['turnover'] = 0.0
             record['name'] = obj_partner.name
+            
             for item in line_info:
                 if item[0] == 'produit':
                     record['turnover'] += item[1]
@@ -156,7 +158,7 @@
 
         cref = company_vat + seq_controlref
         dnum = cref + seq_declarantnum
-        obj_year= obj_fyear.browse(cursor, user, context['fyear'], context=context)
+        obj_year= obj_fyear.browse(cursor, user, context['fyear'][0], context=context)
         street = zip_city = country = ''
         addr = obj_partner.address_get(cursor, user, [obj_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
@@ -171,7 +173,6 @@
                 street += ads.street2
             if ads.country_id:
                 country = ads.country_id.code
-
         sender_date = time.strftime('%Y-%m-%d')
         comp_name = obj_cmpny.name
         data_file = '<?xml version="1.0"?>\n<VatList xmlns="http://www.minfin.fgov.be/VatList" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.minfin.fgov.be/VatList VatList.xml" RecipientId="VAT-ADMIN" SenderId="'+ str(company_vat) + '"'
@@ -206,7 +207,6 @@
             sum_tax += line['amount']
             sum_turnover += line['turnover']
             data_clientinfo += '\n<ClientList SequenceNum="'+str(seq)+'">\n\t<CompanyInfo>\n\t\t<VATNum>'+line['vat'] +'</VATNum>\n\t\t<Country>' + line['country'] +'</Country>\n\t</CompanyInfo>\n\t<Amount>'+str(int(round(line['amount'] * 100))) +'</Amount>\n\t<TurnOver>'+str(int(round(line['turnover'] * 100))) +'</TurnOver>\n</ClientList>'
-
         data_decl ='\n<DeclarantList SequenceNum="1" DeclarantNum="'+ dnum + '" ClientNbr="'+ str(seq) +'" TurnOverSum="'+ str(int(round(sum_turnover * 100))) +'" TaxSum="'+ str(int(round(sum_tax * 100))) +'" />'
         data_file += data_decl + data_comp + str(data_period) + data_clientinfo + '\n</VatList>'
         msg = 'Save the File with '".xml"' extension.'

=== modified file 'l10n_be/wizard/l10n_be_account_vat_declaration.py'
--- l10n_be/wizard/l10n_be_account_vat_declaration.py	2011-01-14 00:11:01 +0000
+++ l10n_be/wizard/l10n_be_account_vat_declaration.py	2011-04-04 13:39:32 +0000
@@ -71,13 +71,13 @@
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
         data  = self.read(cr, uid, ids)[0]
-        ctx['period_id'] = data['period_id'] #added context here
+        ctx['period_id'] = data['period_id'][0] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
         address = post_code = city = country_code = ''
         city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
+        account_period = obj_acc_period.browse(cr, uid, data['period_id'][0], context=context)
 
         send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
         data_of_file = '<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-16.xml">'