pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding note in planning lines

Browse Source 
bzr revid: fp@tinyerp.com-6a15bdd758b1566bfc9f852deb8a62a441f0d79b
This commit is contained in:
Fabien Pinckaers
2007-06-19 18:43:04 +00:00
parent 5cc3fad670
commit 8bf26e5d80
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report_analytic_line/report_analytic_planning.py
+9 -2
View File
@@ -64,6 +64,7 @@ class report_account_analytic_planning_line(osv.osv):
'user_id': fields.many2one('res.users', 'User'),
'amount': fields.float('Quantity', required=True),
'amount_unit':fields.many2one('product.uom', 'Qty UoM', required=True),
'note':fields.text('Note', size=64),
}
_order = 'user_id,account_id'
report_account_analytic_planning_line()
@@ -106,18 +107,24 @@ class report_account_analytic_planning_stat(osv.osv):
def _sum_amount_real(self, cr, uid, ids, name, args, context):
result = {}
for line in self.browse(cr, uid, ids, context):
cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%d and account_id=%d and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
if line.user_id:
cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%d and account_id=%d and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
else:
cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%d and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
result[line.id] = cr.fetchone()[0]
return result
def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
result = {}
for line in self.browse(cr, uid, ids, context):
where = ''
if line.user_id:
where='user_id='+str(line.user_id.id)+' and '
cr.execute('''select
sum(planned_hours)
from
project_task
where
user_id=%d and
'''+where+'''
project_id in (select id from project_project where category_id=%d) and
date_close>=%s and
date_close<=%s''', (
addons/report_analytic_line/report_analytic_planning_view.xml
+1
View File
@@ -33,6 +33,7 @@
<field name="account_id"/>
<field name="amount"/>
<field name="amount_unit"/>
<field name="note"/>
</tree>
</field>
</page><page string="Analysis">