diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 4319b838c0c..8d5728e334e 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -29,5 +29,6 @@
import l10n_fr
import report
import wizard
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 95e35794516..5196573067c 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -38,16 +38,15 @@ Credits: Sistheo Zeekom CrysaLEAD
"depends" : ['base', 'account', 'account_chart', 'account_report', 'base_vat'],
"init_xml" : [],
"update_xml" : [
- "report.xml",
- "pcg.xml",
- "l10n_fr_pcg_taxes.xml",
- "tax.xml",
- "fiscal_templates_fr.xml",
- "l10n_fr_pcg_account_report.xml",
- "l10n_fr_pcg_report.xml",
- "l10n_fr_pcg_wizard.xml",
- "l10n_fr_pcg_view.xml",
+ "report_demo.xml",
+ "plan_comptable_general_demo.xml",
+ "fr_pcg_taxes_demo.xml",
+ "tax_demo.xml",
+ "fr_fiscal_templates_demo.xml",
+ "fr_pcg_account_report_demo.xml",
"security/ir.model.access.csv",
+ "wizard/bilan_report_view.xml",
+ "wizard/compute_resultant_report_view.xml",
],
"demo_xml" : [],
"certificate" : "00435321693876313629",
diff --git a/addons/l10n_fr/fiscal_templates_fr.xml b/addons/l10n_fr/fr_fiscal_templates_demo.xml
similarity index 100%
rename from addons/l10n_fr/fiscal_templates_fr.xml
rename to addons/l10n_fr/fr_fiscal_templates_demo.xml
diff --git a/addons/l10n_fr/l10n_fr_pcg_account_report.xml b/addons/l10n_fr/fr_pcg_account_report_demo.xml
similarity index 100%
rename from addons/l10n_fr/l10n_fr_pcg_account_report.xml
rename to addons/l10n_fr/fr_pcg_account_report_demo.xml
diff --git a/addons/l10n_fr/l10n_fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes_demo.xml
similarity index 100%
rename from addons/l10n_fr/l10n_fr_pcg_taxes.xml
rename to addons/l10n_fr/fr_pcg_taxes_demo.xml
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index e34b66a9162..08e8c9ed3e5 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -19,12 +19,7 @@
#
##############################################################################
-from mx import DateTime
-import time
-
from osv import fields, osv
-import pooler
-
class l10n_fr_report(osv.osv):
_name = 'l10n.fr.report'
diff --git a/addons/l10n_fr/l10n_fr_pcg_report.xml b/addons/l10n_fr/l10n_fr_pcg_report.xml
deleted file mode 100644
index d5277265cfc..00000000000
--- a/addons/l10n_fr/l10n_fr_pcg_report.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
diff --git a/addons/l10n_fr/l10n_fr_pcg_view.xml b/addons/l10n_fr/l10n_fr_pcg_view.xml
deleted file mode 100644
index b89596e6dc8..00000000000
--- a/addons/l10n_fr/l10n_fr_pcg_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/addons/l10n_fr/l10n_fr_pcg_wizard.xml b/addons/l10n_fr/l10n_fr_pcg_wizard.xml
deleted file mode 100644
index 3fe6f946717..00000000000
--- a/addons/l10n_fr/l10n_fr_pcg_wizard.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
- Generate Chart of Accounts from a Chart Template
- Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
-
- onskip
-
-
-
diff --git a/addons/l10n_fr/pcg.xml b/addons/l10n_fr/plan_comptable_general_demo.xml
similarity index 100%
rename from addons/l10n_fr/pcg.xml
rename to addons/l10n_fr/plan_comptable_general_demo.xml
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 558b90865b9..9907a2f5765 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -27,7 +27,8 @@
##############################################################################
import base_report
-import bilan
-import cdr
+import bilan_report
+import compute_resultant_report
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/report/bilan.py b/addons/l10n_fr/report/bilan_report.py
similarity index 95%
rename from addons/l10n_fr/report/bilan.py
rename to addons/l10n_fr/report/bilan_report.py
index 96d269893d8..fafacd8f6ea 100644
--- a/addons/l10n_fr/report/bilan.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -33,7 +33,7 @@ class bilan(base_report.base_report):
def __init__(self, cr, uid, name, context):
super(bilan, self).__init__(cr, uid, name, context)
-report_sxw.report_sxw('report.l10n.fr.bilan', 'account.move.line','addons/l10n_fr/report/bilan.rml', parser=bilan, header=False)
+report_sxw.report_sxw('report.l10n.fr.bilan', 'account.move.line','addons/l10n_fr/report/bilan_report.rml', parser=bilan, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/report/bilan.rml b/addons/l10n_fr/report/bilan_report.rml
similarity index 100%
rename from addons/l10n_fr/report/bilan.rml
rename to addons/l10n_fr/report/bilan_report.rml
diff --git a/addons/l10n_fr/report/cdr.py b/addons/l10n_fr/report/compute_resultant_report.py
similarity index 90%
rename from addons/l10n_fr/report/cdr.py
rename to addons/l10n_fr/report/compute_resultant_report.py
index 6e763087f5e..e91f9fc839e 100644
--- a/addons/l10n_fr/report/cdr.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -33,7 +33,7 @@ class cdr(base_report.base_report):
def __init__(self, cr, uid, name, context):
super(cdr, self).__init__(cr, uid, name, context)
-report_sxw.report_sxw('report.l10n.fr.cdr', 'account.move.line','addons/l10n_fr/report/cdr.rml', parser=cdr, header=False)
+report_sxw.report_sxw('report.l10n.fr.compute_resultant', 'account.move.line','addons/l10n_fr/report/compute_resultant_report.rml', parser=cdr, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/report/cdr.rml b/addons/l10n_fr/report/compute_resultant_report.rml
similarity index 100%
rename from addons/l10n_fr/report/cdr.rml
rename to addons/l10n_fr/report/compute_resultant_report.rml
diff --git a/addons/l10n_fr/report.xml b/addons/l10n_fr/report_demo.xml
similarity index 100%
rename from addons/l10n_fr/report.xml
rename to addons/l10n_fr/report_demo.xml
diff --git a/addons/l10n_fr/tax.xml b/addons/l10n_fr/tax_demo.xml
similarity index 100%
rename from addons/l10n_fr/tax.xml
rename to addons/l10n_fr/tax_demo.xml
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index 11db3887d1f..6e29471a975 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -26,7 +26,8 @@
#
##############################################################################
-import bilan
-import cdr
+import fr_report_bilan
+import fr_report_compute_resultant
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/wizard/bilan_report_view.xml b/addons/l10n_fr/wizard/bilan_report_view.xml
new file mode 100644
index 00000000000..d70894122d4
--- /dev/null
+++ b/addons/l10n_fr/wizard/bilan_report_view.xml
@@ -0,0 +1,40 @@
+
+
+
+
+ Bilan Report
+ account.bilan.report
+ form
+
+
+
+
+
+
+ Bilan Report
+ ir.actions.act_window
+ account.bilan.report
+ form
+ form
+
+ new
+
+
+
+
+
+ Bilan Report
+ client_print_multi
+
+ action
+ account.move.line
+
+
+
diff --git a/addons/l10n_fr/wizard/compute_resultant_report_view.xml b/addons/l10n_fr/wizard/compute_resultant_report_view.xml
new file mode 100644
index 00000000000..a81d1b1e3c7
--- /dev/null
+++ b/addons/l10n_fr/wizard/compute_resultant_report_view.xml
@@ -0,0 +1,40 @@
+
+
+
+
+ Compte de resultat Report
+ account.cdr.report
+ form
+
+
+
+
+
+
+ Compte de resultat Report
+ ir.actions.act_window
+ account.cdr.report
+ form
+ form
+
+ new
+
+
+
+
+
+ Compte de resultat Report
+ client_print_multi
+
+ action
+ account.move.line
+
+
+
diff --git a/addons/l10n_fr/wizard/bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
similarity index 60%
rename from addons/l10n_fr/wizard/bilan.py
rename to addons/l10n_fr/wizard/fr_report_bilan.py
index 2a0e3c1855e..9f9e4a933f1 100644
--- a/addons/l10n_fr/wizard/bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -26,35 +26,31 @@
#
##############################################################################
-import wizard
-import pooler
+from osv import osv, fields
-dates_form = '''
-'''
+class account_bilan_report(osv.osv_memory):
+ _name = 'account.bilan.report'
+ _description = 'Account Bilan Report'
-dates_fields = {
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True}
-}
+ def _get_default_fiscalyear(self, cr, uid, context):
+ fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid)
+ return fiscalyear_id
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] =fiscalyear_obj.find(cr, uid)
- return data['form']
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
- },
- 'report': {
- 'actions': [],
- 'result': {'type':'print', 'report':'l10n.fr.bilan', 'state':'end'}
+ _columns = {
+ 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
+ }
+ _defaults = {
+ 'fiscalyear_id':_get_default_fiscalyear
}
- }
-wizard_report('l10n.fr.bilan.report')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ def print_bilan_report(self, cr, uid, ids, context=None):
+ active_ids = context.get('active_ids',[])
+ data = {}
+ data['form'] = {}
+ data['ids'] = active_ids
+ data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+ return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data }
+account_bilan_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_fr/wizard/cdr.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
similarity index 60%
rename from addons/l10n_fr/wizard/cdr.py
rename to addons/l10n_fr/wizard/fr_report_compute_resultant.py
index 57216754366..24211b46cb7 100644
--- a/addons/l10n_fr/wizard/cdr.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -26,35 +26,33 @@
#
##############################################################################
-import wizard
-import pooler
+from osv import osv, fields
-dates_form = '''
-'''
-
-dates_fields = {
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True}
-}
-
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- return data['form']
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
- },
- 'report': {
- 'actions': [],
- 'result': {'type':'print', 'report':'l10n.fr.cdr', 'state':'end'}
+class account_cdr_report(osv.osv_memory):
+ _name = 'account.cdr.report'
+ _description = 'Account CDR Report'
+
+ def _get_defaults(self, cr, uid, context):
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+ fiscalyear_id = fiscalyear_obj.find(cr, uid)
+ return fiscalyear_id
+
+ _columns = {
+ 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
}
- }
-wizard_report('l10n.fr.cdr.report')
+ _defaults = {
+ 'fiscalyear_id': _get_defaults
+ }
+
+ def print_cdr_report(self, cr, uid, ids, context=None):
+ active_ids = context.get('active_ids',[])
+ data = {}
+ data['form'] = {}
+ data['ids'] = active_ids
+ data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+ return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
+
+account_cdr_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py
index 2c27dad545a..0e933f136e0 100644
--- a/addons/l10n_lu/__init__.py
+++ b/addons/l10n_lu/__init__.py
@@ -18,5 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
+
import wizard
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index d17d6b99828..4e289026c95 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -38,8 +38,7 @@ This module installs:
'account.tax.code.template.csv',
'l10n_lu_data.xml',
'account.tax.template.csv',
- 'l10n_lu_wizard.xml',
- 'l10n_lu_report.xml'
+ 'wizard/print_vat_view.xml'
],
'demo_xml': ['account.report.report.csv'],
'installable': True,
diff --git a/addons/l10n_lu/l10n_lu_report.xml b/addons/l10n_lu/l10n_lu_report.xml
deleted file mode 100644
index ba67c86b092..00000000000
--- a/addons/l10n_lu/l10n_lu_report.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
deleted file mode 100644
index da34f6456ab..00000000000
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- onskip
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/l10n_lu/wizard/__init__.py b/addons/l10n_lu/wizard/__init__.py
index 09b898f6497..140f04905ab 100644
--- a/addons/l10n_lu/wizard/__init__.py
+++ b/addons/l10n_lu/wizard/__init__.py
@@ -20,4 +20,5 @@
##############################################################################
import print_vat
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 4523e9aa89e..58cd78ca5a1 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -4,39 +4,13 @@
#Ingenieur fondateur
#Tranquil IT Systems
+from osv import osv, fields
-import wizard
-import time
-import datetime
import pooler
-import sys
-from mx.DateTime import *
import tools
+from tools.translate import _
from report.render import render
from report.interface import report_int
-import os
-
-
-_tax_form = """
-"""
-
-_tax_fields = {
- 'tax_code_id': {
- 'string': 'Company',
- 'type': 'many2one',
- 'relation': 'account.tax.code',
- 'required': True,
- 'domain': [('parent_id','=',False)]},
- 'period_id': {
- 'string':'Period',
- 'type': 'many2one',
- 'relation': 'account.period',
- 'required':True
- }
-}
class external_pdf(render):
def __init__(self, pdf):
@@ -56,9 +30,8 @@ class report_custom(report_int):
code_ids = taxobj.search(cr, uid, [('parent_id','child_of',[datas['form']['tax_code_id']])])
result = {}
for t in taxobj.browse(cr, uid, code_ids, {'period_id': datas['form']['period_id']}):
- if t.code:
+ if str(t.code):
result['case_'+str(t.code)] = '%.2f' % (t.sum_period or 0.0, )
-
user = pool.get('res.users').browse(cr, uid, uid, context)
# Not Clean, to be changed
@@ -68,26 +41,34 @@ class report_custom(report_int):
if partner.address:
result['info_address'] = partner.address[0].street
result['info_address2'] = (partner.address[0].zip or '') + ' ' + (partner.address[0].city or '')
-
- tools.pdf_utils.fill_pdf(tools.config['addons_path']+'/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
- self.obj = external_pdf(file('/tmp/output.pdf').read())
- self.obj.render()
- return (self.obj.pdf, 'pdf')
+ try:
+ tools.pdf_utils.fill_pdf(tools.config['addons_path']+'/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
+ self.obj = external_pdf(file('/tmp/output.pdf').read())
+ self.obj.render()
+ return (self.obj.pdf, 'pdf')
+ except Exception, e:
+ raise osv.except_osv(_('pdf not created !'), _('Please check if package pdftk is installed!'))
report_custom('report.l10n_lu.tax.report.print')
+class vat_declaration_report(osv.osv_memory):
+ _name = 'vat.declaration.report'
+ _description = 'VAT Declaration Report'
+
+ _columns = {
+ 'tax_code_id': fields.many2one('account.tax.code', 'Company', required=True, domain=[('parent_id','=',False)]),
+ 'period_id' : fields.many2one('account.period', 'Period', required=True)
+ }
+
+ def print_vat_declaration_report(self, cr, uid, ids, context=None):
+ active_ids = context.get('active_ids',[])
+ data = {}
+ data['form'] = {}
+ data['ids'] = active_ids
+ data['form']['tax_code_id'] = self.browse(cr, uid, ids)[0].tax_code_id.id
+ data['form']['period_id'] = self.browse(cr, uid, ids)[0].period_id.id
+ return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n_lu.tax.report.print', 'datas': data}
-class wizard_report(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':_tax_form, 'fields':_tax_fields, 'state':[('end','Cancel'),('pdf','Print Taxes Statement')]},
- },
- 'pdf': {
- 'actions': [],
- 'result': {'type':'print', 'report': 'l10n_lu.tax.report.print', 'state':'end'},
- },
- }
-wizard_report('l10n_lu.tax.report.wizard')
+vat_declaration_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
new file mode 100644
index 00000000000..2893670efb2
--- /dev/null
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ VAT Declaration Report
+ vat.declaration.report
+ form
+
+
+
+
+
+
+ VAT Declaration Report
+ ir.actions.act_window
+ vat.declaration.report
+ form
+ form
+
+ new
+
+
+
+
+
+