ajay javiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-pstest-week41-fix-aja into
lp:~openerp-dev/openobject-addons/trunk-pstest-week41.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pstest-week41-fix-aja/+merge/130940
Hello,
Fix issue in project module
Thank You.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pstest-week41-fix-aja/+merge/130940
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-pstest-week41.
=== modified file 'pad/pad.py'
--- pad/pad.py 2012-09-20 12:06:16 +0000
+++ pad/pad.py 2012-10-23 06:54:24 +0000
@@ -86,7 +86,7 @@
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
- for k,v in self._all_columns:
+ for k,v in self._all_columns.iteritems():
field = v.column
if hasattr(field,'pad_content_field'):
pad = self.pad_generate_url(cr, uid, context)
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py 2012-10-22 17:53:11 +0000
+++ project_timesheet/project_timesheet.py 2012-10-23 06:54:24 +0000
@@ -115,7 +115,7 @@
if not context.get('no_analytic_entry',False):
task_obj = task_obj.browse(cr, uid, vals['task_id'])
result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
- vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name']) or '/')
+ vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
vals_line['user_id'] = vals['user_id']
vals_line['product_id'] = result['product_id']
vals_line['date'] = vals['date'][:10]
@@ -172,7 +172,7 @@
vals_line = {}
if 'name' in vals:
- vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
+ vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name'] or '/'))
if 'user_id' in vals:
vals_line['user_id'] = vals['user_id']
if 'date' in vals:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
