From a94da27d8eacd4aaf2bdf1ce57b531e8d1aeb4a7 Mon Sep 17 00:00:00 2001 From: pvy Date: Fri, 21 Aug 2015 12:00:56 +0200 Subject: [PATCH] [RM] l10n_be: removed unneeded reports that have been ported to the new engine --- addons/l10n_be/__init__.py | 2 - addons/l10n_be/__openerp__.py | 4 - addons/l10n_be/views/report_vatintraprint.xml | 51 ---- addons/l10n_be/wizard/__init__.py | 7 - addons/l10n_be/wizard/l10n_be_vat_intra.py | 276 ------------------ .../l10n_be/wizard/l10n_be_vat_intra_view.xml | 68 ----- 6 files changed, 408 deletions(-) delete mode 100644 addons/l10n_be/views/report_vatintraprint.xml delete mode 100644 addons/l10n_be/wizard/__init__.py delete mode 100644 addons/l10n_be/wizard/l10n_be_vat_intra.py delete mode 100644 addons/l10n_be/wizard/l10n_be_vat_intra_view.xml diff --git a/addons/l10n_be/__init__.py b/addons/l10n_be/__init__.py index 106dad19d23..67dee8c60db 100644 --- a/addons/l10n_be/__init__.py +++ b/addons/l10n_be/__init__.py @@ -1,4 +1,2 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. - -import wizard diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py index b4567801b8c..30e71c40dde 100644 --- a/addons/l10n_be/__openerp__.py +++ b/addons/l10n_be/__openerp__.py @@ -45,15 +45,11 @@ Wizards provided by this module: 'account_chart_template.xml', 'account_pcmn_belgium.xml', 'account_tax_template.xml', - #'wizard/l10n_be_account_vat_declaration_view.xml', - #'wizard/l10n_be_vat_intra_view.xml', - #'wizard/l10n_be_partner_vat_listing.xml', 'l10n_be_sequence.xml', 'fiscal_templates.xml', 'account_fiscal_position_tax_template.xml', 'account_chart_template.yml', 'security/ir.model.access.csv', - 'views/report_vatintraprint.xml', ], 'demo': [ 'demo/l10n_be_demo.yml', diff --git a/addons/l10n_be/views/report_vatintraprint.xml b/addons/l10n_be/views/report_vatintraprint.xml deleted file mode 100644 index 94568e3f106..00000000000 --- a/addons/l10n_be/views/report_vatintraprint.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py deleted file mode 100644 index 3526ac0b3dc..00000000000 --- a/addons/l10n_be/wizard/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -#import l10n_be_partner_vat_listing -#import l10n_be_vat_intra -#import l10n_be_account_vat_declaration - diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py deleted file mode 100644 index 3f5851a1021..00000000000 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ /dev/null @@ -1,276 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -import time -import base64 - -from openerp.osv import fields, osv -from openerp.tools.translate import _ -from openerp.report import report_sxw -from openerp.exceptions import UserError - - -class partner_vat_intra(osv.osv_memory): - """ - Partner Vat Intra - """ - _name = "partner.vat.intra" - _description = 'Partner VAT Intra' - - def _get_xml_data(self, cr, uid, context=None): - if context.get('file_save', False): - return base64.encodestring(context['file_save'].encode('utf8')) - return '' - - def _get_europe_country(self, cursor, user, context=None): - return self.pool.get('res.country').search(cursor, user, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])]) - - _columns = { - 'name': fields.char('File Name'), - 'period_code': fields.char('Period Code', size=6, required=True, help='''This is where you have to set the period code for the intracom declaration using the format: ppyyyy - PP can stand for a month: from '01' to '12'. - PP can stand for a trimester: '31','32','33','34' - The first figure means that it is a trimester, - The second figure identify the trimester. - PP can stand for a complete fiscal year: '00'. - YYYY stands for the year (4 positions). - ''' - ), - 'date': fields.date('Date Account', help = 'Select here the period(s) you want to include in your intracom declaration'), - 'tax_code_id': fields.many2one('account.tax.code', 'Company', domain=[('parent_id', '=', False)], help="Keep empty to use the user's company", required=True), - 'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"), - 'mand_id' : fields.char('Reference', help="Reference given by the Representative of the sending company."), - 'msg': fields.text('File created', readonly=True), - 'no_vat': fields.text('Partner With No VAT', readonly=True, help="The Partner whose VAT number is not defined and they are not included in XML File."), - 'file_save' : fields.binary('Save File', readonly=True), - 'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'), - 'comments': fields.text('Comments'), - } - - def _get_tax_code(self, cr, uid, context=None): - obj_tax_code = self.pool.get('account.tax.code') - obj_user = self.pool.get('res.users') - company_id = obj_user.browse(cr, uid, uid, context=context).company_id.id - tax_code_ids = obj_tax_code.search(cr, uid, [('company_id', '=', company_id), ('parent_id', '=', False)], context=context) - return tax_code_ids and tax_code_ids[0] or False - - _defaults = { - 'country_ids': _get_europe_country, - 'file_save': _get_xml_data, - 'name': 'vat_intra.xml', - 'tax_code_id': _get_tax_code, - } - - def _get_datas(self, cr, uid, ids, context=None): - """Collects require data for vat intra xml - :param ids: id of wizard. - :return: dict of all data to be used to generate xml for Partner VAT Intra. - :rtype: dict - """ - if context is None: - context = {} - - obj_user = self.pool.get('res.users') - obj_sequence = self.pool.get('ir.sequence') - obj_partner = self.pool.get('res.partner') - - xmldict = {} - post_code = street = city = country = data_clientinfo = '' - seq = amount_sum = 0 - - wiz_data = self.browse(cr, uid, ids[0], context=context) - comments = wiz_data.comments - - if wiz_data.tax_code_id: - data_company = wiz_data.tax_code_id.company_id - else: - data_company = obj_user.browse(cr, uid, uid, context=context).company_id - - # Get Company vat - company_vat = data_company.partner_id.vat - if not company_vat: - raise UserError(_('No VAT number associated with your company.')) - company_vat = company_vat.replace(' ','').upper() - issued_by = company_vat[:2] - - if len(wiz_data.period_code) != 6: - raise UserError(_('Period code is not valid.')) - - if not wiz_data.period_ids: - raise UserError(_('Please select at least one Period.')) - - p_id_list = obj_partner.search(cr, uid, [('vat','!=',False)], context=context) - if not p_id_list: - raise UserError(_('No partner has a VAT number associated with him.')) - - seq_declarantnum = obj_sequence.next_by_code(cr, uid, 'declarantnum') - dnum = company_vat[2:] + seq_declarantnum[-4:] - - addr = obj_partner.address_get(cr, uid, [data_company.partner_id.id], ['invoice']) - email = data_company.partner_id.email or '' - phone = data_company.partner_id.phone or '' - - if addr.get('invoice',False): - ads = obj_partner.browse(cr, uid, [addr['invoice']])[0] - city = (ads.city or '') - post_code = (ads.zip or '') - if ads.street: - street = ads.street - if ads.street2: - street += ' ' - street += ads.street2 - if ads.country_id: - country = ads.country_id.code - - if not country: - country = company_vat[:2] - if not email: - raise UserError(_('No email address associated with the company.')) - if not phone: - raise UserError(_('No phone associated with the company.')) - xmldict.update({ - 'company_name': data_company.name, - 'company_vat': company_vat, - 'vatnum': company_vat[2:], - 'mand_id': wiz_data.mand_id, - 'sender_date': str(time.strftime('%Y-%m-%d')), - 'street': street, - 'city': city, - 'post_code': post_code, - 'country': country, - 'email': email, - 'phone': phone.replace('/','').replace('.','').replace('(','').replace(')','').replace(' ',''), - 'period': wiz_data.period_code, - 'clientlist': [], - 'comments': comments, - 'issued_by': issued_by, - }) - #tax code 44: services - #tax code 46L: normal good deliveries - #tax code 46T: ABC good deliveries - #tax code 48xxx: credite note on tax code xxx - codes = ('44', '46L', '46T', '48s44', '48s46L', '48s46T') - cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat, - (CASE WHEN t.code = '48s44' THEN '44' - WHEN t.code = '48s46L' THEN '46L' - WHEN t.code = '48s46T' THEN '46T' - ELSE t.code END) AS intra_code, - SUM(CASE WHEN t.code in ('48s44','48s46L','48s46T') THEN -l.tax_amount ELSE l.tax_amount END) AS amount - FROM account_move_line l - LEFT JOIN account_tax_code t ON (l.tax_code_id = t.id) - LEFT JOIN res_partner p ON (l.partner_id = p.id) - WHERE t.code IN %s - AND l.date = %s - AND t.company_id = %s - GROUP BY p.name, l.partner_id, p.vat, intra_code''', (codes, wiz_data.date, data_company.id)) - - p_count = 0 - - for row in cr.dictfetchall(): - if not row['vat']: - row['vat'] = '' - p_count += 1 - - seq += 1 - amt = row['amount'] or 0.0 - amount_sum += amt - - intra_code = row['intra_code'] == '44' and 'S' or (row['intra_code'] == '46L' and 'L' or (row['intra_code'] == '46T' and 'T' or '')) - - xmldict['clientlist'].append({ - 'partner_name': row['partner_name'], - 'seq': seq, - 'vatnum': row['vat'][2:].replace(' ','').upper(), - 'vat': row['vat'], - 'country': row['vat'][:2], - 'amount': round(amt,2), - 'intra_code': row['intra_code'], - 'code': intra_code}) - - xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': round(amount_sum,2), 'partner_wo_vat': p_count}) - return xmldict - - def create_xml(self, cursor, user, ids, context=None): - """Creates xml that is to be exported and sent to estate for partner vat intra. - :return: Value for next action. - :rtype: dict - """ - xml_data = self._get_datas(cursor, user, ids, context=context) - month_quarter = xml_data['period'][:2] - year = xml_data['period'][2:] - data_file = '' - - # Can't we do this by etree? - data_head = """ - - - %(vatnum)s - %(company_name)s - %(street)s - %(post_code)s - %(city)s - %(country)s - %(email)s - %(phone)s - """ % (xml_data) - if xml_data['mand_id']: - data_head += '\n\t\t%(mand_id)s' % (xml_data) - data_comp_period = '\n\t\t\n\t\t\t%(vatnum)s\n\t\t\t%(company_name)s\n\t\t\t%(street)s\n\t\t\t%(post_code)s\n\t\t\t%(city)s\n\t\t\t%(country)s\n\t\t\t%(email)s\n\t\t\t%(phone)s\n\t\t' % (xml_data) - if month_quarter.startswith('3'): - data_comp_period += '\n\t\t\n\t\t\t'+month_quarter[1]+' \n\t\t\t'+year+'\n\t\t' - elif month_quarter.startswith('0') and month_quarter.endswith('0'): - data_comp_period+= '\n\t\t\n\t\t\t'+year+'\n\t\t' - else: - data_comp_period += '\n\t\t\n\t\t\t'+month_quarter+' \n\t\t\t'+year+'\n\t\t' - - data_clientinfo = '' - for client in xml_data['clientlist']: - if not client['vatnum']: - raise UserError(_('No vat number defined for %s.') % client['partner_name']) - data_clientinfo +='\n\t\t\n\t\t\t%(vatnum)s\n\t\t\t%(code)s\n\t\t\t%(amount).2f\n\t\t' % (client) - - data_decl = '\n\t' % (xml_data) - - data_file += data_head + data_decl + data_comp_period + data_clientinfo + '\n\t\t%(comments)s\n\t\n' % (xml_data) - context = dict(context or {}) - context['file_save'] = data_file - - resource_id = self.pool['ir.model.data'].xmlid_to_res_id( - cursor, user, 'l10n_be.view_vat_intra_save', context=context) - - return { - 'name': _('Save'), - 'context': context, - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'partner.vat.intra', - 'views': [(resource_id,'form')], - 'view_id': 'view_vat_intra_save', - 'type': 'ir.actions.act_window', - 'target': 'new', - } - - def preview(self, cr, uid, ids, context=None): - xml_data = self._get_datas(cr, uid, ids, context=context) - datas = { - 'ids': [], - 'model': 'partner.vat.intra', - 'form': xml_data - } - return self.pool['report'].get_action( - cr, uid, [], 'l10n_be.report_l10nvatintraprint', data=datas, context=context - ) - - -class vat_intra_print(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(vat_intra_print, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - }) - - -class wrapped_vat_intra_print(osv.AbstractModel): - _name = 'report.l10n_be.report_l10nvatintraprint' - _inherit = 'report.abstract_report' - _template = 'l10n_be.report_l10nvatintraprint' - _wrapped_report_class = vat_intra_print diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml deleted file mode 100644 index a408361e577..00000000000 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - Partner VAT intra - partner.vat.intra - -
- - - - - - - - - - - - - - - - - - - -
-
-
- - - - - Partner VAT intra Save - partner.vat.intra - -
- -
- - - Partner Vat Intra - ir.actions.act_window - partner.vat.intra - form - form - - new - - - - - -