Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa/+merge/130082
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa/+merge/130082
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa.
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-09-27 08:38:39 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-10-17 10:36:21 +0000
@@ -26,7 +26,6 @@
<field name="product_id" invisible="1"/>
<field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="general_account_id" invisible="1"/>
-
<field name="quantity" sum="Hours"/>
<field name="cost" sum="Total Cost"/>
</tree>
=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py 2012-10-02 12:39:06 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py 2012-10-17 10:36:21 +0000
@@ -32,6 +32,7 @@
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
+ 'date': fields.date('Date', readonly=True),
'name': fields.char('Description', size=64,readonly=True),
'product_id' : fields.many2one('product.product', 'Product'),
'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
@@ -62,6 +63,10 @@
select
min(aal.id) as id,
htss.name,
+ aal.date as date,
+ to_char(aal.date, 'YYYY-MM-DD') as day,
+ to_char(aal.date,'YYYY') as year,
+ to_char(aal.date,'MM') as month,
htss.date_from,
htss.date_to,
count(*) as nbr,
@@ -92,6 +97,7 @@
left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
group by
aal.account_id,
+ aal.date,
htss.date_from,
htss.date_to,
aal.unit_amount,
=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml 2012-10-10 20:05:11 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml 2012-10-17 10:36:21 +0000
@@ -17,6 +17,7 @@
<field name="model">timesheet.report</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
+ <field name="date" invisible="1"/>
<field name="name" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="date_from" invisible="1"/>
_______________________________________________
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
