summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorVir (Open ERP) <vir@tinyerp.com>2010-09-21 12:37:36 +0530
committerVir (Open ERP) <vir@tinyerp.com>2010-09-21 12:37:36 +0530
commit523161552eab16e391de8aafa91c733b8a3aa35c (patch)
treee1d6bcf8459305e31fa0340ce69124e410ff7cfe /addons
parent76ca2a71349658c36ee9131775a5a3f5eeba5de2 (diff)
[MOD/IMP] idea, subscription : Improvements in tooltip
bzr revid: vir@tinyerp.com-20100921070736-pdszbx65t36ha1w3
Diffstat (limited to 'addons')
-rw-r--r--addons/idea/report/report_vote_view.xml10
-rw-r--r--addons/subscription/subscription.py4
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 201bdd40721..9556f86a281 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -31,15 +31,15 @@
<group>
<filter icon="terp-go-year" string=" Year "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
- help="Idea Vote created last 365 days"/>
+ help="Idea Vote created in curren year"/>
<filter icon="terp-go-month" string=" Month "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
- help="Idea Vote created in last 30 days"/>
+ help="Idea Vote created in current month"/>
<filter icon="terp-go-month"
string=" Month-1 "
separator="1"
domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
- help="Idea Vote created last 7 days"/>
+ help="Idea Vote created last month"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today"
string=" Today "
@@ -60,12 +60,12 @@
domain="[('idea_state','=',('cancel'))]"/>
<separator orientation="vertical"/>
<field name="idea_id" string="Idea"/>
- <field name="creater_id" string="creater"/>
+ <field name="creater_id" string="creator"/>
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
- <filter string="creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+ <filter string="creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
<filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Idea" icon="terp-idea" context="{'group_by':'idea_id'}"/>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 8fa330b1fb5..307f06c6f91 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -53,7 +53,7 @@ class subscription_document_fields(osv.osv):
_rec_name = 'field'
_columns = {
'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),
- 'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40, help="User can set new values for the field when new document is generated"),
+ 'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40, help="Default value is considered for field when new document is generated."),
'document_id': fields.many2one('subscription.document', 'Subscription Document', ondelete='cascade'),
}
_defaults = {}
@@ -79,7 +79,7 @@ class subscription_subscription(osv.osv):
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
- 'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which run on subscription"),
+ 'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription"),
'note': fields.text('Notes', help="Description or Summary of Subscription"),
}
_defaults = {