diff --git a/account_financial_report_webkit_xls/__init__.py b/account_financial_report_webkit_xls/__init__.py index 613d520b..d96f4819 100644 --- a/account_financial_report_webkit_xls/__init__.py +++ b/account_financial_report_webkit_xls/__init__.py @@ -20,5 +20,5 @@ # ############################################################################## -import wizard -import report +from . import wizard +from . import report diff --git a/account_financial_report_webkit_xls/report/__init__.py b/account_financial_report_webkit_xls/report/__init__.py index 4a29e4b9..b42b033e 100644 --- a/account_financial_report_webkit_xls/report/__init__.py +++ b/account_financial_report_webkit_xls/report/__init__.py @@ -20,10 +20,10 @@ # ############################################################################## -import general_ledger_xls -import trial_balance_xls -import partners_balance_xls -import partner_ledger_xls -import open_invoices_xls +from . import general_ledger_xls +from . import trial_balance_xls +from . import partners_balance_xls +from . import partner_ledger_xls +from . import open_invoices_xls # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/account_financial_report_webkit_xls/report/general_ledger_xls.py b/account_financial_report_webkit_xls/report/general_ledger_xls.py index bd170db1..967f3733 100644 --- a/account_financial_report_webkit_xls/report/general_ledger_xls.py +++ b/account_financial_report_webkit_xls/report/general_ledger_xls.py @@ -23,13 +23,13 @@ import xlwt import time from datetime import datetime -from report import report_sxw -from report_xls.report_xls import report_xls -from report_xls.utils import rowcol_to_cell -from account_financial_report_webkit.report.general_ledger import GeneralLedgerWebkit -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell +from openerp.addons.account_financial_report_webkit.report.general_ledger import GeneralLedgerWebkit +from openerp.tools.translate import _ +#import logging +#_logger = logging.getLogger(__name__) _column_sizes = [ ('date', 12), diff --git a/account_financial_report_webkit_xls/report/open_invoices_xls.py b/account_financial_report_webkit_xls/report/open_invoices_xls.py index f6617eb8..d88f314f 100644 --- a/account_financial_report_webkit_xls/report/open_invoices_xls.py +++ b/account_financial_report_webkit_xls/report/open_invoices_xls.py @@ -23,13 +23,13 @@ import xlwt import time from datetime import datetime -from report import report_sxw -from report_xls.report_xls import report_xls -from report_xls.utils import rowcol_to_cell -from account_financial_report_webkit.report.open_invoices import PartnersOpenInvoicesWebkit -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell +from openerp.addons.account_financial_report_webkit.report.open_invoices import PartnersOpenInvoicesWebkit +from openerp.tools.translate import _ +#import logging +#_logger = logging.getLogger(__name__) class open_invoices_xls(report_xls): column_sizes = [12,12,20,15,30,30,14,14,14,14,14,14,10] diff --git a/account_financial_report_webkit_xls/report/partner_ledger_xls.py b/account_financial_report_webkit_xls/report/partner_ledger_xls.py index e2c9ed11..18d190c5 100644 --- a/account_financial_report_webkit_xls/report/partner_ledger_xls.py +++ b/account_financial_report_webkit_xls/report/partner_ledger_xls.py @@ -23,13 +23,13 @@ import xlwt import time from datetime import datetime -from report import report_sxw -from report_xls.report_xls import report_xls -from report_xls.utils import rowcol_to_cell -from account_financial_report_webkit.report.partners_ledger import PartnersLedgerWebkit -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell +from openerp.addons.account_financial_report_webkit.report.partners_ledger import PartnersLedgerWebkit +from openerp.tools.translate import _ +#import logging +#_logger = logging.getLogger(__name__) _column_sizes = [ ('date', 12), diff --git a/account_financial_report_webkit_xls/report/partners_balance_xls.py b/account_financial_report_webkit_xls/report/partners_balance_xls.py index 0ed0d74b..6cfd6f0c 100644 --- a/account_financial_report_webkit_xls/report/partners_balance_xls.py +++ b/account_financial_report_webkit_xls/report/partners_balance_xls.py @@ -22,13 +22,13 @@ import xlwt import time -from report import report_sxw -from report_xls.report_xls import report_xls -from report_xls.utils import rowcol_to_cell -from account_financial_report_webkit.report.partner_balance import PartnerBalanceWebkit -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell +from openerp.addons.account_financial_report_webkit.report.partner_balance import PartnerBalanceWebkit +from openerp.tools.translate import _ +#import logging +#_logger = logging.getLogger(__name__) def display_line(all_comparison_lines): return any([line.get('balance') for line in all_comparison_lines]) diff --git a/account_financial_report_webkit_xls/report/trial_balance_xls.py b/account_financial_report_webkit_xls/report/trial_balance_xls.py index 3bf144a1..d6b7e3bf 100644 --- a/account_financial_report_webkit_xls/report/trial_balance_xls.py +++ b/account_financial_report_webkit_xls/report/trial_balance_xls.py @@ -22,13 +22,13 @@ import xlwt import time -from report import report_sxw -from report_xls.report_xls import report_xls -from report_xls.utils import rowcol_to_cell -from account_financial_report_webkit.report.trial_balance import TrialBalanceWebkit -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell +from openerp.addons.account_financial_report_webkit.report.trial_balance import TrialBalanceWebkit +from openerp.tools.translate import _ +#import logging +#_logger = logging.getLogger(__name__) class trial_balance_xls(report_xls): column_sizes = [12,60,17,17,17,17,17,17] diff --git a/account_financial_report_webkit_xls/wizard/__init__.py b/account_financial_report_webkit_xls/wizard/__init__.py index 3bff56c0..4efb87d5 100644 --- a/account_financial_report_webkit_xls/wizard/__init__.py +++ b/account_financial_report_webkit_xls/wizard/__init__.py @@ -20,8 +20,8 @@ # ############################################################################## -import general_ledger_wizard -import trial_balance_wizard -import partners_balance_wizard -import partners_ledger_wizard -import open_invoices_wizard \ No newline at end of file +from . import general_ledger_wizard +from . import trial_balance_wizard +from . import partners_balance_wizard +from . import partners_ledger_wizard +from . import open_invoices_wizard \ No newline at end of file diff --git a/account_financial_report_webkit_xls/wizard/general_ledger_wizard.py b/account_financial_report_webkit_xls/wizard/general_ledger_wizard.py index efe5a230..30cc6a88 100644 --- a/account_financial_report_webkit_xls/wizard/general_ledger_wizard.py +++ b/account_financial_report_webkit_xls/wizard/general_ledger_wizard.py @@ -20,11 +20,11 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import orm #import logging #_logger = logging.getLogger(__name__) -class general_ledger_webkit_wizard(osv.osv_memory): +class general_ledger_webkit_wizard(orm.TransientModel): _inherit = 'general.ledger.webkit' def xls_export(self, cr, uid, ids, context=None): @@ -40,5 +40,4 @@ class general_ledger_webkit_wizard(osv.osv_memory): 'datas': data} else: return super(general_ledger_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context) - -general_ledger_webkit_wizard() + diff --git a/account_financial_report_webkit_xls/wizard/open_invoices_wizard.py b/account_financial_report_webkit_xls/wizard/open_invoices_wizard.py index 859dec3b..ff01ca8a 100644 --- a/account_financial_report_webkit_xls/wizard/open_invoices_wizard.py +++ b/account_financial_report_webkit_xls/wizard/open_invoices_wizard.py @@ -20,11 +20,11 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import orm #import logging #_logger = logging.getLogger(__name__) -class open_invoices_webkit_wizard(osv.osv_memory): +class open_invoices_webkit_wizard(orm.TransientModel): _inherit = 'open.invoices.webkit' def xls_export(self, cr, uid, ids, context=None): @@ -40,5 +40,3 @@ class open_invoices_webkit_wizard(osv.osv_memory): 'datas': data} else: return super(open_invoices_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context) - -open_invoices_webkit_wizard() \ No newline at end of file diff --git a/account_financial_report_webkit_xls/wizard/partners_balance_wizard.py b/account_financial_report_webkit_xls/wizard/partners_balance_wizard.py index 00f13f66..2f574371 100644 --- a/account_financial_report_webkit_xls/wizard/partners_balance_wizard.py +++ b/account_financial_report_webkit_xls/wizard/partners_balance_wizard.py @@ -20,11 +20,11 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import orm #import logging #_logger = logging.getLogger(__name__) -class partner_balance_wizard(osv.osv_memory): +class partner_balance_wizard(orm.TransientModel): _inherit = 'partner.balance.webkit' def xls_export(self, cr, uid, ids, context=None): @@ -40,5 +40,4 @@ class partner_balance_wizard(osv.osv_memory): 'datas': data} else: return super(partner_balance_wizard, self)._print_report(cr, uid, ids, data, context=context) - -partner_balance_wizard() + diff --git a/account_financial_report_webkit_xls/wizard/partners_ledger_wizard.py b/account_financial_report_webkit_xls/wizard/partners_ledger_wizard.py index ebc64cda..7225f0cf 100644 --- a/account_financial_report_webkit_xls/wizard/partners_ledger_wizard.py +++ b/account_financial_report_webkit_xls/wizard/partners_ledger_wizard.py @@ -20,11 +20,11 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import orm #import logging #_logger = logging.getLogger(__name__) -class partner_ledger_webkit_wizard(osv.osv_memory): +class partner_ledger_webkit_wizard(orm.TransientModel): _inherit = 'partners.ledger.webkit' def xls_export(self, cr, uid, ids, context=None): @@ -40,4 +40,3 @@ class partner_ledger_webkit_wizard(osv.osv_memory): 'datas': data} else: return super(partner_ledger_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context) -partner_ledger_webkit_wizard() diff --git a/account_financial_report_webkit_xls/wizard/trial_balance_wizard.py b/account_financial_report_webkit_xls/wizard/trial_balance_wizard.py index 076eb9fd..dafb0ee9 100644 --- a/account_financial_report_webkit_xls/wizard/trial_balance_wizard.py +++ b/account_financial_report_webkit_xls/wizard/trial_balance_wizard.py @@ -20,11 +20,11 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import orm #import logging #_logger = logging.getLogger(__name__) -class trial_balance_wizard(osv.osv_memory): +class trial_balance_wizard(orm.TransientModel): _inherit = 'trial.balance.webkit' def xls_export(self, cr, uid, ids, context=None): @@ -40,5 +40,4 @@ class trial_balance_wizard(osv.osv_memory): 'datas': data} else: return super(trial_balance_wizard, self)._print_report(cr, uid, ids, data, context=context) - -trial_balance_wizard() +