From 521e77bde268e09ea35451d9c8a274e204fbb72d Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 5 May 2011 15:27:00 +0200 Subject: [PATCH] [IMP] l10n_be: merged the enhancements for vat listing made by Noviat bzr revid: qdp-launchpad@openerp.com-20110505132700-3lersicd60vezhx6 --- .../wizard/l10_be_partner_vat_listing.py | 151 ++++++++++-------- 1 file changed, 83 insertions(+), 68 deletions(-) diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py index 4c6e495ace5..66636539233 100644 --- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py @@ -4,6 +4,11 @@ # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # +# Corrections & modifications by Noviat nv/sa, (http://www.noviat.be): +# - VAT listing based upon year in stead of fiscal year +# - sql query adapted to select only 'tax-out' move lines +# - extra button to print readable PDF report +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -20,39 +25,12 @@ ############################################################################## import time import base64 - from tools.translate import _ -import tools -from decimal import Decimal from osv import fields, osv -class vat_listing_clients(osv.osv_memory): - _name = 'vat.listing.clients' - _columns = { - 'name': fields.char('Client Name', size=64), - 'vat': fields.char('VAT', size=64), - 'country': fields.char('Country', size=64), - 'amount': fields.float('Amount'), - 'turnover': fields.float('Turnover'), - } - def name_get(self, cr, uid, ids, context=None): - if not len(ids): - return [] - return [(r['id'], r['name'] or '' + ' - ' + r['vat'] or '') \ - for r in self.read(cr, uid, ids, ['name', 'vat'], - context, load='_classic_write')] - - def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): - client = self.search(cr, uid, [('vat', '=', name)]+args, limit=limit, context=context) - if not client: - client = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context) - return self.name_get(cr, uid, client, context=context) - -vat_listing_clients() - -class partner_vat(osv.osv_memory): +class partner_vat_13(osv.osv_memory): """ Vat Listing """ - _name = "partner.vat" + _name = "partner.vat_13" def get_partner(self, cursor, user, ids, context=None): obj_period = self.pool.get('account.period') @@ -60,8 +38,16 @@ class partner_vat(osv.osv_memory): 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'][0])], context=context) - p_id_list = obj_partner.search(cursor, user, [('vat_subjected', '!=', False),('customer','=',True)], context=context) + #period = obj_period.search(cursor, user, [('fiscalyear_id', '=', data['fyear'])], context=context) + year = data['year'] + date_start = year + '-01-01' + date_stop = year + '-12-31' + period = obj_period.search(cursor, user, [('date_start' ,'>=', date_start), ('date_stop','<=',date_stop)]) + if not period: + raise osv.except_osv(_('Data Insufficient!'), _('No data for the selected Year.')) + #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'period = %s' %period ) + + p_id_list = obj_partner.search(cursor, user, [('vat_subjected', '!=', False)], context=context) if not p_id_list: raise osv.except_osv(_('Data Insufficient!'), _('No partner has a VAT Number asociated with him.')) partners = [] @@ -79,35 +65,35 @@ class partner_vat(osv.osv_memory): 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', 'income'),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',(('income','tax_out'),obj_partner.id,tuple(period),)) line_info = cursor.fetchall() if not line_info: continue - record['vat'] = obj_partner.vat + record['vat'] = obj_partner.vat.replace(' ','').upper() #it seems that this listing is only for belgian customers record['country'] = 'BE' - record['amount'] = Decimal(str(0.0)) - record['turnover'] = Decimal(str(0.0)) + record['amount'] = 0 + record['turnover'] = 0 record['name'] = obj_partner.name for item in line_info: - if item[0] in ('produit','income'): - record['turnover'] += Decimal(str(item[1])) + if item[0] == 'income': + record['turnover'] += item[1] else: - record['amount'] += Decimal(str(item[1])) + record['amount'] += item[1] id_client = obj_vat_lclient.create(cursor, user, record, context=context) partners.append(id_client) records.append(record) - context.update({'partner_ids': partners, 'fyear': data['fyear'], 'limit_amount': data['limit_amount'], 'mand_id':data['mand_id']}) - model_data_ids = obj_model_data.search(cursor, user, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')]) + context.update({'partner_ids': partners, 'year': data['year'], 'limit_amount': data['limit_amount']}) + model_data_ids = obj_model_data.search(cursor, user, [('model','=','ir.ui.view'), ('name','=','view_vat_listing_13')]) resource_id = obj_model_data.read(cursor, user, model_data_ids, fields=['res_id'])[0]['res_id'] return { 'name': 'Vat Listing', 'view_type': 'form', 'view_mode': 'form', - 'res_model': 'partner.vat.list', + 'res_model': 'partner.vat.list_13', 'views': [(resource_id,'form')], 'context': context, 'type': 'ir.actions.act_window', @@ -115,17 +101,21 @@ class partner_vat(osv.osv_memory): } _columns = { - 'fyear': fields.many2one('account.fiscalyear','Fiscal Year', required=True), - 'mand_id': fields.char('MandataireId', size=14, required=True, help="This identifies the representative of the sending company. This is a string of 14 characters"), + 'year': fields.char('Year', size=4, required=True), 'limit_amount': fields.integer('Limit Amount', required=True), - 'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"), } -partner_vat() + + _defaults={ + 'year': lambda *a: str(int(time.strftime('%Y'))-1), + 'limit_amount': 250, + } + +partner_vat_13() -class partner_vat_list(osv.osv_memory): +class partner_vat_list_13(osv.osv_memory): """ Partner Vat Listing """ - _name = "partner.vat.list" + _name = "partner.vat.list_13" _columns = { 'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'), 'name': fields.char('File Name', size=32), @@ -153,12 +143,15 @@ class partner_vat_list(osv.osv_memory): seq_declarantnum = obj_sequence.get(cursor, user, 'declarantnum') obj_cmpny = obj_users.browse(cursor, user, user, context=context).company_id company_vat = obj_cmpny.partner_id.vat + if not company_vat: raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) - cref = company_vat + seq_controlref - dnum = cref[2:] + (seq_declarantnum or '') - obj_year= obj_fyear.browse(cursor, user, context['fyear'][0], context=context) + company_vat = company_vat.replace(' ','').upper() + SenderId = company_vat[2:] + cref = SenderId + seq_controlref + dnum = cref + seq_declarantnum + #obj_year= obj_fyear.browse(cursor, user, context['fyear'], context=context) street = zip_city = country = '' addr = obj_partner.address_get(cursor, user, [obj_cmpny.partner_id.id], ['invoice']) if addr.get('invoice',False): @@ -175,16 +168,14 @@ class partner_vat_list(osv.osv_memory): country = ads.country_id.code sender_date = time.strftime('%Y-%m-%d') -# comp_name = obj_cmpny.name - data_file = '\n\n\t\t'+ tools.ustr(obj_cmpny.name) +'\n\t\t'+ tools.ustr(street) +'\n\t\t'+ tools.ustr(zip_city) +'' - data_file += '\n\t\t'+ tools.ustr(country) +'\n\t\n' - data_comp = '\n\n\t'+str(company_vat)+'\n\t'+ tools.ustr(obj_cmpny.name) +'\n\t'+ tools.ustr(street) +'\n\t'+ tools.ustr(zip_city) +'\n\t'+ tools.ustr(country) +'\n' - data_period = '\n'+ tools.ustr(obj_year.date_stop[:4]) +'' + data_file += '\n\n\t\n\t\t'+str(company_vat)+'\n\t\t'+ comp_name +'\n\t\t'+ street +'\n\t\t'+ zip_city +'' + data_file += '\n\t\t'+ country +'\n\t\n' + data_comp = '\n\n\t'+SenderId+'\n\t'+ comp_name +'\n\t'+ street +'\n\t'+ zip_city +'\n\t'+ country +'\n' + data_period = '\n' + context['year'] +'' error_message = [] data = self.read(cursor, user, ids)[0] for partner in data['partner_ids']: @@ -195,27 +186,51 @@ class partner_vat_list(osv.osv_memory): datas.append(client_data) seq = 0 data_clientinfo = '' - sum_tax = Decimal(str(0.00)) - sum_turnover=Decimal(str(0.00)) + sum_tax = 0.00 + sum_turnover = 0.00 if len(error_message): return 'Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message) for line in datas: if not line: continue - if Decimal(str(line['turnover'])) < Decimal(str(context['limit_amount'])): + if line['turnover'] < context['limit_amount']: continue seq += 1 - sum_tax +=Decimal(str(line['amount'])) - sum_turnover +=Decimal(str(line['turnover'])) - data_clientinfo += '\n\n\t\n\t\t'+ (line['vat'] or '')[2:] +'\n\t\t' + tools.ustr(line['country']) +'\n\t\n\t'+ str(int(Decimal(str(line['amount'] * 100)))) +'\n\t'+ str(int(Decimal(str(line['turnover'] * 100)))) +'\n' + sum_tax += line['amount'] + sum_turnover += line['turnover'] + data_clientinfo += '\n\n\t\n\t\t'+line['vat'].replace(' ','').upper()[2:] +'\n\t\t' + line['country'] +'\n\t\n\t'+str(int(round(line['amount'] * 100))) +'\n\t'+str(int(round(line['turnover'] * 100))) +'\n' - data_decl ='\n' - data_file += tools.ustr(data_decl) + tools.ustr(data_comp) + tools.ustr(data_period) + tools.ustr(data_clientinfo) + '\n' + data_decl ='\n' + data_file += data_decl + data_comp + str(data_period) + data_clientinfo + '\n\n' msg = 'Save the File with '".xml"' extension.' file_save = base64.encodestring(data_file.encode('utf8')) self.write(cursor, user, ids, {'file_save':file_save, 'msg':msg, 'name':'vat_list.xml'}, context=context) return True + + def print_vatlist(self, cursor, user, ids, context=None): + if context is None: + context = {} + obj_vat_lclient = self.pool.get('vat.listing.clients') + client_datas = [] + data = self.read(cursor, user, ids)[0] + for partner in data['partner_ids']: + if isinstance(partner, list) and partner: + client_datas.append(partner[2]) + else: + client_data = obj_vat_lclient.read(cursor, user, partner, context=context) + client_datas.append(client_data) + + datas = {'ids': []} + datas['model'] = 'res.company' + datas['year'] = context['year'] + datas['limit_amount'] = context['limit_amount'] + datas['client_datas'] = client_datas + return { + 'type': 'ir.actions.report.xml', + 'report_name': 'partner.vat.listing.print', + 'datas': datas, + } -partner_vat_list() +partner_vat_list_13() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: