Jigar Amin - OpenERP has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-792695-jam into
lp:openobject-addons.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-792695-jam/+merge/63541
Changes:
+Bug #792695 - In Survey module , send invitation : added proper message in
no user option unchecked and no user related to the partner email address found.
+ Usability Improvements added button shortcut and removed unnecessary spaces
from view.
Kindly Review this
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-792695-jam/+merge/63541
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-792695-jam.
=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py 2011-03-15 13:27:26 +0000
+++ survey/wizard/survey_send_invitation.py 2011-06-06 10:24:08 +0000
@@ -167,6 +167,10 @@
res_user+= "- %s (Login: %s, Password: %s)\n" % \
(user_email.name, user_email.login, user_email.password)
continue
+ else:
+ error += "- No User found linked to email address '%s'.\n"%(addr.email)
+ continue
+
passwd= self.genpasswd()
out+= addr.email + ',' + passwd + '\n'
mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
=== modified file 'survey/wizard/survey_send_invitation.xml'
--- survey/wizard/survey_send_invitation.xml 2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_send_invitation.xml 2011-06-06 10:24:08 +0000
@@ -3,7 +3,7 @@
<data>
<!-- Survey send invitation Form View -->
-
+
<record id="view_survey_send_invitation" model="ir.ui.view">
<field name="name">Send Invitation</field>
<field name="model">survey.send.invitation</field>
@@ -11,21 +11,21 @@
<field name="arch" type="xml">
<form string="Send Invitation">
<separator string="Select Partner" colspan="4"/>
- <field name="partner_ids" nolabel="1" colspan="4"/>
+ <field name="partner_ids" nolabel="1" colspan="4"/>
<separator colspan="4" string="Send mail for new user"/>
<field name="send_mail" nolabel="1"/>
<field name="mail_subject" colspan="3"/>
<separator colspan="4" string="Send reminder for existing user"/>
<field name="send_mail_existing" nolabel="1"/>
- <field name="mail_subject_existing" colspan="3"/>
+ <field name="mail_subject_existing" colspan="3"/>
<separator colspan="4"/>
<field name="mail_from" colspan="4"/>
<separator string="Message" colspan="4"/>
<field name="mail" nolabel="1" colspan="4"/>
<separator colspan="4" />
<label align="0.0" colspan="2" string="" />
- <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button colspan="1" icon="gtk-go-forward" name="action_send" string="Send" type="object"/>
+ <button colspan="1" icon="gtk-cancel" special="cancel" string="_Cancel"/>
+ <button colspan="1" icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
</form>
</field>
</record>
@@ -46,7 +46,7 @@
view_mode="form" target="new" view_type="form" />
<!-- Survey send invitation Display Log Form View -->
-
+
<record id="view_survey_send_invitation_log" model="ir.ui.view">
<field name="name">survey send invitation log</field>
<field name="model">survey.send.invitation.log</field>
@@ -58,7 +58,7 @@
<separator string="" colspan="4"/>
<group col="4" colspan="4">
<label align="0.0" colspan="3" string="" />
- <button colspan="1" icon="gtk-ok" special="cancel" string="Ok"/>
+ <button colspan="1" icon="gtk-ok" special="cancel" string="_Ok"/>
</group>
</form>
</field>
_______________________________________________
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
