[REF] clean up before merge (clean double work diffs)

bzr revid: rvalyi@gmail.com-20100725165826-etg68lktjnt9ih5l

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)

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,

addons/project_long_term/project_long_term_view.xml

@@ -332,4 +332,4 @@
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
     </data>
-</openerp>
+</openerp>

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: