audrius/intrastat-extrastat
1
0
Fork 1
mirror of https://github.com/OCA/intrastat-extrastat.git synced 2025-02-16 17:13:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix to make the module truly usable when user is not part of the group "Detailed intrastat product". Remove dead code and fields that was used when we had to put DEB lines for repair operations (a thing of the past !). Update coding style. Reduce the number of flake8 warnings.

Browse Source
This commit is contained in:
Alexis de Lattre
2013-10-23 23:23:35 +02:00
committed by Alexis de Lattre
parent 8382ecb5f9
commit 3f6cddd3ed
7 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intrastat_base/__init__.py
View File

@@ -20,10 +20,9 @@
#
##############################################################################
import country
import product
import tax
import partner
import company
import intrastat_common
from . import country
from . import product
from . import tax
from . import partner
from . import company
from . import intrastat_common

11
intrastat_base/company.py
View File

@@ -20,10 +20,11 @@
#
##############################################################################
from openerp.osv import osv, orm, fields
from openerp.osv import orm, fields
from openerp.tools.translate import _
class res_company(osv.Model):
class res_company(orm.Model):
_inherit = "res.company"
def _compute_intrastat_email_list(self, cr, uid, ids, name, arg, context=None):
@@ -48,14 +49,14 @@ class res_company(osv.Model):
help='Comma-separated list of email addresses of Users Receiving the Intrastat Reminder. For use in the email template.'),
}
def _check_intrastat_remind_users(self, cr, uid, ids):
for company in self.browse(cr, uid, ids):
for user in company.intrastat_remind_user_ids:
if not user.email:
raise orm.except_orm(_('Error :'), _("Missing e-mail address on user '%s'.") %(user.name))
raise orm.except_orm(_('Error :'), _("Missing e-mail address on user '%s'.") % (user.name))
return True
_constraints = [
(_check_intrastat_remind_users, "error msg in raise", ['intrastat_remind_user_ids']),
(_check_intrastat_remind_users, "error msg in raise",
['intrastat_remind_user_ids']),
]

6
intrastat_base/country.py
View File

@@ -20,9 +20,10 @@
#
##############################################################################
from openerp.osv import osv, fields
from openerp.osv import orm, fields
class res_country(osv.Model):
class res_country(orm.Model):
_inherit = 'res.country'
_columns = {
'intrastat': fields.boolean('EU country', help="Set to True for all European Union countries."),
@@ -31,4 +32,3 @@ class res_country(osv.Model):
_defaults = {
'intrastat': False,
}

32
intrastat_base/intrastat_common.py
View File

@@ -20,7 +20,7 @@
#
##############################################################################
from openerp.osv import osv
from openerp.osv import orm
from openerp.tools.translate import _
from datetime import datetime
from dateutil.relativedelta import relativedelta
@@ -29,7 +29,7 @@ import logging
logger = logging.getLogger(__name__)
class report_intrastat_common(osv.TransientModel):
class report_intrastat_common(orm.TransientModel):
_name = "report.intrastat.common"
_description = "Common functions for intrastat reports for products and services"
@@ -44,7 +44,6 @@ class report_intrastat_common(osv.TransientModel):
result[intrastat.id] = {'num_lines': num_lines, 'total_amount': total_amount}
return result
def _compute_dates(self, cr, uid, ids, object, context=None):
result = {}
for intrastat in object.browse(cr, uid, ids, context=context):
@@ -56,7 +55,6 @@ class report_intrastat_common(osv.TransientModel):
}
return result
def _check_start_date(self, cr, uid, ids, object, context=None):
'''Check that the start date is the first day of the month'''
for date_to_check in object.read(cr, uid, ids, ['start_date'], context=context):
@@ -65,54 +63,48 @@ class report_intrastat_common(osv.TransientModel):
return False
return True
def _check_generate_lines(self, cr, uid, intrastat, context=None):
if not intrastat.company_id.country_id:
raise osv.except_osv(_('Error :'), _("The country is not set on the company '%s'.") %intrastat.company_id.name)
raise orm.except_orm(_('Error :'), _("The country is not set on the company '%s'.") % intrastat.company_id.name)
if not intrastat.currency_id.name == 'EUR':
raise osv.except_osv(_('Error :'), _("The company currency must be 'EUR', but is currently '%s'.") %intrastat.currency_id.name)
raise orm.except_orm(_('Error :'), _("The company currency must be 'EUR', but is currently '%s'.") % intrastat.currency_id.name)
return True
def _check_generate_xml(self, cr, uid, intrastat, context=None):
if not intrastat.company_id.partner_id.vat:
raise osv.except_osv(_('Error :'), _("The VAT number is not set for the partner '%s'.") %intrastat.company_id.partner_id.name)
raise orm.except_orm(_('Error :'), _("The VAT number is not set for the partner '%s'.") % intrastat.company_id.partner_id.name)
return True
def _check_xml_schema(self, cr, uid, xml_root, xml_string, xsd, context=None):
'''Validate the XML file against the XSD'''
from lxml import etree
official_des_xml_schema = etree.XMLSchema(etree.fromstring(xsd))
try: official_des_xml_schema.assertValid(xml_root)
try:
official_des_xml_schema.assertValid(xml_root)
except Exception, e: # if the validation of the XSD fails, we arrive here
import logging
_logger = logging.getLogger(__name__)
_logger.warning("The XML file is invalid against the XML Schema Definition")
_logger.warning(xml_string)
_logger.warning(e)
raise osv.except_osv(_('Error :'), _('The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s.') % str(e))
raise orm.except_orm(_('Error :'), _('The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s.') % str(e))
return True
def _attach_xml_file(self, cr, uid, ids, object, xml_string, start_date_datetime, declaration_name, context=None):
'''Attach the XML file to the report_intrastat_product/service object'''
import base64
if len(ids) != 1:
raise osv.except_osv(_('Error :'), 'Hara kiri in attach_xml_file')
assert len(ids) == 1, "Only one ID accepted"
filename = datetime.strftime(start_date_datetime, '%Y-%m') + '_' + declaration_name + '.xml'
attach_name = declaration_name.upper() + ' ' + datetime.strftime(start_date_datetime, '%Y-%m')
attach_obj = self.pool.get('ir.attachment')
if not context:
context = {}
context.update({'default_res_id' : ids[0], 'default_res_model': object._name})
context.update({'default_res_id': ids[0], 'default_res_model': object._name})
attach_id = attach_obj.create(cr, uid, {'name': attach_name, 'datas': base64.encodestring(xml_string), 'datas_fname': filename}, context=context)
return attach_id
def _open_attach_view(self, cr, uid, attach_id, title='XML file', context=None):
'''Returns an action which opens the form view of the corresponding attachement'''
# Only works in v6 -> not used in v5
action = {
'name': title,
'view_type': 'form',
@@ -126,7 +118,6 @@ class report_intrastat_common(osv.TransientModel):
}
return action
def partner_on_change(self, cr, uid, ids, partner_id=False):
result = {}
result['value'] = {}
@@ -135,13 +126,12 @@ class report_intrastat_common(osv.TransientModel):
result['value'].update({'partner_vat': company['vat']})
return result
def send_reminder_email(self, cr, uid, company, module_name, template_xmlid, intrastat_id, context=None):
template_data = self.pool['ir.model.data'].get_object_reference(cr, uid, module_name, template_xmlid)
if template_data and template_data[0] == 'email.template':
template_id = template_data[1]
else:
raise osv.except_osv(_('Error :'), _("Wrong model for XMLID '%s.%s': model is '%s' and it should be 'email.template'.") %(module_name, template_xmlid, template_data[0]))
raise orm.except_orm(_('Error :'), _("Wrong model for XMLID '%s.%s': model is '%s' and it should be 'email.template'.") % (module_name, template_xmlid, template_data[0]))
if company.intrastat_remind_user_ids:
self.pool['email.template'].send_mail(cr, uid, template_id, intrastat_id, context=context)
logger.info('Intrastat Reminder email has been sent (XMLID: %s).' % template_xmlid)

