openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06252
lp:~openerp-dev/openobject-addons/addons-training-improve-view-web-ysa into lp:~openobject-training/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-improve-view-web-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-view-web-ysa/+merge/59738
[FIX] training:- fix problem in return default value of O2M field. pass id instead of tuple in many2one field for return value of O2M field.
[FIX] training, document_type :- remove duplicate field in purchase.order.line and ir.attachemtn tree view, replace the position with blank field.
[IMP] training_* :- improve view.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-view-web-ysa/+merge/59738
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-improve-view-web-ysa.
=== modified file 'document_type/view/ir_attachment_i.xml'
--- document_type/view/ir_attachment_i.xml 2011-04-13 11:47:07 +0000
+++ document_type/view/ir_attachment_i.xml 2011-05-03 07:26:39 +0000
@@ -26,6 +26,7 @@
<field name="type">tree</field>
<field name="inherit_id" ref="document.view_document_file_tree"/>
<field name="arch" type="xml">
+ <field name="type" position="replace"/>
<field name="user_id" position="after">
<field name="type"/>
</field>
=== modified file 'training/training_content_review_view.xml'
--- training/training_content_review_view.xml 2011-04-26 06:36:47 +0000
+++ training/training_content_review_view.xml 2011-05-03 07:26:39 +0000
@@ -11,11 +11,11 @@
<field name="type" readonly="1"/>
<group colspan="2" col="2" attrs="{'invisible': [('type','!=','course_material')]}">
<separator colspan="2" string="Course Material"/>
- <field name="course_material_ids" nolabel="1" domain="[('res_model','=','training.course'),('res_id','=',course_id),('type','=','course_material')]"/>
+ <field name="course_material_ids" colspan="4" nolabel="1" domain="[('res_model','=','training.course'),('res_id','=',course_id),('type','=','course_material')]"/>
</group>
<group colspan="2" col="2" attrs="{'invisible': [('type', '!=', 'exam_material')]}">
<separator colspan="2" string="Questions"/>
- <field name="question_ids" domain="[('course_ids','in',[course_id])]" nolabel="1"/>
+ <field name="question_ids" colspan="4" domain="[('course_ids','in',[course_id])]" nolabel="1"/>
</group>
<separator colspan="4" string=""/>
<group colspan="4">
=== modified file 'training/training_holiday_view.xml'
--- training/training_holiday_view.xml 2011-03-29 13:18:18 +0000
+++ training/training_holiday_view.xml 2011-05-03 07:26:39 +0000
@@ -142,7 +142,7 @@
<field name="year"/>
<separator colspan="2"/>
<group colspan="2" col="2">
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel"/>
+ <button string="_Cancel" icon="gtk-cancel" special="cancel"/>
<button name="action_apply" type="object" string="_Apply" icon="gtk-apply"/>
</group>
</form>
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-04-27 06:42:22 +0000
+++ training/training_view.xml 2011-05-03 07:26:39 +0000
@@ -623,7 +623,7 @@
</field>
</page>
</notebook>
- <group colspan="4" col="3">
+ <group colspan="4" col="8">
<field name="state" />
<group col="6" groups="training.group_session_manager">
<button name="signal_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?" icon="gtk-open"/>
@@ -770,8 +770,8 @@
<separator string="" colspan="4" />
<group colspan="4" col="5">
<field name="state" invisible="1" />
- <button string="Cancel" type="object" special="cancel" name="action_close" states="selection" icon="gtk-cancel"/>
- <button string="Close" type="object" special="cancel" name="action_close" states="result" icon="terp-dialog-close"/>
+ <button string="Cancel" special="cancel" states="selection" icon="gtk-cancel"/>
+ <button string="Close" special="cancel" states="result" icon="terp-dialog-close"/>
<button string="Generate Reports" type="object" name="action_generate_zip" states="selection" icon="gtk-execute"/>
</group>
</form>
@@ -1291,7 +1291,7 @@
<group col="7" colspan="4" attrs="{'invisible' : [('state', '=', 'end')]}">
<separator string="" colspan="7" />
<field name="state" invisible="1" />
- <button name="action_cancel" string="Cancel" type="object" special="cancel" icon="gtk-cancel" states="init,replacement,postponement,cancellation"/>
+ <button string="Cancel" type="object" special="cancel" icon="gtk-cancel" states="init,replacement,postponement,cancellation"/>
<label string="" />
<button name="action_cancellation" string="Cancellation" type="object" states="init" icon="gtk-cancel"/>
<button name="action_replacement" string="Replacement" type="object" states="init" icon="terp-gtk-jump-to-rtl"/>
@@ -1570,7 +1570,7 @@
<group colspan="4" col="2" states="confirm">
<label string="Are you sure you want to update procurements all opened seance in all future session?" colspan="2"/>
<separator colspan="4"/>
- <button string="Cancel" special="cancel" name="action_close" icon='gtk-cancel'/>
+ <button string="Cancel" special="cancel" icon='gtk-cancel'/>
<button string="Confirm" type="object" name="action_confirm" icon='terp-camera_test'/>
</group>
<group colspan="4" col="2" states="update" expand="1">
@@ -2366,7 +2366,7 @@
<field name="session_ids" nolabel="1" colspan="2"/>
<separator colspan="2" />
<group colspan="2" col="2" >
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
</group>
</form>
@@ -2571,7 +2571,7 @@
</group>
<separator string="" colspan="2" />
<group col="2" colspan="2">
- <button name="action_cancel" type="object" special="cancel" string="Cancel" icon="gtk-cancel" />
+ <button type="object" special="cancel" string="Cancel" icon="gtk-cancel" />
<button name="action_apply" type="object" string="Duplicate" icon="gtk-execute" />
</group>
</form>
@@ -2657,9 +2657,10 @@
<field name="course_id" select="1"/>
<field name="seance_date" select="1"/>
</field>
+ <field name="state" position="replace"/>
<field name="price_subtotal" position="after">
- <field name="state" />
- <field name="notes" />
+ <field name="state"/>
+ <field name="notes"/>
</field>
</data>
</field>
@@ -2682,7 +2683,7 @@
<field name="seance_id" colspan="4" on_change="on_change_seance(seance_id)"/>
<separator string="" colspan="4"/>
<group col="2" colspan="4">
- <button name="close_cb" string="Cancel" type="object" special="cancel" icon="gtk-cancel"/>
+ <button string="Cancel" special="cancel" icon="gtk-cancel"/>
<button name="apply_cb" string="Apply" type="object" icon="gtk-apply"
confirm="Are you sure to want to move this participation to this seance ?"/>
</group>
=== modified file 'training/wizard/training_subscription_line_confirm.py'
--- training/wizard/training_subscription_line_confirm.py 2011-03-21 12:26:03 +0000
+++ training/wizard/training_subscription_line_confirm.py 2011-05-03 07:26:39 +0000
@@ -31,7 +31,7 @@
wf_service = netsvc.LocalService("workflow")
for obj_id in context.get('active_ids', []):
wf_service.trg_validate(uid, 'training.subscription.line', obj_id, 'signal_confirm', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
training_subscription_line_confim()
=== modified file 'training/wizard/training_validate_course.py'
--- training/wizard/training_validate_course.py 2011-03-21 12:26:03 +0000
+++ training/wizard/training_validate_course.py 2011-05-03 07:26:39 +0000
@@ -34,7 +34,7 @@
for course in proxy.browse(cr, uid, context.get('active_ids',[]), context=context):
if course.state_course in ('pending','draft'):
workflow.trg_validate(uid, 'training.course', course.id, 'signal_validate', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
validate_courses()
=== modified file 'training_degree/training_degree_view.xml'
--- training_degree/training_degree_view.xml 2011-04-25 06:05:34 +0000
+++ training_degree/training_degree_view.xml 2011-05-03 07:26:39 +0000
@@ -233,7 +233,7 @@
<separator colspan="4" />
<group colspan="4" col="7" width="800">
<field name="state" />
- <button name="cancel_cb" special="cancel" type="object" string="Cancel" icon="gtk-cancel" />
+ <button special="cancel" string="Cancel" icon="gtk-cancel" />
<button name="show_degrees_cb" type="object" string="Show Degrees" icon="gtk-apply" />
<button name="subscribe_cb" type="object" string="Subscribe Degrees" states="show_degrees" icon="gtk-execute"/>
<button name="close_cb" type="object" string="Close" states="show_degrees" icon="gtk-close"/>
=== modified file 'training_exam/wizard/training_exam_add_question_view.xml'
--- training_exam/wizard/training_exam_add_question_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_add_question_view.xml 2011-05-03 07:26:39 +0000
@@ -16,7 +16,7 @@
<separator colspan="4" string=""/>
<group colspan="4">
<label colspan="2"/>
- <button name="cancel_cb" string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
+ <button string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
<button name="add_questions_cb" string="Add Questions" type="object" icon="terp-document-new"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_depricate_question.py'
--- training_exam/wizard/training_exam_depricate_question.py 2011-03-22 08:49:13 +0000
+++ training_exam/wizard/training_exam_depricate_question.py 2011-05-03 07:26:39 +0000
@@ -28,7 +28,7 @@
context['_deprecated_note'] = wizard.note
question_pool.action_deprecate(cr, uid, validated_question_ids, context=context)
- return {'type': 'ir.actions.act_window.close'}
+ return {'type': 'ir.actions.act_window_close'}
training_exam_question_group_deprecate()
=== modified file 'training_exam/wizard/training_exam_question_assign_course.py'
--- training_exam/wizard/training_exam_question_assign_course.py 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_question_assign_course.py 2011-05-03 07:26:39 +0000
@@ -39,7 +39,7 @@
for question in proxy.browse(cr, uid, context.get('active_ids',[]), context=context):
course_ids = set([assign_course.course_id.id] + [course.id for course in question.course_ids])
question.write({'course_ids' : [(6, 0, list(course_ids))]})
- return {'type': 'ir.actions.act_window.close'}
+ return {'type': 'ir.actions.act_window_close'}
training_exam_question_assign_course()
=== modified file 'training_exam/wizard/training_exam_question_validate.py'
--- training_exam/wizard/training_exam_question_validate.py 2011-03-25 13:14:43 +0000
+++ training_exam/wizard/training_exam_question_validate.py 2011-05-03 07:26:39 +0000
@@ -74,7 +74,7 @@
context = {}
if context.get('active_id'):
self.pool.get('training.exam.question').write(cr, uid, [context.get('active_id')], {'state': 'validated'}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def action_validate_w_qz(self, cr, uid, ids, context=None):
if context is None:
@@ -85,7 +85,7 @@
for qwiz in self.browse(cr, uid, ids, context=context):
for qz in qwiz.questionnaire_ids:
wkf.trg_validate(uid, 'training.exam.questionnaire', qz.id, 'signal_teq_validate', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_defaults = {
'state': _get_default_state,
=== modified file 'training_exam/wizard/training_exam_question_view.xml'
--- training_exam/wizard/training_exam_question_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_question_view.xml 2011-05-03 07:26:39 +0000
@@ -13,7 +13,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="find_question_with_course" string="_Apply" icon="gtk-apply" type="object" />
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_questionnaire.py'
--- training_exam/wizard/training_exam_questionnaire.py 2011-04-04 10:31:56 +0000
+++ training_exam/wizard/training_exam_questionnaire.py 2011-05-03 07:26:39 +0000
@@ -56,6 +56,7 @@
if context is None:
context = {}
question_proxy = self.pool.get('training.exam.question')
+ exam_question_proxy = self.pool.get('training.exam.questionnaire.question')
this = self.browse(cr, uid, ids, context=context)[0]
all_question_ids = question_proxy.search(cr, uid, [], context=context)
mandatory_question_ids = []
@@ -90,7 +91,11 @@
number_of_questions -= 1
except:
pass
-
+ question = []
+ for quest in exam_question_proxy.read(cr, uid, mqids + qids, context=context):
+ if quest.get('question_id',False):
+ quest.update({'question_id': quest.get('question_id')[0]})
+ question.append(quest)
return {
'view_type': 'form',
'view_mode': 'form',
@@ -101,7 +106,7 @@
'context' : {
'default_name' : this.name,
'default_main_course_id' : this.course_id.id,
- 'default_question_ids' : self.pool.get('training.exam.questionnaire.question').read(cr, uid, mqids + qids, context=context),
+ 'default_question_ids' : question,
'default_kind' : this.kind,
}
}
=== modified file 'training_exam/wizard/training_exam_questionnaire_view.xml'
--- training_exam/wizard/training_exam_questionnaire_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_questionnaire_view.xml 2011-05-03 07:26:39 +0000
@@ -17,7 +17,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" type="object"/>
+ <button string="_Cancel" icon="gtk-cancel" special="cancel"/>
<button name="action_generate_questionnaire" string="_Apply" icon="gtk-apply" type="object" />
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_validate_question.py'
--- training_exam/wizard/training_exam_validate_question.py 2011-03-22 08:49:13 +0000
+++ training_exam/wizard/training_exam_validate_question.py 2011-05-03 07:26:39 +0000
@@ -36,7 +36,7 @@
question_ids = context.get('active_ids',[])
draft_question_ids = question_pool.search(cr, uid, [('state','=','draft'),('id','in',question_ids)], context=context)
question_pool.action_validate(cr, uid, draft_question_ids, context=context)
- return {'type': 'ir.actions.act_window.close'}
+ return {'type': 'ir.actions.act_window_close'}
training_exam_question_group_validate()
=== modified file 'training_report/report_training_view.xml'
--- training_report/report_training_view.xml 2011-04-20 06:01:12 +0000
+++ training_report/report_training_view.xml 2011-05-03 07:26:39 +0000
@@ -21,9 +21,9 @@
<group colspan="4" col="5" width="600">
<field name="state" invisible="1" />
- <button name="action_close" type="object" string="Cancel" icon="gtk-cancel" special="cancel" states="init" />
+ <button string="Cancel" icon="gtk-cancel" special="cancel" states="init" />
<button name="action_generate_report" type="object" string="Generate Report" icon="gtk-apply" states="init" />
- <button name="action_close" type="object" string="Close" icon="gtk-close" special="cancel" states="result" />
+ <button string="Close" icon="gtk-close" special="cancel" states="result" />
</group>
</form>
</field>
=== modified file 'training_report/wizard/training_report_account_analytic_balance_year_view.xml'
--- training_report/wizard/training_report_account_analytic_balance_year_view.xml 2011-03-16 11:56:59 +0000
+++ training_report/wizard/training_report_account_analytic_balance_year_view.xml 2011-05-03 07:26:39 +0000
@@ -11,7 +11,7 @@
<field name="date2"/>
<separator colspan="4" />
<group colspan="4" col="2">
- <button string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
+ <button string="Cancel" special="cancel" icon="gtk-cancel"/>
<button name="action_report" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
=== modified file 'training_report/wizard/training_report_course_profitability_view.xml'
--- training_report/wizard/training_report_course_profitability_view.xml 2011-03-16 11:56:59 +0000
+++ training_report/wizard/training_report_course_profitability_view.xml 2011-05-03 07:26:39 +0000
@@ -13,7 +13,7 @@
<field name="analytic_fix_cost"/>
<separator colspan="4" />
<group colspan="4" col="2">
- <button string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
+ <button string="Cancel" special="cancel" icon="gtk-cancel"/>
<button name="action_report" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
=== modified file 'training_report/wizard/training_report_session_volume_view.xml'
--- training_report/wizard/training_report_session_volume_view.xml 2011-03-25 09:27:46 +0000
+++ training_report/wizard/training_report_session_volume_view.xml 2011-05-03 07:26:39 +0000
@@ -16,7 +16,7 @@
<field name="kind" />
<separator colspan="4" />
<group colspan="4" col="2">
- <button string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
+ <button string="Cancel" special="cancel" icon="gtk-cancel"/>
<button name="action_print" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
Follow ups
