From 5d67b0fe7430344d3ba9f44a6e65c406625422c2 Mon Sep 17 00:00:00 2001 From: "RGA (OpenERP)" Date: Thu, 11 Nov 2010 16:34:20 +0530 Subject: [PATCH 01/45] [IMP] group by header should display how many children it has bzr revid: rga@tinyerp.com-20101111110420-ay27xo0a5g98f7aq --- bin/osv/orm.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 2b7fe0ce989..2f29d413e31 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2240,7 +2240,7 @@ class orm(orm_template): fget = self.fields_get(cr, uid, fields) float_int_fields = filter(lambda x: fget[x]['type'] in ('float', 'integer'), fields) flist = '' - group_by = groupby + group_count = group_by = groupby if groupby: if fget.get(groupby): if fget[groupby]['type'] in ('date', 'datetime'): @@ -2270,7 +2270,9 @@ class orm(orm_template): where_clause = where_clause and ' WHERE ' + where_clause limit_str = limit and ' limit %d' % limit or '' offset_str = offset and ' offset %d' % offset or '' - cr.execute('SELECT min(%s.id) AS id,' % self._table + flist + ' FROM ' + from_clause + where_clause + gb + limit_str + offset_str, where_clause_params) + if len(groupby_list) < 2 and context.get('group_by_no_leaf'): + group_count = '_' + cr.execute('SELECT min(%s.id) AS id, count(%s.id) AS %s_count, ' % (self._table, self._table, group_count) + flist + ' FROM ' + from_clause + where_clause + gb + limit_str + offset_str, where_clause_params) alldata = {} groupby = group_by for r in cr.dictfetchall(): From 92f7f6c994d2bf0d34297fb15840d66b1770f6ee Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Sun, 14 Nov 2010 14:57:22 +0530 Subject: [PATCH 02/45] [IMP]: Use capital letters for main words in Account and HR dashboard. bzr revid: rch@tinyerp.com-20101114092722-1x4m4nzmt64oe4xl --- addons/account/board_account_view.xml | 2 +- addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 528d986d729..bcedc3fa491 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -49,7 +49,7 @@ - + diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml index 792ea34ae53..96d91ef3e5c 100644 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml @@ -68,7 +68,7 @@ - + From bd531a11c4d2c7e3f2a2591ea0bcbb4b24b0438a Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 15 Nov 2010 10:54:09 +0530 Subject: [PATCH 03/45] [IMP]:survey:set title and author bzr revid: apa@tinyerp.com-20101115052409-a5h15b841wy2sd2d --- addons/survey/report/survey_analysis_report.py | 2 +- addons/survey/report/survey_browse_response.py | 2 +- addons/survey/report/survey_form.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py index 6f6c30e1f1d..34bcd366d0f 100644 --- a/addons/survey/report/survey_analysis_report.py +++ b/addons/survey/report/survey_analysis_report.py @@ -35,7 +35,7 @@ class survey_analysis(report_rml): company=user_obj.browse(cr,uid,[uid],context)[0].company_id rml =""" -