diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 39e40555f39..04f55566d40 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -18,8 +18,6 @@
# along with this program. If not, see .
#
##############################################################################
-
-
{
"name" : "Accounting and Financial Management",
"version" : "1.1",
@@ -119,6 +117,8 @@ module named account_vouchers
'report/account_account_report_view.xml',
'report/account_analytic_entries_report_view.xml',
'board_account_view.xml',
+ "wizard/account_pl_report_view.xml",
+ "wizard/account_bs_report_view.xml"
],
'demo_xml': [
#'demo/price_accuracy00.yml',
@@ -145,4 +145,4 @@ module named account_vouchers
'active': False,
'certificate': '0080331923549',
}
-# 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/account/report/__init__.py b/addons/account/report/__init__.py
index ad965e04b57..ee139c3040c 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -40,5 +40,7 @@ import account_account_report
import account_entries_report
import account_analytic_entries_report
import voucher_print
+import report_bs
+import report_pl
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_india/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml
similarity index 100%
rename from addons/account_report_india/report/report_balance_sheet.rml
rename to addons/account/report/report_balance_sheet.rml
diff --git a/addons/account_report_india/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml
similarity index 100%
rename from addons/account_report_india/report/report_balance_sheet_horizontal.rml
rename to addons/account/report/report_balance_sheet_horizontal.rml
diff --git a/addons/account_report_india/report/report_bs.py b/addons/account/report/report_bs.py
similarity index 96%
rename from addons/account_report_india/report/report_bs.py
rename to addons/account/report/report_bs.py
index 51b2f349224..5a7294338c5 100644
--- a/addons/account_report_india/report/report_bs.py
+++ b/addons/account/report/report_bs.py
@@ -24,7 +24,7 @@ import time
import mx.DateTime
import rml_parse
from report import report_sxw
-from account_report_india.report import report_pl
+from account.report import report_pl
class report_balancesheet_horizontal(rml_parse.rml_parse):
def __init__(self, cr, uid, name, context):
@@ -195,9 +195,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
return comp_obj.name
report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
- 'addons/account_report_india/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
+ 'addons/account/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
header=False)
report_sxw.report_sxw('report.account.balancesheet', 'account.account',
- 'addons/account_report_india/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
+ 'addons/account/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
header=False)
diff --git a/addons/account_report_india/report/report_pl.py b/addons/account/report/report_pl.py
similarity index 96%
rename from addons/account_report_india/report/report_pl.py
rename to addons/account/report/report_pl.py
index b8b77e08be9..c693b9940c9 100644
--- a/addons/account_report_india/report/report_pl.py
+++ b/addons/account/report/report_pl.py
@@ -170,8 +170,8 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
return comp_obj.name
report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
- 'addons/account_report_india/report/report_pl_account_horizontal.rml',parser=report_pl_account_horizontal, header=False)
+ 'addons/account/report/report_pl_account_horizontal.rml',parser=report_pl_account_horizontal, header=False)
report_sxw.report_sxw('report.pl.account', 'account.account',
- 'addons/account_report_india/report/report_pl_account.rml',parser=report_pl_account_horizontal, header=False)
+ 'addons/account/report/report_pl_account.rml',parser=report_pl_account_horizontal, header=False)
diff --git a/addons/account_report_india/report/report_pl_account.rml b/addons/account/report/report_pl_account.rml
similarity index 100%
rename from addons/account_report_india/report/report_pl_account.rml
rename to addons/account/report/report_pl_account.rml
diff --git a/addons/account_report_india/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml
similarity index 100%
rename from addons/account_report_india/report/report_pl_account_horizontal.rml
rename to addons/account/report/report_pl_account_horizontal.rml
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index c56c6c2e764..1dea8e8d4f3 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -58,6 +58,8 @@ import account_central_journal
import account_general_journal
import account_change_currency
+import account_bs_report
+import account_pl_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_india/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py
similarity index 100%
rename from addons/account_report_india/wizard/account_bs_report.py
rename to addons/account/wizard/account_bs_report.py
diff --git a/addons/account_report_india/wizard/account_bs_report_view.xml b/addons/account/wizard/account_bs_report_view.xml
similarity index 100%
rename from addons/account_report_india/wizard/account_bs_report_view.xml
rename to addons/account/wizard/account_bs_report_view.xml
diff --git a/addons/account_report_india/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py
similarity index 100%
rename from addons/account_report_india/wizard/account_pl_report.py
rename to addons/account/wizard/account_pl_report.py
diff --git a/addons/account/wizard/account_pl_report_view.xml b/addons/account/wizard/account_pl_report_view.xml
new file mode 100644
index 00000000000..b1104df8d25
--- /dev/null
+++ b/addons/account/wizard/account_pl_report_view.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+ Select period
+ account.pl.report
+ form
+
+
+
+
+
+
+ Account Profit And Loss
+ account.pl.report
+ ir.actions.act_window
+ form
+ form
+
+ new
+
+
+
+ Account Chart
+ account.pl.report
+ form
+
+
+
+
+
+
+ Select Account
+ account.pl.report
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
+
+
+
+
+
+
+
+
diff --git a/addons/account_report_india/__init__.py b/addons/account_report_india/__init__.py
deleted file mode 100644
index f8c96cb3c42..00000000000
--- a/addons/account_report_india/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-import report
-import wizard
diff --git a/addons/account_report_india/__openerp__.py b/addons/account_report_india/__openerp__.py
deleted file mode 100644
index 0765af339a1..00000000000
--- a/addons/account_report_india/__openerp__.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-{
- "name" : "Accounting Reports",
- "version" : "1.0",
- "depends" : [
- "account"
- ],
- "author" : "Tiny ERP",
- "description": """Accounting Reports
-Modules gives the 2 most Important Reports for the Accounting
-* Profit and Loss Account
-* Balance Sheet
- """,
- "website" : "http://tinyerp.com/module_account.html",
- "category" : "Generic Modules/Accounting",
- "init_xml" : [
- ],
- "demo_xml" : [
-
- ],
- "update_xml" : [
- "wizard/account_pl_report_view.xml",
- "wizard/account_bs_report_view.xml"
- ],
- "active": False,
- "installable": True
-}
diff --git a/addons/account_report_india/report/__init__.py b/addons/account_report_india/report/__init__.py
deleted file mode 100755
index 5bcdacfefaf..00000000000
--- a/addons/account_report_india/report/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-import report_bs
-import report_pl
diff --git a/addons/account_report_india/report/rml_parse.py b/addons/account_report_india/report/rml_parse.py
deleted file mode 100755
index 2d2c1d5a763..00000000000
--- a/addons/account_report_india/report/rml_parse.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-from report import report_sxw
-import xml.dom.minidom
-import os, time
-import osv
-import re
-import tools
-import pooler
-import re
-import sys
-
-
-class rml_parse(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(rml_parse, self).__init__(cr, uid, name, context=None)
- self.localcontext.update({
- 'comma_me': self.comma_me,
- 'format_date': self._get_and_change_date_format_for_swiss,
- 'strip_name' : self._strip_name,
- 'explode_name' : self._explode_name,
- })
-
- def comma_me(self,amount):
- #print "#" + str(amount) + "#"
- if not amount:
- amount = 0.0
- if type(amount) is float :
- amount = str('%.2f'%amount)
- else :
- amount = str(amount)
- if (amount == '0'):
- return ' '
- orig = amount
- new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
- if orig == new:
- return new
- else:
- return self.comma_me(new)
-
- def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
- ellipsis = ellipsis or ''
- try:
- return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
- except Exception, e:
- return False
-
- def _strip_name(self, name, maxlen=50):
- return self._ellipsis(name, maxlen, '...')
-
- def _get_and_change_date_format_for_swiss (self,date_to_format):
- date_formatted=''
- if date_to_format:
- date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
- return date_formatted
-
- def _explode_name(self,chaine,length):
- # We will test if the size is less then account
- full_string = ''
- if (len(str(chaine)) <= length):
- return chaine
- #
- else:
- chaine = unicode(chaine,'utf8').encode('iso-8859-1')
- rup = 0
- for carac in chaine:
- rup = rup + 1
- if rup == length:
- full_string = full_string + '\n'
- full_string = full_string + carac
- rup = 0
- else:
- full_string = full_string + carac
-
- return full_string
-
- def makeAscii(self,str):
- try:
- Stringer = str.encode("utf-8")
- except UnicodeDecodeError:
- try:
- Stringer = str.encode("utf-16")
- except UnicodeDecodeError:
- print "UTF_16 Error"
- Stringer = str
- else:
- return Stringer
- else:
- return Stringer
- return Stringer
-
- def explode_this(self,chaine,length):
- #chaine = self.repair_string(chaine)
- chaine = rstrip(chaine)
- ast = list(chaine)
- i = length
- while i <= len(ast):
- ast.insert(i,'\n')
- i = i + length
- chaine = str("".join(ast))
- return chaine
-
- def repair_string(self,chaine):
- ast = list(chaine)
- UnicodeAst = []
- _previouslyfound = False
- i = 0
- #print str(ast)
- while i < len(ast):
- elem = ast[i]
- try:
- Stringer = elem.encode("utf-8")
- except UnicodeDecodeError:
- to_reencode = elem + ast[i+1]
- print str(to_reencode)
- Good_char = to_reencode.decode('utf-8')
- UnicodeAst.append(Good_char)
- i += i +2
- else:
- UnicodeAst.append(elem)
- i += i + 1
- return "".join(UnicodeAst)
-
- def ReencodeAscii(self,str):
- print sys.stdin.encoding
- try:
- Stringer = str.decode("ascii")
- except UnicodeEncodeError:
- print "REENCODING ERROR"
- return str.encode("ascii")
- except UnicodeDecodeError:
- print "DECODING ERROR"
- return str.encode("ascii")
- else:
- print Stringer
- return Stringer
-
- def _add_header(self, node, header=1):
- if header==2:
- rml_head = self.rml_header2
- else:
- rml_head = self.rml_header
- rml_head = rml_head.replace('',''' [[company.logo]] ''')
- return True
-
-
-
diff --git a/addons/account_report_india/wizard/__init__.py b/addons/account_report_india/wizard/__init__.py
deleted file mode 100755
index 2a870d96fad..00000000000
--- a/addons/account_report_india/wizard/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import account_bs_report
-import account_pl_report
\ No newline at end of file
diff --git a/addons/account_report_india/wizard/account_pl_report_view.xml b/addons/account_report_india/wizard/account_pl_report_view.xml
deleted file mode 100644
index e4ef4c5434e..00000000000
--- a/addons/account_report_india/wizard/account_pl_report_view.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
- Select period
- account.pl.report
- form
-
-
-
-
-
-
- Account Profit And Loss
- account.pl.report
- ir.actions.act_window
- form
- form
-
- new
-
-
-
- Account Chart
- account.pl.report
- form
-
-
-
-
-
-
- Select Account
- account.pl.report
- ir.actions.act_window
- form
- tree,form
-
- {'record_id':active_id}
- new
-
-
-
-
-
-
-
-