summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/project/board_project_view.xml2
-rw-r--r--addons/project_planning/project_planning.py10
-rw-r--r--addons/project_planning/project_planning_demo.xml62
-rw-r--r--addons/project_planning/project_planning_view.xml3
4 files changed, 57 insertions, 20 deletions
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 2bc858a86d4..31b8e5085e2 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -25,7 +25,7 @@
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
- <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
+ <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
</field>
</record>
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 72b94c69dec..83c9cd6dff5 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -434,7 +434,7 @@ class report_account_analytic_planning_account(osv.osv):
SELECT id
FROM report_account_analytic_planning_line
WHERE planning_id = %s AND account_id=%s
- )""", (line.planning_id.id,line.account_id.id ))
+ )""", (line.planning_id.id, line.account_id and line.account_id.id or None))
result[line.id] = cr.fetchall()[0][0] / div * div2
return result
@@ -452,7 +452,7 @@ class report_account_analytic_planning_account(osv.osv):
cr.execute("""
SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc
LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
- WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id.id, ))
+ WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id and line.account_id.id or None))
res = cr.fetchall()[0][0]
if res:
result[line.id] = res * div2
@@ -526,9 +526,9 @@ class report_account_analytic_planning_stat(osv.osv):
if line.user_id:
cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc
LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
+WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
else:
- cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
+ cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
sum = cr.fetchone()
if sum and sum[0]:
@@ -563,7 +563,7 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
project_id IN (select id from project_project where analytic_account_id=%s) AND
date_end>=%s AND
date_end<=%s''', (
- line.account_id.id,
+ line.account_id and line.account_id.id or None,
line.planning_id.date_from,
line.planning_id.date_to)
)
diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml
index 1c12e5c53cf..34ecb58ab02 100644
--- a/addons/project_planning/project_planning_demo.xml
+++ b/addons/project_planning/project_planning_demo.xml
@@ -1,20 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <record id="hr.dep_administration" model="hr.department">
- <field name="name">Administration</field>
- <field name="parent_id" ref="hr.dep_management"/>
- <field name="company_id" ref="base.main_company"/>
- <field name="manager_id" ref="base.user_root"/>
- <field name="member_ids" eval="[(6,0,[ref('base.user_demo')])]"/>
- </record>
+
+ <!-- Project Planning -->
+
<record id="project_plannning_1" model="report_account_analytic.planning">
- <field name="name">Project_Planning</field>
+ <field name="name">Project_Planning</field>
<field name="business_days">20</field>
- <field name="date_from">2010-01-01'</field>
- <field name="date_to">2010-12-31</field>
- <field name="state">draft</field>
- <field name="member_ids" ref="base.user_demo"/>
+ <field name="date_from" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+ <field name="date_to" eval="time.strftime('%Y-%m-30 15:23:00')"/>
+ <field name="state">open</field>
+ <field name="user_id" ref="project.res_users_project_manager"/>
</record>
+
+
+ <record id="project_plannning_line1" model="report_account_analytic.planning.line">
+ <field name="account_id" ref="account.analytic_trunk"/>
+ <field name="amount">16.0</field>
+ <field name="amount_unit" ref="product.uom_hour"/>
+ <field name="planning_id" ref="project_plannning_1"/>
+ <field name="user_id" ref="project.res_users_project_manager"/>
+ <field name="task_ids" eval="[(6,0,[ref('project.project_task_188')])]"/>
+ </record>
+
+
+ <record id="project_plannning_line2" model="report_account_analytic.planning.line">
+ <field name="account_id" ref="account.analytic_trunk"/>
+ <field name="amount">24.0</field>
+ <field name="amount_unit" ref="product.uom_hour"/>
+ <field name="planning_id" ref="project_plannning_1"/>
+ <field name="user_id" ref="project.res_users_technical_leader"/>
+ <field name="task_ids" eval="[(6,0,[ref('project.project_task_192')])]"/>
+ </record>
+
+
+ <record id="project_plannning_line3" model="report_account_analytic.planning.line">
+ <field name="account_id" ref="account.analytic_trunk"/>
+ <field name="amount">90.0</field>
+ <field name="amount_unit" ref="product.uom_hour"/>
+ <field name="planning_id" ref="project_plannning_1"/>
+ <field name="user_id" ref="project.res_users_developer"/>
+ <field name="task_ids" eval="[(6,0,[ref('project.project_task_11')])]"/>
+ </record>
+
+
+ <record id="project_plannning_line4" model="report_account_analytic.planning.line">
+ <field name="account_id" ref="account.analytic_trunk"/>
+ <field name="amount">50.0</field>
+ <field name="amount_unit" ref="product.uom_hour"/>
+ <field name="planning_id" ref="project_plannning_1"/>
+ <field name="user_id" ref="project.res_users_tester"/>
+ <field name="task_ids" eval="[(6,0,[ref('project.project_task_13')])]"/>
+ </record>
+
+
</data>
</openerp>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9abff817d17..3e67c8f5bb4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -74,10 +74,9 @@
<field name="task_ids" />
<field name="note" />
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-
</tree>
<form string="Planning Lines">
- <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+ <field name="user_id"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="amount" />
<field name="amount_unit" />
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-25 09:42:37 +0000