).
#
@@ -15,62 +15,32 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
-import wizard
-import pooler
-import netsvc
+from osv import fields, osv
+from tools.translate import _
-class invoice_directly(wizard.interface):
- def _test_action(obj, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- pick = pool.get('stock.picking').browse(cr, uid, data['id'], context=context)
- if not pick.invoice_state == '2binvoiced':
- return 'end_final'
- return 'invoice'
+class invoice_directly(osv.osv_memory):
+ _inherit = 'stock.partial.picking'
- def _open_action(obj, cr, uid, data, context):
- res = {
- 'name': 'stock.invoice_onshipping',
- 'type': 'ir.actions.wizard',
- 'wiz_name': 'stock.invoice_onshipping'
- }
- if data['form'].get('new_picking', False):
- res['context'] = "{'new_picking':%d}" % (data['form']['new_picking'],)
- return res
+ def do_partial(self, cr, uid, ids, context):
+ result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
+ pick_obj = self.pool.get('stock.picking')
+ picking_ids = context.get('active_ids', False)
+ pick = pick_obj.browse(cr, uid, picking_ids, context)[0]
+ if pick.invoice_state=='2binvoiced':
+ return {
+ 'name': 'Create Invoice',
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'stock.invoice.onshipping',
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+ return {}
- end_final = {
- 'actions':[],
- 'result': {
- 'type': 'state',
- 'state': 'end',
- }
- }
-
- choice = {
- 'actions':[],
- 'result': {
- 'type': 'choice',
- 'next_state': _test_action,
- }
- }
-
- call_invoice = {
- 'actions':[],
- 'result': {
- 'type': 'action',
- 'action': _open_action,
- 'state': 'end'
- }
- }
- def __init__(self, *args):
- service = netsvc.LocalService("wizard.stock.partial_picking")
- service._service.states['split']['result']['state'] = 'test_choice'
- service._service.states['invoice'] = self.call_invoice
- service._service.states['test_choice'] = self.choice
- service._service.states['end_final'] = self.end_final
-invoice_directly('stock.picking.invoice.directly')
+invoice_directly()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 8063e6183a9..a8bfa906c90 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -207,7 +207,7 @@ class survey_browse_response(report_rml):
| """ + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """ |
|
Answer By:- |
- """ + to_xml(response.user_id.login) + """ |
+ """ + to_xml(response.user_id.login or '') + """ |
"""
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 2c1de9cc71d..5a7d5e283e3 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -149,11 +149,10 @@ class survey_form(report_rml):
"""
surv_obj = pooler.get_pool(cr.dbname).get('survey')
for survey in surv_obj.browse(cr,uid,ids):
- if datas.has_key('form') and datas['form']['survey_title']:
- rml += """
-
- | """ + to_xml(tools.ustr(survey.title)) + """ |
- """
+ rml += """
+
+ | """ + to_xml(tools.ustr(survey.title)) + """ |
+ """
if survey.note:
rml += """
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index c7ceb796bae..c86f13b262f 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -225,7 +225,7 @@ class survey_question(osv.osv):
'page_id': fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
'question': fields.char('Question', size=128, required=1),
'answer_choice_ids': fields.one2many('survey.answer', 'question_id', 'Answer'),
- 'is_require_answer': fields.boolean('Require Answer to Question (optional)'),
+ 'is_require_answer': fields.boolean('Require Answer to Question'),
'required_type': fields.selection([('all','All'), ('at least','At Least'), ('at most','At Most'), ('exactly','Exactly'), ('a range','A Range')], 'Respondent must answer'),
'req_ans': fields.integer('#Required Answer'),
'maximum_req_ans': fields.integer('Maximum Required Answer'),
@@ -250,7 +250,7 @@ class survey_question(osv.osv):
('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
('table','Table'),
], 'Question Type', required=1,),
- 'is_comment_require': fields.boolean('Add Comment Field (optional)'),
+ 'is_comment_require': fields.boolean('Add Comment Field'),
'comment_label': fields.char('Field Label', size = 255),
'comment_field_type': fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'),
'comment_valid_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),
@@ -269,7 +269,7 @@ class survey_question(osv.osv):
'comment_valid_err_msg': fields.text('Error message'),
'make_comment_field': fields.boolean('Make Comment Field an Answer Choice'),
'make_comment_field_err_msg': fields.text('Error message'),
- 'is_validation_require': fields.boolean('Validate Text (optional)'),
+ 'is_validation_require': fields.boolean('Validate Text'),
'validation_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),\
('must_be_specific_length', 'Must Be Specific Length'),\
('must_be_whole_number', 'Must Be A Whole Number'),\
@@ -609,7 +609,7 @@ class survey_response(osv.osv):
reads = self.read(cr, uid, ids, ['user_id','date_create'], context)
res = []
for record in reads:
- name = record['user_id'][1] + ' (' + record['date_create'].split('.')[0] + ')'
+ name = (record['user_id'] and record['user_id'][1] or '' )+ ' (' + record['date_create'].split('.')[0] + ')'
res.append((record['id'], name))
return res
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3eca378f150..68e6c1e9883 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -24,6 +24,7 @@
open
1
1
+ 5
@@ -498,6 +499,7 @@
open
1
1
+ 5
@@ -1286,6 +1288,7 @@
20
+ 5
@@ -2163,6 +2166,8 @@
+ 5
+ 20
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index c74d9d1d544..c5e76dd133f 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -6,8 +6,7 @@
id="report_survey_form"
model="survey"
name="survey.form"
- menu="False"
- string="Survey Form"/>
+ string="Print Survey"/>
-
+