diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index 3c303ee2d1c..09bd6e25bc1 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -34,7 +34,7 @@ This module implements a dashboard for CRM that includes:
* Jobs Tracking (graph)
""",
'author': 'Tiny',
- 'depends': ['board', 'crm', 'report_crm'],
+ 'depends': ['board', 'crm'],
'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'],
'demo_xml': ['board_crm_demo.xml'],
'installable': True,
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index e7252a1a63d..d8087b7a569 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -27,6 +27,15 @@ class event_registration_list(osv.osv_memory):
_description = "List Event Registrations"
def open_registration(self, cr, uid, ids, context={}):
+ if not context.get('active_id', None):
+ return {
+ 'name': 'Event Registrations',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'event.registration',
+ 'type': 'ir.actions.act_window'
+ }
+
cr.execute('SELECT section_id FROM event_event WHERE id = %s', (context['active_id'],))
res = cr.fetchone()
return {
@@ -40,4 +49,4 @@ class event_registration_list(osv.osv_memory):
event_registration_list()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 9ffdeb83397..a82175a59ee 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,13 +18,15 @@
# along with this program. If not, see .
#
##############################################################################
-import base64
+import time
+import datetime
+import base64
from osv import osv, fields
from tools.translate import _
class l10n_be_vat_declaration(osv.osv_memory):
- """ Periodical VAT Declaration """
+ """ Vat Declaration """
_name = "l1on_be.vat.declaration"
_description = "Vat Declaration"
@@ -39,7 +41,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
_defaults = {
'msg': lambda *a:'''Save the File with '".xml"' extension.''',
- }
+ }
def create_xml(self, cr, uid, ids, context={}):
obj_fyear = self.pool.get('account.fiscalyear')
@@ -54,7 +56,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
user_cmpny = obj_company.name
vat_no=obj_company.partner_id.vat
if not vat_no:
- raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
+ raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
ctx = context.copy()
@@ -63,7 +65,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
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 = obj_comp._get_default_ad(obj_company.partner_id.address)
+ city, post_code, address, country_code = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
+
+
year_id = obj_fyear.find(cr, uid)
account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
@@ -81,25 +85,24 @@ class l10n_be_vat_declaration(osv.osv_memory):
#starting month and ending month of selected period are not the same
#it means that the accounting isn't based on periods of 1 month but on quarters
quarter = str(((int(starting_month) - 1) / 3) + 1)
- data_of_file += '' + quarter + '\n\t\t\t'
+ data_of_file += ''+quarter+'\n\t\t\t'
else:
- data_of_file += '' + starting_month + '\n\t\t\t'
+ data_of_file += ''+starting_month+'\n\t\t\t'
data_of_file += '' + str(account_period.date_stop[:4]) + '\n\t\t\n\t\t'
data_of_file += '\n\t\t'+ (data['form']['client_nihil'] and 'YES' or 'NO') +''
data_of_file +='\n\t\t\n\t\t\t'
for item in tax_info:
if item['code']:
-
if item['code'] == '71-72':
- item['code'] = '71'
+ item['code']='71'
if item['code'] in list_of_tags:
data_of_file +='\n\t\t\t\t' + str(abs(int(item['sum_period']*100))) + ''
data_of_file +='\n\t\t\t\n\t\t\n\t\n'
data['file_save'] = base64.encodestring(data_of_file)
self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
- return True
+
l10n_be_vat_declaration()
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 3f33448f8d3..62399ae1cba 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -3,9 +3,9 @@
+ id="menu_finance_belgian_statement"
+ name="Belgium Statements"
+ parent="account.menu_finance_legal_statement"/>
Select Period
@@ -13,12 +13,12 @@
form