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

[IMP]:project,stock:Improved SQL report with new guidlines.

Browse Source 
bzr revid: apa@tinyerp.com-20100521065420-31waeltufldk319i
This commit is contained in:
apa-tiny
2010-05-21 12:24:20 +05:30
parent 3651dde82c
commit 8249c4b7e9
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/report/project_report.py
+2 -4
View File
@@ -31,16 +31,15 @@ class report_project_task_user(osv.osv):
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'date_start': fields.datetime('Starting Date',readonly=True),
'date_start': fields.date('Starting Date',readonly=True),
'no_of_days': fields.integer('#Days', size=128, readonly=True),
'description': fields.text('Description',readonly=True),
'date_end': fields.datetime('Ending Date',readonly=True),
'date_end': fields.date('Ending Date',readonly=True),
'date_deadline': fields.date('Deadline',readonly=True),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
'hours_effective': fields.float('Effective Hours', readonly=True),
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
# 'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
'closing_days': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
help="Number of Days to close the task"),
@@ -102,7 +101,6 @@ class report_project_task_user(osv.osv):
t.state,
date_trunc('day',t.date_end),
to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
date_trunc('day',t.date_start),
t.company_id,
t.partner_id,
t.type,
addons/project/report/project_report_view.xml
+8 -6
View File
@@ -102,19 +102,21 @@
help ="Non assigned tasks to projects"
domain="[('project_id','=',False"/>
</field>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12">
<separator orientation="vertical"/>
<field name="type" widget="selection"/>
<separator orientation="vertical"/>
<field name="date_start"/>
<separator orientation="vertical"/>
<field name="partner_id" />
<newline/>
<field name="priority"/>
<field name="partner_id" />
<field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<field name="date_end"/>
<separator orientation="vertical"/>
<field name="date_deadline"/>
<newline/>
<field name="date_start"/>
<field name="date_end"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="11">
addons/stock/report/report_stock_picking_view.xml
+11 -9
View File
@@ -56,13 +56,13 @@
<field name="arch" type="xml">
<search string="Search">
<group col="16" colspan="6">
<filter icon="terp-stock" string="This Year"
<filter icon="terp-stock" string="Last 365 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Picking in this year"/>
<filter icon="terp-stock" string="This Month"
help="Picking in last 365 days"/>
<filter icon="terp-stock" string="Last 30 Days"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Picking in this month"/>
help="Picking in last 30 days"/>
<separator orientation="vertical"/>
<filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
<filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
@@ -70,30 +70,32 @@
<field name="partner_id"/>
<field name="reference" />
<field name="origin" />
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_extended" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12">
<field name="type"/>
<separator orientation="vertical"/>
<field name="min_date"/>
<field name="max_date"/>
<separator orientation="vertical"/>
<field name="order_date"/>
<newline/>
<field name="invoice_state"/>
<separator orientation="vertical"/>
<field name="order_date"/>
<field name="max_date"/>
<separator orientation="vertical"/>
<field name="date_done"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="4" col="5">
<filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
<filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
<filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
<filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>