From 3bc25fb07ef8aa959d2c7df0b9515e6a3147c0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Sun, 25 Jul 2010 13:58:26 -0300 Subject: [PATCH] [REF] clean up before merge (clean double work diffs) bzr revid: rvalyi@gmail.com-20100725165826-etg68lktjnt9ih5l --- addons/account/invoice.py | 1 - addons/project_long_term/project_long_term.py | 2 -- addons/project_long_term/project_long_term_view.xml | 2 +- addons/project_scrum/__openerp__.py | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 1c452b54258..f5ebc5b3d3d 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1261,7 +1261,6 @@ class account_invoice_line(osv.osv): return {'price_unit': price_unit,'invoice_line_tax_id': tax_id} def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): - print "2222*", uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context if context is None: context = {} company_id = context.get('company_id',False) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index fc1fea91311..9371232745b 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -252,8 +252,6 @@ class project_resource_allocation(osv.osv): 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), 'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"), - 'date_start': fields.related('phase_id', 'date_start', type='datetime', string='Start Date'), - 'date_end': fields.related('phase_id', 'date_end', type='datetime', string='End Date'), } _defaults = { 'useability': 100, diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b338a5bd37a..7d51f79530a 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -332,4 +332,4 @@ - \ No newline at end of file + diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index 92eb86f381f..9fa418d6ca3 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -62,6 +62,5 @@ 'demo_xml': ['project_scrum_demo.xml'], 'installable': True, 'active': False, - 'certificate': '', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: