openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04927
[Merge] lp:~openerp-dev/openobject-addons/fixed_report_training_report into lp:~openobject-training/openobject-addons/training
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/fixed_report_training_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/fixed_report_training_report/+merge/55931
Fixed some error of the report of training_report module
--
https://code.launchpad.net/~openerp-dev/openobject-addons/fixed_report_training_report/+merge/55931
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/fixed_report_training_report.
=== modified file 'training_report/report/count_subscriptions_offer.rml'
--- training_report/report/count_subscriptions_offer.rml 2010-09-24 10:51:54 +0000
+++ training_report/report/count_subscriptions_offer.rml 2011-04-01 13:32:28 +0000
@@ -201,7 +201,7 @@
<para style="terp_header_Centre">Subscriptions</para>
<section>
<blockTable colWidths="380.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer's Name</para></td>
<td><para style="terp_tblheader_Details_Right">Count</para></td>
</tr>
@@ -209,7 +209,7 @@
<td><para style="terp_default_8">[[ element[1].name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(element[0], grouping=True, digits=0) ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(get_subscriptions_count_all(data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']), grouping=True, digits=0) ]]</para></td>
</tr>
@@ -223,7 +223,7 @@
<para style="terp_header_Centre">Subscriptions (Y[[ data['form']['year'] ]])</para>
<section>
<blockTable colWidths="380.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer's Name</para></td>
<td><para style="terp_tblheader_Details_Right">Count</para></td>
</tr>
@@ -231,7 +231,7 @@
<td><para style="terp_default_8">[[ element[1].name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(element[0], grouping=True, digits=0) ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(get_subscriptions_count_all(data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']), grouping=True, digits=0) ]]</para></td>
</tr>
=== modified file 'training_report/report/session_report.rml'
--- training_report/report/session_report.rml 2010-09-24 10:51:54 +0000
+++ training_report/report/session_report.rml 2011-04-01 13:32:28 +0000
@@ -211,7 +211,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -221,7 +221,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('opened', data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']) ]] </para></td>
</tr>
@@ -238,7 +238,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -248,7 +248,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('inprogress', data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']) ]] </para></td>
</tr>
@@ -265,7 +265,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -275,7 +275,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('done', data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']) ]] </para></td>
</tr>
@@ -292,7 +292,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -302,7 +302,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('duplicated', data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']) ]] </para></td>
</tr>
@@ -319,7 +319,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -329,7 +329,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('cancelled', data['form']['selected_period']['date_start'], data['form']['selected_period']['date_stop']) ]] </para></td>
</tr>
@@ -357,7 +357,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -367,7 +367,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('opened', data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']) ]] </para></td>
</tr>
@@ -384,7 +384,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -394,7 +394,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('inprogress', data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']) ]] </para></td>
</tr>
@@ -411,7 +411,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -421,7 +421,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('done', data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']) ]] </para></td>
</tr>
@@ -438,7 +438,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -448,7 +448,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('duplicated', data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']) ]] </para></td>
</tr>
@@ -465,7 +465,7 @@
</blockTable>
<section>
<blockTable colWidths="200.0,200.0,100.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Offer</para></td>
<td><para style="terp_tblheader_Details_Right">Session</para></td>
<td><para style="terp_tblheader_Details_Right">Date</para></td>
@@ -475,7 +475,7 @@
<td><para style="terp_default_Right_8">[[ session.name ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(session.date, date_time=True)[:16] ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ get_sessions_count('cancelled', data['form']['old_period']['date_start'], data['form']['old_period']['date_stop']) ]] </para></td>
</tr>
=== modified file 'training_report/report/session_volume.py'
--- training_report/report/session_volume.py 2010-09-09 14:53:56 +0000
+++ training_report/report/session_volume.py 2011-04-01 13:32:28 +0000
@@ -2,9 +2,7 @@
import time
import datetime
from report import report_sxw
-
from tools.translate import _
-
import tools
class session_volume(report_sxw.rml_parse):
@@ -42,7 +40,7 @@
def _get_subscriptions_count_all(self, date_start, date_stop):
proxy = pooler.get_pool(self.cr.dbname).get('training.subscription.line')
- return proxy.search_count(self.cr, self.uid, [('session_id.date', '>=', date_start), ('session_id.date', '<=', date_stop)])
+ return proxy.search_count(self.cr, self.uid, [('session_id.date', '>=', date_start), ('session_id.date', '<=', date_stop)])
def _get_offers(self, date_start, date_stop):
pool = pooler.get_pool(self.cr.dbname)
@@ -51,13 +49,12 @@
sl_ids = proxy_sl.search(self.cr, self.uid, [('session_id.date', '>=', date_start), ('session_id.date', '<=', date_stop)])
offer_ids = set(val['offer_id'] for val in proxy_sl.read(self.cr, self.uid, sl_ids, ['offer_id']))
-
proxy_offer = pool.get('training.offer')
values = []
for offer_id in offer_ids:
- sl_count = proxy_sl.search_count(self.cr, self.uid, [('session_id.date', '>=', date_start), ('session_id.date', '<=', date_stop), ('session_id.offer_id', '=', offer_id)])
- values.append((sl_count, proxy_offer.browse(self.cr, self.uid, offer_id)))
-
+ sl_count = proxy_sl.search_count(self.cr, self.uid, [('session_id.date', '>=', date_start), ('session_id.date', '<=', date_stop), ('session_id.offer_id', '=', offer_id[0])])
+ data = proxy_offer.browse(self.cr, self.uid, offer_id[0])
+ values.append((sl_count, proxy_offer.browse(self.cr, self.uid, offer_id[0])))
values.sort(reverse=True)
return values
=== modified file 'training_report/report/session_volume_theoretical.rml'
--- training_report/report/session_volume_theoretical.rml 2010-09-24 10:51:54 +0000
+++ training_report/report/session_volume_theoretical.rml 2011-04-01 13:32:28 +0000
@@ -136,7 +136,7 @@
<section>
<para style="terp_default_9"></para>
<blockTable colWidths="310.0,50.0,50.0,50.0,50.0" style="Table2" reapeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Product Line</para></td>
<td><para style="terp_tblheader_Details_Right">Revenues</para></td>
<td><para style="terp_tblheader_Details_Right">Costs</para></td>
@@ -150,7 +150,7 @@
<td><para style="terp_default_Right_8">[[ formatLang(pl['balance'], grouping=True) ]]</para></td>
<td><para style="terp_default_Right_8">[[ isinstance(pl['margin'], (str,unicode)) and pl['margin'] or formatLang(pl['margin'], grouping=True) ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_standard']['total']['revenues'], grouping=True) ]]</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_standard']['total']['costs'], grouping=True) ]]</para></td>
@@ -173,7 +173,7 @@
<section>
<para style="terp_default_9"></para>
<blockTable colWidths="310.0,50.0,50.0,50.0,50.0" style="Table2" repeatRows="1">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Product Line</para></td>
<td><para style="terp_tblheader_Details_Right">Revenues</para></td>
<td><para style="terp_tblheader_Details_Right">Costs</para></td>
@@ -187,7 +187,7 @@
<td><para style="terp_default_Right_8">[[ formatLang(prodline['balance']) ]]</para></td>
<td><para style="terp_default_Right_8">[[ formatLang(prodline['margin']) ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_exam']['total']['revenues'], grouping=True) ]]</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_exam']['total']['costs'], grouping=True) ]]</para></td>
@@ -211,7 +211,7 @@
<section>
<para style="terp_default_9"></para>
<blockTable colWidths="310.0,50.0,50.0,50.0,50.0" style="Table2">
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Product Line</para></td>
<td><para style="terp_tblheader_Details_Right">Revenues</para></td>
<td><para style="terp_tblheader_Details_Right">Costs</para></td>
@@ -225,7 +225,7 @@
<td><para style="terp_default_Right_8">[[ formatLang(pl['balance'], grouping=True) ]]</para></td>
<td><para style="terp_default_Right_8">[[ isinstance(pl['margin'], (str,unicode)) and pl['margin'] or formatLang(pl['margin'], grouping=True) ]]</para></td>
</tr>
- <tr style="Table_Header_Tile">
+ <tr>
<td><para style="terp_tblheader_Details">Total</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_intra']['total']['revenues'], grouping=True) ]]</para></td>
<td><para style="terp_tblheader_Details_Right">[[ formatLang(data['form']['selected_period_intra']['total']['costs'], grouping=True) ]]</para></td>
Follow ups
