openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-fix-readonly-task-2125-ysa into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  OpenObject Training (openobject-training)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-fix-readonly-task-2125-ysa/+merge/55905

training, training_room :- remove readonly attribute in stackholder requests object and fix return value of default get method in training.seances object. task id :- 2125
training:- stackholder request field set readonly if state not in draft. fix invoice_ids error in workflow.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-fix-readonly-task-2125-ysa/+merge/55905
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-fix-readonly-task-2125-ysa.

=== modified file 'training/training.py'
--- training/training.py	2011-03-30 12:59:07 +0000
+++ training/training.py	2011-04-01 11:17:31 +0000
@@ -3878,20 +3878,20 @@
         return res
 
     _columns = {
-        'reference': fields.char('Reference', size=16, readonly=True, required=True),
-        'session_id': fields.many2one('training.session', 'Session', select=1, required=True, readonly=True),
+        'reference': fields.char('Reference', size=16, required=True, **WRITABLE_ONLY_IN_DRAFT),
+        'session_id': fields.many2one('training.session', 'Session', required=True, **WRITABLE_ONLY_IN_DRAFT),
         'date': fields.function(_date_compute, method=True, string='First Seance Date', type='datetime',
                                 store={
                                     'training.participation.stakeholder': (_store_get_requests, None, 25),
                                 }),
-        'kind' : fields.related('session_id', 'offer_id', 'kind', type='char', readonly=True, select=1, string="Offer's Kind"),
-        'job_id': fields.many2one('res.partner.job', 'Contact', required=True, select=1, **WRITABLE_ONLY_IN_DRAFT),
-        'email' : fields.char('Email', size=128, select=1, **WRITABLE_ONLY_IN_DRAFT),
+        'kind' : fields.related('session_id', 'offer_id', 'kind', type='char', string="Offer's Kind", **WRITABLE_ONLY_IN_DRAFT),
+        'job_id': fields.many2one('res.partner.job', 'Contact', required=True, **WRITABLE_ONLY_IN_DRAFT),
+        'email' : fields.char('Email', size=128, **WRITABLE_ONLY_IN_DRAFT),
         'payment_mode' : fields.selection([('contract', 'Contract'),
                                            ('invoice', 'Invoice')
-                                          ], 'Payment Mode'),
+                                          ], 'Payment Mode', **WRITABLE_ONLY_IN_DRAFT),
         'participation_ids': fields.one2many('training.participation.stakeholder', 'request_id', 'Participations', **WRITABLE_ONLY_IN_DRAFT),
-        'notes' : fields.text('Notes'),
+        'notes' : fields.text('Notes', **WRITABLE_ONLY_IN_DRAFT),
         'state': fields.selection([('draft', 'Draft'),
                                    ('valid', 'Validated'),
                                    ('requested', 'Requested'),
@@ -3902,7 +3902,7 @@
                                   ], 'State', readonly=True, required=True),
         'purchase_order_id': fields.many2one('purchase.order', 'Purchase Order', readonly=True),
         'purchase_paid': fields.related('purchase_order_id', 'invoice_ids', 'reconciled', type='boolean', string='Invoice Paid', readonly=True,),
-        'amount_to_pay': fields.function(_amount_to_pay, string='Amount to pay', type='char', size='20', readonly=True, method=True),
+        'amount_to_pay': fields.function(_amount_to_pay, string='Amount to pay', type='char', size='20', method=True),
         'price' : fields.function(_price_compute, method=True, string='Remuneration', type='float', digits_compute=dp.get_precision('Account'),
                                   store={
                                       'training.participation.stakeholder': (_store_get_requests, None, 25),
@@ -4323,7 +4323,7 @@
             po = this.purchase_order_id
             if po:
                 if purchase_order_signal == 'purchase_cancel' and po.invoice_ids:
-                    for invoice_id in invoice_ids:
+                    for invoice_id in po.invoice_ids:
                         wkf.trg_validate(uid, 'account.invoice', invoice_id.id, 'invoice_cancel', cr)
                     wkf.trg_validate(uid, 'purchase.order', po.id, 'cancel', cr)
                 else:

=== modified file 'training_room/training_room.py'
--- training_room/training_room.py	2011-03-21 09:18:22 +0000
+++ training_room/training_room.py	2011-04-01 11:17:31 +0000
@@ -121,7 +121,7 @@
         location = cr.fetchone()
         if not location or (len(location) > 0 and not location[0]):
             location = False
-        return location
+        return location and len(location) and location[0] or False
 
     _defaults = {
         'reserved' : lambda *a: 0,