7
intrastat_base/partner.py
View File

@@ -20,15 +20,14 @@
#
##############################################################################
from openerp.osv import osv, fields
from openerp.osv import orm, fields
# We want to have the country field on res_partner always set
# because the selection of invoices for intrastat reports is based
# on the country of the invoice partner !
class res_partner(osv.Model):
class res_partner(orm.Model):
_inherit = 'res.partner'
_columns = {
'country_id': fields.many2one('res.country', 'Country', required=True),
}

14
intrastat_base/product.py
View File

@@ -20,28 +20,28 @@
#
##############################################################################
from openerp.osv import osv, fields
from openerp.osv import orm, fields
from openerp.tools.translate import _
class product_template(osv.Model):
class product_template(orm.Model):
_inherit = "product.template"
_columns = {
'exclude_from_intrastat': fields.boolean('Exclude from Intrastat reports', help="If set to True, the product or service will not be taken into account for Intrastat Product or Service reports. So you should leave this field to False unless you have a very good reason."),
'is_accessory_cost' : fields.boolean('Is accessory cost', help='Activate this option for shipping costs, packaging costs and all services related to the sale of products. This option is used for Intrastat reports.'),
'is_accessory_cost': fields.boolean('Is accessory cost', help='Activate this option for shipping costs, packaging costs and all services related to the sale of products. This option is used for Intrastat reports.'),
}
_defaults = {
'exclude_from_intrastat': False,
}
def _check_accessory_cost(self, cr, uid, ids):
for product in self.browse(cr, uid, ids):
if product.is_accessory_cost and product.type != 'service':
raise osv.except_osv(_('Error :'), _("The option 'Is accessory cost?' should only be activated on 'Service' products. You have activated this option for the product '%s' which is of type '%s'" % (product.name, product.type)))
raise orm.except_orm(_('Error :'), _("The option 'Is accessory cost?' should only be activated on 'Service' products. You have activated this option for the product '%s' which is of type '%s'" % (product.name, product.type)))
return True
_constraints = [
(_check_accessory_cost, "Error msg is in raise", ['is_accessory_cost', 'type'])
(_check_accessory_cost, "Error msg is in raise",
['is_accessory_cost', 'type'])
]

5
intrastat_base/tax.py
View File

@@ -20,12 +20,11 @@
#
##############################################################################
from openerp.osv import osv, fields
from openerp.osv import orm, fields
class account_tax(osv.Model):
class account_tax(orm.Model):
_inherit = "account.tax"
_columns = {
'exclude_from_intrastat_if_present': fields.boolean('Exclude invoice line from intrastat if this tax is present', help="If this tax is present on an invoice line, this invoice line will be skipped when generating Intrastat Product or Service lines from invoices."),
}