Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons13-survey-apa-survey-fka into
lp:~openerp-dev/openobject-addons/trunk-addons13-survey-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-survey-apa-survey-fka/+merge/127941
Hello Sir,
- remove "Survey Open Date" field when creating survey
- dialog after survey is completed says "Complete Survey" rename it to "Survey
Completed"
- display every field editable in open state in survey
- in send invitation wizard
- add m2m tags in partner field
- change port no.
- display current user's email address by default
- display default mail subject as "Invitation for " + survey-name
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-survey-apa-survey-fka/+merge/127941
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons13-survey-apa.
=== modified file 'survey/survey.py'
--- survey/survey.py 2012-10-02 10:29:15 +0000
+++ survey/survey.py 2012-10-04 07:08:23 +0000
@@ -53,7 +53,6 @@
'id': fields.integer('ID'),
'title': fields.char('Survey Title', size=128, required=1),
'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'),
- 'date_open': fields.datetime('Survey Open Date', readonly=1),
'date_close': fields.datetime('Survey Close Date', readonly=1),
'max_response_limit': fields.integer('Maximum Answer Limit',
help="Set to one if survey is answerable only once"),
@@ -61,10 +60,10 @@
help="Set to one if you require only one Answer per user"),
'state': fields.selection([('open', 'Open'), ('cancel', 'Cancelled'),('close', 'Closed') ], 'Status', readonly=True),
'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
- 'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
- 'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
+ 'tot_start_survey': fields.integer("Total Started Survey"),
+ 'tot_comp_survey': fields.integer("Total Completed Survey"),
'note': fields.text('Description', size=128),
- 'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
+ 'history': fields.one2many('survey.history', 'survey_id', 'History Lines'),
'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
'send_response': fields.boolean('Email Notification on Answer'),
'type': fields.many2one('survey.type', 'Type'),
@@ -80,7 +79,7 @@
}
def survey_open(self, cr, uid, ids, arg):
- self.write(cr, uid, ids, {'state': 'open', 'date_open': strftime("%Y-%m-%d %H:%M:%S")})
+ self.write(cr, uid, ids, {'state': 'open'})
return True
def survey_close(self, cr, uid, ids, arg):
=== modified file 'survey/survey_demo.xml'
--- survey/survey_demo.xml 2012-09-10 21:58:41 +0000
+++ survey/survey_demo.xml 2012-10-04 07:08:23 +0000
@@ -17,7 +17,6 @@
<field name="tot_comp_survey">1</field>
<field name="tot_start_survey">1</field>
<field name="response_user">5</field>
- <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
</record>
<record id="survey_page_initial_who_are_you" model="survey.page">
@@ -166,7 +165,6 @@
<field name="tot_comp_survey">1</field>
<field name="tot_start_survey">1</field>
<field name="response_user">5</field>
- <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
</record>
<record id="survey_page_who_are_you" model="survey.page">
@@ -633,7 +631,6 @@
<field name="tot_comp_survey">1</field>
<field name="tot_start_survey">1</field>
<field name="response_user">5</field>
- <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
</record>
<record id="survey_page_odoo_who_are_you" model="survey.page">
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-10-02 15:11:17 +0000
+++ survey/survey_view.xml 2012-10-04 07:08:23 +0000
@@ -49,8 +49,8 @@
<field name="type"/>
</group>
<group>
- <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
- <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+ <field name="max_response_limit" attrs="{'readonly':[('state','=','close')]}"/>
+ <field name="response_user" attrs="{'readonly':[('state','=','close')]}"/>
</group>
</group>
<notebook>
@@ -215,12 +215,11 @@
<field name="note" placeholder="Survey description..."/>
</page>
<page string="Invited User">
- <field name="invited_user_ids" readonly="1"/>
+ <field name="invited_user_ids"/>
</page>
<page string="History">
<group>
<group>
- <field name="date_open"/>
<field name="date_close"/>
</group>
<group>
@@ -253,7 +252,6 @@
<field name="title"/>
<field name="type"/>
<field name="responsible_id"/>
- <field name="date_open" string="Open Date"/>
<field name="tot_start_survey" string="Started"/>
<field name="tot_comp_survey" string="Completed"/>
<field name="state"/>
@@ -295,7 +293,6 @@
<field name="arch" type="xml">
<kanban>
<field name="title"/>
- <field name="date_open"/>
<field name="tot_comp_survey"/>
<field name="max_response_limit"/>
<field name="responsible_id"/>
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2012-10-02 10:29:15 +0000
+++ survey/wizard/survey_answer.py 2012-10-04 07:08:23 +0000
@@ -435,7 +435,7 @@
xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
xml_footer = etree.SubElement(xml_form, 'footer', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
- etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
+ etree.SubElement(xml_form, 'separator', {'string': 'Survey Completed', 'colspan': "4"})
etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'})
etree.SubElement(xml_form, 'newline')
etree.SubElement(xml_footer, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'})
=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py 2012-09-04 16:55:53 +0000
+++ survey/wizard/survey_send_invitation.py 2012-10-04 07:08:23 +0000
@@ -50,9 +50,6 @@
_defaults = {
'send_mail': lambda *a: 1,
'send_mail_existing': lambda *a: 1,
- 'mail_subject': lambda *a: "Invitation",
- 'mail_subject_existing': lambda *a: "Invitation",
- 'mail_from': lambda *a: tools.config['email_from']
}
def genpasswd(self):
@@ -70,11 +67,14 @@
name += "\t --> " + sur.title + "\n"
if sur.state != 'open':
msg += sur.title + "\n"
+ data['mail_subject'] = "Invitation for " + sur.title
+ data['mail_subject_existing'] = "Invitation for " + sur.title
+ data['mail_from'] = sur.responsible_id.email
if msg:
raise osv.except_osv(_('Warning!'), _('%sSurvey is not in open state') % msg)
data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
\n ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
- \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,'''
+ \n link :- http://'''+ str(socket.gethostname()) + ''':8069 \n\n Thanks,'''
return data
def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):
=== modified file 'survey/wizard/survey_send_invitation.xml'
--- survey/wizard/survey_send_invitation.xml 2012-08-09 06:05:16 +0000
+++ survey/wizard/survey_send_invitation.xml 2012-10-04 07:08:23 +0000
@@ -16,7 +16,7 @@
</header>
<group col="4">
<separator string="Select Partner" colspan="4"/>
- <field name="partner_ids" nolabel="1" colspan="4"/>
+ <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/>
<separator colspan="4" string="Send Mail for New User"/>
<field name="send_mail" nolabel="1"/>
<field name="mail_subject" colspan="3"/>
_______________________________________________
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
