X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=lhc.py;h=528034f8f71859943874478d20f10eb1e0bacef7;hb=9f8274f4ffe3fd29454f58fc6d439192c1646e36;hp=420ce976d06bd233f0815037024a06ec18bf3b75;hpb=c001634a75207746b21dec9bd77a92c055e68898;p=burette%2Flhc.git diff --git a/lhc.py b/lhc.py index 420ce97..528034f 100644 --- a/lhc.py +++ b/lhc.py @@ -31,7 +31,12 @@ class res_partner(orm.Model): _inherit = 'res.partner' _columns = { - 'usual_contact': fields.boolean('Usual contact', help='This contact is a usual contact for L\'Heureux Cyclage employees. This field can be used to discriminated contacts for differents usages.'), + 'usual_contact': fields.boolean( + 'Usual contact', + help="""This contact is a usual contact for L\'Heureux Cyclage + employees. This field can be used to discriminated contacts for + differents usages.""" + ), 'kit_sent': fields.boolean('Welcome kit sent'), } @@ -44,7 +49,13 @@ class product_template(orm.Model): _inherit = 'product.template' _columns = { - 'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user,lhc.group_volunteer"), + 'standard_price': fields.float( + 'Cost', + digits_compute=dp.get_precision('Product Price'), + help="""Cost price of the product used for standard stock valuation + in accounting and used as a base price on purchase orders.", + groups="base.group_user,lhc.group_volunteer""" + ), } @@ -56,8 +67,6 @@ class res_users(orm.Model): v = {} partners = self.pool.get('res.partner') partner = partners.browse(cr, uid, partner_id) - import pdb - pdb.set_trace() if partner.email: v['email'] = partner.email else: @@ -65,6 +74,18 @@ class res_users(orm.Model): return {'value': v} +class event_event(orm.Model): + _inherit = 'event.event' + + _columns = { + 'duration': fields.float( + 'Duration', + digits_compute=dp.get_precision('Product Unit of Measure'), + help='Duration in hours' + ), + } + + class event_registration(orm.Model): _inherit = 'event.registration' @@ -86,6 +107,36 @@ class event_registration(orm.Model): ('pole_emploi', 'Pole Emploi')], 'Main funding', help='Main funding origin'), 'fundings_others': fields.char('Others fundings origins', size=128), + 'sale_order_ids': fields.many2many( + 'sale.order', + 'event_registration_sale_order_rel', + 'event_registration_id', + 'sale_order_id', + 'Related sale order(s)' + ), + 'invoice_ids': fields.many2many( + 'account.invoice', + 'event_registration_invoice_id_rel', + 'event_registration_id', + 'invoice_id', + 'Related invoice(s)' + ), } + def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None): + """Concat phone with mobile phone if exist. If mobile exist and not + phone, add mobile number""" + vals = super(event_registration, self).onchange_contact_id(cr, uid, ids, contact, partner, context) + addr_obj = self.pool.get('res.partner') + contact_id = addr_obj.browse(cr, uid, contact, context=context) + phone = vals['value']['phone'] + mobile = contact_id.mobile + if mobile: + if phone: + vals['value']['phone'] = '%s - %s' % (phone, mobile) + else: + vals['value']['phone'] = mobile + return vals + + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: