Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--state_improvement-ssu
into lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1-.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--state_improvement-ssu/+merge/86685
Hello sir,
I have improved all state fields by labels and db name in required files.
Thank you.
SSU
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--state_improvement-ssu/+merge/86685
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1-.
=== modified file 'base_calendar/calendar_event.py'
--- base_calendar/calendar_event.py 2011-12-04 06:22:14 +0000
+++ base_calendar/calendar_event.py 2011-12-22 11:23:16 +0000
@@ -60,9 +60,9 @@
'category_id': fields.many2one('calendar.event.category', 'Category'),
'allday': fields.boolean('All Day', states={'done': [('readonly', True)]}),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event information without removing it."),
- 'state': fields.selection([('draft', 'Draft'),
- ('confirmed', 'Confirmed'),
- ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True),
+ 'state': fields.selection([('draft', 'Unconfirmed'),
+ ('confirm', 'Confirmed'),
+ ('cancel', 'Cancelled'), ('done', 'Done')], 'State', readonly=True),
}
_defaults = {
@@ -136,12 +136,12 @@
def do_cancel(self, cr, uid, ids, context=None, *args):
""" Makes event as Cancellled
"""
- return self.write(cr, uid, ids, {'state': 'cancelled'}, context)
+ return self.write(cr, uid, ids, {'state': 'cancel'}, context)
def do_confirm(self, cr, uid, ids, context=None, *args):
""" Makes event as Confirmed
"""
- return self.write(cr, uid, ids, {'state': 'confirmed'}, context)
+ return self.write(cr, uid, ids, {'state': 'confirm'}, context)
def do_done(self, cr, uid, ids, context=None, *args):
""" Makes event as closed
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2011-08-04 12:58:47 +0000
+++ base_calendar/calendar_event_view.xml 2011-12-22 11:23:16 +0000
@@ -58,17 +58,17 @@
<field name="state" select="2" />
<button name="do_cancel"
string="Cancel"
- states="draft,confirmed"
+ states="draft,confirm"
type="object"
icon="gtk-cancel" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
<button name="set_as_draft"
- states="confirmed,cancelled"
- string="Set As Draft"
+ states="confirm,cancel"
+ string="Set As Unconfirmed"
type="object"
icon="terp-crm" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
<button name="do_confirm"
string="Confirm"
- states="draft,cancelled"
+ states="draft,cancel"
type="object"
icon="gtk-apply" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
</group>
@@ -181,7 +181,7 @@
help="My Events" />
<separator orientation="vertical"/>
<filter icon="terp-check" string="Confirmed"
- domain="[('state','=','confirmed')]"
+ domain="[('state','=','confirm')]"
help="Confirmed Events" />
<separator orientation="vertical"/>
<field name="name" string="Summary"/>
=== modified file 'base_calendar/i18n/af.po'
--- base_calendar/i18n/af.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/af.po 2011-12-22 11:23:16 +0000
@@ -863,7 +863,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/ar.po'
--- base_calendar/i18n/ar.po 2011-11-11 04:53:59 +0000
+++ base_calendar/i18n/ar.po 2011-12-22 11:23:16 +0000
@@ -860,7 +860,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/base_calendar.pot'
--- base_calendar/i18n/base_calendar.pot 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/base_calendar.pot 2011-12-22 11:23:16 +0000
@@ -843,7 +843,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/bg.po'
--- base_calendar/i18n/bg.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/bg.po 2011-12-22 11:23:16 +0000
@@ -857,7 +857,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Проект"
#. module: base_calendar
=== modified file 'base_calendar/i18n/bn.po'
--- base_calendar/i18n/bn.po 2011-11-22 05:00:46 +0000
+++ base_calendar/i18n/bn.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/bs.po'
--- base_calendar/i18n/bs.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/bs.po 2011-12-22 11:23:16 +0000
@@ -855,7 +855,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/ca.po'
--- base_calendar/i18n/ca.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/ca.po 2011-12-22 11:23:16 +0000
@@ -869,7 +869,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Esborrany"
#. module: base_calendar
=== modified file 'base_calendar/i18n/cs.po'
--- base_calendar/i18n/cs.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/cs.po 2011-12-22 11:23:16 +0000
@@ -857,7 +857,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Koncept"
#. module: base_calendar
=== modified file 'base_calendar/i18n/da.po'
--- base_calendar/i18n/da.po 2011-11-09 18:12:56 +0000
+++ base_calendar/i18n/da.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/de.po'
--- base_calendar/i18n/de.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/de.po 2011-12-22 11:23:16 +0000
@@ -866,7 +866,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Entwurf"
#. module: base_calendar
=== modified file 'base_calendar/i18n/el.po'
--- base_calendar/i18n/el.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/el.po 2011-12-22 11:23:16 +0000
@@ -860,7 +860,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Πρόχειρο"
#. module: base_calendar
=== modified file 'base_calendar/i18n/es.po'
--- base_calendar/i18n/es.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/es.po 2011-12-22 11:23:16 +0000
@@ -869,7 +869,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Borrador"
#. module: base_calendar
=== modified file 'base_calendar/i18n/es_EC.po'
--- base_calendar/i18n/es_EC.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/es_EC.po 2011-12-22 11:23:16 +0000
@@ -864,7 +864,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/es_MX.po'
--- base_calendar/i18n/es_MX.po 2011-10-07 20:11:44 +0000
+++ base_calendar/i18n/es_MX.po 2011-12-22 11:23:16 +0000
@@ -869,7 +869,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Borrador"
#. module: base_calendar
=== modified file 'base_calendar/i18n/es_PY.po'
--- base_calendar/i18n/es_PY.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/es_PY.po 2011-12-22 11:23:16 +0000
@@ -868,7 +868,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Borrador"
#. module: base_calendar
=== modified file 'base_calendar/i18n/es_VE.po'
--- base_calendar/i18n/es_VE.po 2011-10-07 19:35:00 +0000
+++ base_calendar/i18n/es_VE.po 2011-12-22 11:23:16 +0000
@@ -869,7 +869,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Borrador"
#. module: base_calendar
=== modified file 'base_calendar/i18n/et.po'
--- base_calendar/i18n/et.po 2011-11-09 18:12:56 +0000
+++ base_calendar/i18n/et.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/fa.po'
--- base_calendar/i18n/fa.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/fa.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/fi.po'
--- base_calendar/i18n/fi.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/fi.po 2011-12-22 11:23:16 +0000
@@ -859,7 +859,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Luonnos"
#. module: base_calendar
=== modified file 'base_calendar/i18n/fr.po'
--- base_calendar/i18n/fr.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/fr.po 2011-12-22 11:23:16 +0000
@@ -862,7 +862,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Brouillon"
#. module: base_calendar
=== modified file 'base_calendar/i18n/gl.po'
--- base_calendar/i18n/gl.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/gl.po 2011-12-22 11:23:16 +0000
@@ -863,7 +863,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Borrador"
#. module: base_calendar
=== modified file 'base_calendar/i18n/hr.po'
--- base_calendar/i18n/hr.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/hr.po 2011-12-22 11:23:16 +0000
@@ -860,7 +860,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Nacrt"
#. module: base_calendar
=== modified file 'base_calendar/i18n/hu.po'
--- base_calendar/i18n/hu.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/hu.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Tervezet"
#. module: base_calendar
=== modified file 'base_calendar/i18n/it.po'
--- base_calendar/i18n/it.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/it.po 2011-12-22 11:23:16 +0000
@@ -861,7 +861,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Bozza"
#. module: base_calendar
=== modified file 'base_calendar/i18n/ln.po'
--- base_calendar/i18n/ln.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/ln.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/lt.po'
--- base_calendar/i18n/lt.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/lt.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Juodraštis"
#. module: base_calendar
=== modified file 'base_calendar/i18n/lv.po'
--- base_calendar/i18n/lv.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/lv.po 2011-12-22 11:23:16 +0000
@@ -855,7 +855,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Melnraksts"
#. module: base_calendar
=== modified file 'base_calendar/i18n/mn.po'
--- base_calendar/i18n/mn.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/mn.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Ноорог"
#. module: base_calendar
=== modified file 'base_calendar/i18n/nb.po'
--- base_calendar/i18n/nb.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/nb.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/nl.po'
--- base_calendar/i18n/nl.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/nl.po 2011-12-22 11:23:16 +0000
@@ -864,7 +864,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Concept"
#. module: base_calendar
=== modified file 'base_calendar/i18n/pl.po'
--- base_calendar/i18n/pl.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/pl.po 2011-12-22 11:23:16 +0000
@@ -862,7 +862,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Projekt"
#. module: base_calendar
=== modified file 'base_calendar/i18n/pt.po'
--- base_calendar/i18n/pt.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/pt.po 2011-12-22 11:23:16 +0000
@@ -855,7 +855,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Rascunho"
#. module: base_calendar
=== modified file 'base_calendar/i18n/pt_BR.po'
--- base_calendar/i18n/pt_BR.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/pt_BR.po 2011-12-22 11:23:16 +0000
@@ -865,7 +865,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Rascunho"
#. module: base_calendar
=== modified file 'base_calendar/i18n/ro.po'
--- base_calendar/i18n/ro.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/ro.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Ciornă"
#. module: base_calendar
=== modified file 'base_calendar/i18n/ru.po'
--- base_calendar/i18n/ru.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/ru.po 2011-12-22 11:23:16 +0000
@@ -866,7 +866,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Черновик"
#. module: base_calendar
=== modified file 'base_calendar/i18n/sk.po'
--- base_calendar/i18n/sk.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/sk.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Návrh"
#. module: base_calendar
=== modified file 'base_calendar/i18n/sl.po'
--- base_calendar/i18n/sl.po 2011-11-14 05:16:11 +0000
+++ base_calendar/i18n/sl.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Osnutek"
#. module: base_calendar
=== modified file 'base_calendar/i18n/sq.po'
--- base_calendar/i18n/sq.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/sq.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/sr.po'
--- base_calendar/i18n/sr.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/sr.po 2011-12-22 11:23:16 +0000
@@ -860,7 +860,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Priprema"
#. module: base_calendar
=== modified file 'base_calendar/i18n/[email protected]'
--- base_calendar/i18n/[email protected] 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/[email protected] 2011-12-22 11:23:16 +0000
@@ -860,7 +860,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Priprema"
#. module: base_calendar
=== modified file 'base_calendar/i18n/sv.po'
--- base_calendar/i18n/sv.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/sv.po 2011-12-22 11:23:16 +0000
@@ -853,7 +853,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Preliminär"
#. module: base_calendar
=== modified file 'base_calendar/i18n/th.po'
--- base_calendar/i18n/th.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/th.po 2011-12-22 11:23:16 +0000
@@ -854,7 +854,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/i18n/tr.po'
--- base_calendar/i18n/tr.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/tr.po 2011-12-22 11:23:16 +0000
@@ -864,7 +864,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "Taslak"
#. module: base_calendar
=== modified file 'base_calendar/i18n/zh_CN.po'
--- base_calendar/i18n/zh_CN.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/zh_CN.po 2011-12-22 11:23:16 +0000
@@ -858,7 +858,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "草稿"
#. module: base_calendar
=== modified file 'base_calendar/i18n/zh_TW.po'
--- base_calendar/i18n/zh_TW.po 2011-12-04 06:22:14 +0000
+++ base_calendar/i18n/zh_TW.po 2011-12-22 11:23:16 +0000
@@ -858,7 +858,7 @@
#. module: base_calendar
#: selection:calendar.alarm,state:0
-msgid "Draft"
+msgid "Unconfirmed"
msgstr "草案"
#. module: base_calendar
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
