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 8b4b94a3de2..95618637c39 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -28,6 +28,11 @@ class l10n_be_vat_declaration(osv.osv_memory):
_name = "l1on_be.vat.declaration"
_description = "Vat Declaration"
+ def _get_xml_data(self, cr, uid, context=None):
+ if context.get('file_save', False):
+ return base64.encodestring(context['file_save'])
+ return ''
+
_columns = {
'name': fields.char('File Name', size=32),
'period_id': fields.many2one('account.period','Period', required=True),
@@ -39,7 +44,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
}
_defaults = {
'msg': 'Save the File with '".xml"' extension.',
- }
+ 'file_save': _get_xml_data,
+ 'name': 'vat_declaration.xml',
+ }
def create_xml(self, cr, uid, ids, context=None):
obj_fyear = self.pool.get('account.fiscalyear')
@@ -48,6 +55,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
obj_user = self.pool.get('res.users')
obj_comp = self.pool.get('res.company')
obj_data = self.pool.get('ir.model.data')
+ mod_obj = self.pool.get('ir.model.data')
if context is None:
context = {}
@@ -99,9 +107,21 @@ class l10n_be_vat_declaration(osv.osv_memory):
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'], 'name': 'vat_declare.xml'}, context=context)
- return True
+ model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_vat_save')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ context['file_save'] = data_of_file
+ return {
+ 'name': _('Save XML For Vat declaration'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'l1on_be.vat.declaration',
+ 'views': [(resource_id,'form')],
+ 'view_id': 'view_vat_save',
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
l10n_be_vat_declaration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
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 342226930ce..b8de24bf87e 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
@@ -13,31 +13,46 @@
form
+
+
+
+
+ Save XML
+ l1on_be.vat.declaration
+ form
+
+
-
+
-
+
Vat Declaraion
ir.actions.act_window
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 954b4675a49..d54d15e5b57 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -31,6 +31,11 @@ class partner_vat_intra(osv.osv_memory):
_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'])
+ 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'])])
@@ -56,6 +61,8 @@ class partner_vat_intra(osv.osv_memory):
_defaults = {
'country_ids': _get_europe_country,
+ 'file_save': _get_xml_data,
+ 'name': 'vat_Intra.xml',
}
def create_xml(self, cursor, user, ids, context=None):
@@ -65,6 +72,7 @@ class partner_vat_intra(osv.osv_memory):
obj_partner = self.pool.get('res.partner')
obj_partner_add = self.pool.get('res.partner.address')
obj_country = self.pool.get('res.country')
+ mod_obj = self.pool.get('ir.model.data')
street = zip_city = country = p_list = data_clientinfo = ''
error_message = list_partner = []
seq = amount_sum = 0
@@ -132,14 +140,20 @@ class partner_vat_intra(osv.osv_memory):
amount_sum = int(amount_sum)
data_decl = '\n\t'
data_file += str(data_decl) + str(data_comp) + str(data_period) + str(data_clientinfo) + '\n\t\n'
- data = {
- 'msg': 'XML Flie has been Created. Save the File with '".xml"' extension.',
- 'file_save': base64.encodestring(data_file),
- 'name': 'vat_Intra.xml',
- 'country_ids': [[6, 0, obj_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'])])]],
- }
- self.write(cursor, user, ids, {'file_save':data['file_save'], 'msg':data['msg'], 'name':data['name'], 'no_vat':p_list, 'country_ids':data['country_ids']}, context=context)
- return True
+ model_data_ids = mod_obj.search(cursor, user,[('model','=','ir.ui.view'),('name','=','view_vat_intra_save')], context=context)
+ resource_id = mod_obj.read(cursor, user, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ context['file_save'] = data_file
+ 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',
+ }
partner_vat_intra()
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 59fa21000a1..114a7f593d0 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -13,32 +13,48 @@
form
+
+
+
+
+ Partner VAT intra Save
+ partner.vat.intra
+ form
+
+
+
Partner Vat Intra
ir.actions.act_window