openerp-dev-web team mailing list archive

["gpa\(Open ERP\)" <gpa@xxxxxxxxxxx>]

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training_extra_tr_style_report into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/training_extra_tr_style_report/+merge/60578

Moved tr style tag report to training_extra_report module
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/training_extra_tr_style_report/+merge/60578
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training_extra_tr_style_report.

=== modified file 'training_extra_report/__openerp__.py'
--- training_extra_report/__openerp__.py	2011-05-10 12:34:43 +0000
+++ training_extra_report/__openerp__.py	2011-05-11 04:55:47 +0000
@@ -42,6 +42,7 @@
         'training_diagnostic_report.xml',
         'training_evaluation_report.xml',
         'wizard/training_exam_print_questionnaire_raw_view.xml',
+        'wizard/training_report_session_volume_view.xml',
     ],
     'active' : False,
     'installable' : True,

=== modified file 'training_extra_report/report/__init__.py'
--- training_extra_report/report/__init__.py	2011-05-10 12:20:22 +0000
+++ training_extra_report/report/__init__.py	2011-05-11 04:55:47 +0000
@@ -30,5 +30,6 @@
 import diagnostic
 import diagnostic_results
 import in_construction
+import session_volume
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'training_report/report/count_subscriptions_offer.rml' => 'training_extra_report/report/count_subscriptions_offer.rml'
=== renamed file 'training_report/report/session_report.rml' => 'training_extra_report/report/session_report.rml'
=== renamed file 'training_report/report/session_volume.py' => 'training_extra_report/report/session_volume.py'
--- training_report/report/session_volume.py	2011-04-01 13:23:47 +0000
+++ training_extra_report/report/session_volume.py	2011-05-11 04:55:47 +0000
@@ -119,25 +119,25 @@
 
 report_sxw.report_sxw('report.training.session.volume',
                       'training.session',
-                      'addons/training_report/report/session_volume.rml',
+                      'addons/training_extra_report/report/session_volume.rml',
                       parser=session_volume, header=True)
 
 report_sxw.report_sxw('report.training.session.volume.theoretical',
                       'training.session',
-                      'addons/training_report/report/session_volume_theoretical.rml',
+                      'addons/training_extra_report/report/session_volume_theoretical.rml',
                       parser=session_volume, header=True)
 
 report_sxw.report_sxw('report.training.session.report',
                       'training.session',
-                      'addons/training_report/report/session_report.rml',
+                      'addons/training_extra_report/report/session_report.rml',
                       parser=session_volume, header=True),
 
 report_sxw.report_sxw('report.training.count.subscriptions.offer',
                       'training.subscription.line',
-                      'addons/training_report/report/count_subscriptions_offer.rml',
+                      'addons/training_extra_report/report/count_subscriptions_offer.rml',
                       parser=session_volume, header=True)
 
 report_sxw.report_sxw('report.training.subscriptions.partner',
                       'training.session',
-                      'addons/training_report/report/subscriptions_partner.rml',
+                      'addons/training_extra_report/report/subscriptions_partner.rml',
                       parser=session_volume, header=True)

=== renamed file 'training_report/report/session_volume.rml' => 'training_extra_report/report/session_volume.rml'
=== renamed file 'training_report/report/session_volume_theoretical.rml' => 'training_extra_report/report/session_volume_theoretical.rml'
=== renamed file 'training_report/report/subscriptions_partner.rml' => 'training_extra_report/report/subscriptions_partner.rml'
=== modified file 'training_extra_report/wizard/__init__.py'
--- training_extra_report/wizard/__init__.py	2011-05-10 12:34:43 +0000
+++ training_extra_report/wizard/__init__.py	2011-05-11 04:55:47 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ############################################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
 #    Copyright (C) 2010-2011 Thamini S.Ã .R.L (<http://www.thamini.com>). All Rights Reserved
@@ -23,5 +23,5 @@
 ############################################################################################
 
 import training_exam_print_questionnaire_raw
-
+import training_report_session_volume
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'training_report/wizard/training_report_session_volume.py' => 'training_extra_report/wizard/training_report_session_volume.py'
--- training_report/wizard/training_report_session_volume.py	2011-03-17 10:30:53 +0000
+++ training_extra_report/wizard/training_report_session_volume.py	2011-05-11 04:55:47 +0000
@@ -24,7 +24,6 @@
 from osv import fields
 import time
 import tools
-
 from tools.translate import _
 import mx.DateTime as dt
 
@@ -37,7 +36,7 @@
     'kind' : fields.selection([
                   ('product_lines', 'Statistics by Product Lines'),
                   ('theoretical_product_lines', 'Theoretical Statistics by Product Lines'),
-                  ('sessions', 'Sessions volume by State'),
+                  ('sessions', 'Sessions Volume by State'),
                   ('count_subscriptions_offer', 'Subscription Volume by State'),
                   #('subscriptions_partner', 'Partner Amount of Subscriptions'),
               ], 'Kind', required=True)

=== renamed file 'training_report/wizard/training_report_session_volume_view.xml' => 'training_extra_report/wizard/training_report_session_volume_view.xml'
=== modified file 'training_report/__openerp__.py'
--- training_report/__openerp__.py	2011-03-17 10:30:53 +0000
+++ training_report/__openerp__.py	2011-05-11 04:55:47 +0000
@@ -45,7 +45,6 @@
         'training_report.xml',
         'wizard/training_report_account_analytic_balance_year_view.xml',
         'wizard/training_report_course_profitability_view.xml',
-        'wizard/training_report_session_volume_view.xml',
     ],
     'demo_xml': [],
     'installable': True,

=== modified file 'training_report/report/__init__.py'
--- training_report/report/__init__.py	2010-03-10 20:55:08 +0000
+++ training_report/report/__init__.py	2011-05-11 04:55:47 +0000
@@ -23,8 +23,6 @@
 
 import analytic_balance_year
 import course_profitability
-import session_volume
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'training_report/wizard/__init__.py'
--- training_report/wizard/__init__.py	2011-03-17 10:30:53 +0000
+++ training_report/wizard/__init__.py	2011-05-11 04:55:47 +0000
@@ -23,7 +23,6 @@
 
 import training_report_account_analytic_balance_year
 import training_report_course_profitability
-import training_report_session_volume
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: