odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] correct various date issues in reporting 

* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
This commit is contained in:
Géry Debongnie 2014-07-28 10:34:30 +02:00 committed by Olivier Dony
parent 6f563d6284
commit 366a30db95
38 changed files with 74 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -20,9 +20,7 @@
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/> <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Date (day)" icon="terp-go-today" context="{'group_by':'date:day'}"/> <filter string="Date" name="Month" icon="terp-go-month" context="{'group_by':'date:month'}"/>
<filter string="Date (month)" name="Month" icon="terp-go-month" context="{'group_by':'date:month'}"/>
<filter string="Date (year)" icon="terp-go-year" context="{'group_by':'date:year'}"/>
</group> </group>
</search> </search>
</field> </field>

11
addons/account/report/account_entries_report.py
View File

@ -37,14 +37,8 @@ class account_entries_report(osv.osv):
'debit': fields.float('Debit', readonly=True), 'debit': fields.float('Debit', readonly=True),
'credit': fields.float('Credit', readonly=True), 'credit': fields.float('Credit', readonly=True),
'balance': fields.float('Balance', readonly=True), 'balance': fields.float('Balance', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'date': fields.date('Date', size=128, readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'amount_currency': fields.float('Amount Currency', digits_compute=dp.get_precision('Account'), readonly=True), 'amount_currency': fields.float('Amount Currency', digits_compute=dp.get_precision('Account'), readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
'period_id': fields.many2one('account.period', 'Period', readonly=True), 'period_id': fields.many2one('account.period', 'Period', readonly=True),
'account_id': fields.many2one('account.account', 'Account', readonly=True), 'account_id': fields.many2one('account.account', 'Account', readonly=True),
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
@ -53,7 +47,7 @@ class account_entries_report(osv.osv):
'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True), 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True),
'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True), 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True),
'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True), 'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
'reconcile_id': fields.many2one('account.move.reconcile', readonly=True), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconciliation number', readonly=True),
'partner_id': fields.many2one('res.partner','Partner', readonly=True), 'partner_id': fields.many2one('res.partner','Partner', readonly=True),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True), 'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True),
@ -123,9 +117,6 @@ class account_entries_report(osv.osv):
am.state as move_state, am.state as move_state,
l.state as move_line_state, l.state as move_line_state,
l.reconcile_id as reconcile_id, l.reconcile_id as reconcile_id,
to_char(am.date, 'YYYY') as year,
to_char(am.date, 'MM') as month,
to_char(am.date, 'YYYY-MM-DD') as day,
l.partner_id as partner_id, l.partner_id as partner_id,
l.product_id as product_id, l.product_id as product_id,
l.product_uom_id as product_uom_id, l.product_uom_id as product_uom_id,

3
addons/account/report/account_entries_report_view.xml
View File

@ -18,9 +18,6 @@
<field name="credit"/> <field name="credit"/>
<field name="balance"/> <field name="balance"/>
<field name="move_state" invisible="1"/> <field name="move_state" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="year" invisible="1"/>
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="product_id" invisible="1"/> <field name="product_id" invisible="1"/>
<field name="product_uom_id" invisible="1"/> <field name="product_uom_id" invisible="1"/>

4
addons/account/report/account_invoice_report_view.xml
View File

@ -86,9 +86,7 @@
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Invoice Date (day)" name="day" icon="terp-go-today" context="{'group_by':'date:day'}" help="Group by Invoice Date"/> <filter string="Invoice Date" name="month" icon="terp-go-month" context="{'group_by':'date'}" help="Group by month of Invoice Date"/>
<filter string="Invoice Date (month)" name="month" icon="terp-go-month" context="{'group_by':'date:month'}" help="Group by month of Invoice Date"/>
<filter string="Invoice Date (year)" name="group_year" icon="terp-go-year" context="{'group_by':'date:year'}" help="Group by year of Invoice Date"/>
</group> </group>
</search> </search>
</field> </field>

11
addons/account_voucher/report/account_voucher_sales_receipt.py
View File

@ -28,11 +28,6 @@ class sale_receipt_report(osv.osv):
_rec_name = 'date' _rec_name = 'date'
_columns = { _columns = {
'date': fields.date('Date', readonly=True), 'date': fields.date('Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
@ -69,9 +64,6 @@ class sale_receipt_report(osv.osv):
create or replace view sale_receipt_report as ( create or replace view sale_receipt_report as (
select min(avl.id) as id, select min(avl.id) as id,
av.date as date, av.date as date,
to_char(av.date, 'YYYY') as year,
to_char(av.date, 'MM') as month,
to_char(av.date, 'YYYY-MM-DD') as day,
av.partner_id as partner_id, av.partner_id as partner_id,
aj.currency as currency_id, aj.currency as currency_id,
av.journal_id as journal_id, av.journal_id as journal_id,
@ -107,9 +99,6 @@ class sale_receipt_report(osv.osv):
group by group by
av.date, av.date,
av.id, av.id,
to_char(av.date, 'YYYY'),
to_char(av.date, 'MM'),
to_char(av.date, 'YYYY-MM-DD'),
av.partner_id, av.partner_id,
aj.currency, aj.currency,
av.journal_id, av.journal_id,

33
addons/account_voucher/report/account_voucher_sales_receipt_view.xml
View File

@ -1,34 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<openerp> <openerp>
<data> <data>
<!-- <record id="view_sale_receipt_report_tree" model="ir.ui.view">
<field name="name">sale.receipt.report.tree</field>
<field name="model">sale.receipt.report</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false" string="Sales Receipts Analysis">
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="year" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="type" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="state" invisible="1"/>
<field name="currency_id" invisible="1"/>
<field name="journal_id" invisible="1"/>
<field name="date_due" invisible="1"/>
<field name="account_id" invisible="1"/>
<field name="nbr" sum="# of Voucher Lines"/>
<field name="price_total" sum="Total Without Tax"/>
<field name="price_total_tax" sum="Total With Tax"/>
<field name="due_delay" sum="Avg. Due Delay"/>
<field name="delay_to_pay" sum="Avg. Delay To Pay"/>
</tree>
</field>
</record>
-->
<record id="view_sale_receipt_report_graph" model="ir.ui.view"> <record id="view_sale_receipt_report_graph" model="ir.ui.view">
<field name="name">sale.receipt.report.graph</field> <field name="name">sale.receipt.report.graph</field>
<field name="model">sale.receipt.report</field> <field name="model">sale.receipt.report</field>
@ -65,9 +38,7 @@
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Due Month" icon="terp-go-today" context="{'group_by':'date_due'}"/> <filter string="Due Month" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Invoice Date" name="month" icon="terp-go-month" context="{'group_by':'date'}" help="Group by month of Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
</group> </group>
</search> </search>
</field> </field>

4
addons/crm/report/crm_lead_report.py
View File

@ -91,7 +91,7 @@ class crm_lead_report(osv.osv):
date(c.date_open) as opening_date, date(c.date_open) as opening_date,
date(c.date_closed) as date_closed, date(c.date_closed) as date_closed,
date_trunc('day',c.date_last_stage_update) as date_last_stage_update, c.date_last_stage_update as date_last_stage_update,
c.user_id, c.user_id,
c.probability, c.probability,
@ -107,7 +107,7 @@ class crm_lead_report(osv.osv):
c.country_id, c.country_id,
c.planned_revenue, c.planned_revenue,
c.planned_revenue*(c.probability/100) as probable_revenue, c.planned_revenue*(c.probability/100) as probable_revenue,
date_trunc('day',c.create_date) as create_date, c.create_date as create_date,
extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close,
abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected, abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected,
extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open

8
addons/crm/report/crm_phonecall_report.py
View File

@ -55,7 +55,6 @@ class crm_phonecall_report(osv.osv):
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
'opening_date': fields.date('Opening Date', readonly=True, select=True), 'opening_date': fields.date('Opening Date', readonly=True, select=True),
'creation_date': fields.date('Creation Date', readonly=True, select=True),
'date_closed': fields.date('Close Date', readonly=True, select=True), 'date_closed': fields.date('Close Date', readonly=True, select=True),
} }
@ -69,9 +68,8 @@ class crm_phonecall_report(osv.osv):
create or replace view crm_phonecall_report as ( create or replace view crm_phonecall_report as (
select select
id, id,
to_char(c.create_date, 'YYYY-MM-DD') as creation_date, date(c.date_open) as opening_date,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date, date(c.date_closed) as date_closed,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.state, c.state,
c.user_id, c.user_id,
c.section_id, c.section_id,
@ -81,7 +79,7 @@ class crm_phonecall_report(osv.osv):
c.company_id, c.company_id,
c.priority, c.priority,
1 as nbr, 1 as nbr,
date_trunc('day',c.create_date) as create_date, c.create_date as create_date,
extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close,
extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open
from from

5
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -41,7 +41,6 @@
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="creation_date"/>
<field name="opening_date"/> <field name="opening_date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
@ -53,9 +52,7 @@
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Creation Date (day)" icon="terp-go-today" domain="[]" context="{'group_by':'create_date:day'}" help="Date of call"/> <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date:month'}" help="Month of call"/>
<filter string="Creation Date (month)" icon="terp-go-month" domain="[]" context="{'group_by':'create_date:month'}" help="Month of call"/>
<filter string="Creation Date (year)" icon="terp-go-year" domain="[]" context="{'group_by':'create_date:name'}" help="Year of call"/>
</group> </group>
</search> </search>
</field> </field>

21
addons/crm_claim/report/crm_claim_report.py
View File

@ -37,19 +37,12 @@ class crm_claim_report(osv.osv):
_description = "CRM Claim Report" _description = "CRM Claim Report"
_columns = { _columns = {
'name': fields.char('Year', required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True, select=True), 'create_date': fields.datetime('Create Date', readonly=True, select=True),
'day': fields.char('Day', size=128, readonly=True), 'claim_date': fields.datetime('Claim Date', readonly=True),
'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
'categ_id': fields.many2one('crm.case.categ', 'Category',\ 'categ_id': fields.many2one('crm.case.categ', 'Category',\
@ -76,11 +69,9 @@ class crm_claim_report(osv.osv):
create or replace view crm_claim_report as ( create or replace view crm_claim_report as (
select select
min(c.id) as id, min(c.id) as id,
to_char(c.date, 'YYYY') as name, c.date as claim_date,
to_char(c.date, 'MM') as month, date(c.date_closed) as date_closed,
to_char(c.date, 'YYYY-MM-DD') as day, c.date_deadline as date_deadline,
to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
c.user_id, c.user_id,
c.stage_id, c.stage_id,
c.section_id, c.section_id,
@ -90,13 +81,13 @@ class crm_claim_report(osv.osv):
count(*) as nbr, count(*) as nbr,
c.priority as priority, c.priority as priority,
c.type_action as type_action, c.type_action as type_action,
date_trunc('day',c.create_date) as create_date, c.create_date as create_date,
avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close, avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close,
(SELECT count(id) FROM mail_message WHERE model='crm.claim' AND res_id=c.id) AS email, (SELECT count(id) FROM mail_message WHERE model='crm.claim' AND res_id=c.id) AS email,
extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected
from from
crm_claim c crm_claim c
group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ group by c.date,\
c.user_id,c.section_id, c.stage_id,\ c.user_id,c.section_id, c.stage_id,\
c.categ_id,c.partner_id,c.company_id,c.create_date, c.categ_id,c.partner_id,c.company_id,c.create_date,
c.priority,c.type_action,c.date_deadline,c.date_closed,c.id c.priority,c.type_action,c.date_deadline,c.date_closed,c.id

4
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -53,9 +53,7 @@
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/> <filter string="Claim Date" icon="terp-go-month" domain="[]" context="{'group_by':'claim_date'}" help="Month of claim"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of claim"/>
</group> </group>
</search> </search>
</field> </field>

19
addons/crm_helpdesk/report/crm_helpdesk_report.py
View File

@ -39,17 +39,11 @@ class crm_helpdesk_report(osv.osv):
_auto = False _auto = False
_columns = { _columns = {
'name': fields.char('Year', required=False, readonly=True), 'date': fields.datetime('Date', readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg"), 'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg"),
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
@ -64,7 +58,6 @@ class crm_helpdesk_report(osv.osv):
'create_date': fields.date('Creation Date' , readonly=True, select=True), 'create_date': fields.date('Creation Date' , readonly=True, select=True),
'date_closed': fields.date('Close Date', readonly=True, select=True), 'date_closed': fields.date('Close Date', readonly=True, select=True),
'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"), 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
'day': fields.char('Day', size=128, readonly=True),
'email': fields.integer('# Emails', size=128, readonly=True), 'email': fields.integer('# Emails', size=128, readonly=True),
} }
@ -80,11 +73,9 @@ class crm_helpdesk_report(osv.osv):
create or replace view crm_helpdesk_report as ( create or replace view crm_helpdesk_report as (
select select
min(c.id) as id, min(c.id) as id,
to_char(c.date, 'YYYY') as name, c.date as date,
to_char(c.date, 'MM') as month, date(c.create_date) as create_date,
to_char(c.date, 'YYYY-MM-DD') as day, date(c.date_closed) as date_closed,
to_char(c.create_date, 'YYYY-MM-DD') as create_date,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.state, c.state,
c.user_id, c.user_id,
c.section_id, c.section_id,
@ -102,7 +93,7 @@ class crm_helpdesk_report(osv.osv):
from from
crm_helpdesk c crm_helpdesk c
where c.active = 'true' where c.active = 'true'
group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ group by c.date,\
c.state, c.user_id,c.section_id,c.priority,\ c.state, c.user_id,c.section_id,c.priority,\
c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\ c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\
c.categ_id,c.channel_id,c.planned_cost,c.id c.categ_id,c.channel_id,c.planned_cost,c.id

4
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -49,9 +49,7 @@
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" /> <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Month of helpdesk requests"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
</group> </group>
</search> </search>
</field> </field>

8
addons/crm_partner_assign/report/crm_lead_report.py
View File

@ -48,7 +48,6 @@ class crm_lead_report_assign(osv.osv):
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True), 'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
'opening_date': fields.date('Opening Date', readonly=True), 'opening_date': fields.date('Opening Date', readonly=True),
'creation_date': fields.date('Creation Date', readonly=True),
'date_closed': fields.date('Close Date', readonly=True), 'date_closed': fields.date('Close Date', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
@ -69,9 +68,8 @@ class crm_lead_report_assign(osv.osv):
CREATE OR REPLACE VIEW crm_lead_report_assign AS ( CREATE OR REPLACE VIEW crm_lead_report_assign AS (
SELECT SELECT
c.id, c.id,
to_char(c.create_date, 'YYYY-MM-DD') as creation_date, date(c.date_open) as opening_date,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date, date(c.date_closed) as date_closed,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.date_assign, c.date_assign,
c.user_id, c.user_id,
c.probability, c.probability,
@ -89,7 +87,7 @@ class crm_lead_report_assign(osv.osv):
p.date as partner_date, p.date as partner_date,
c.planned_revenue*(c.probability/100) as probable_revenue, c.planned_revenue*(c.probability/100) as probable_revenue,
1 as nbr, 1 as nbr,
date_trunc('day',c.create_date) as create_date, c.create_date as create_date,
extract('epoch' from (c.write_date-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.write_date-c.create_date))/(3600*24) as delay_close,
extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected, extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected,
extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open

5
addons/crm_partner_assign/report/crm_lead_report_view.xml
View File

@ -18,7 +18,6 @@
<field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
<separator /> <separator />
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="creation_date"/>
<field name="opening_date"/> <field name="opening_date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
@ -35,9 +34,7 @@
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" /> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
<filter string="Assign Date (day)" icon="terp-go-today" domain="[]" context="{'group_by':'date_assign:day'}"/> <filter string="Assign Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_assign:month'}"/>
<filter string="Assign Date (month)" icon="terp-go-month" domain="[]" context="{'group_by':'date_assign:month'}"/>
<filter string="Assign Date (year)" icon="terp-go-year" domain="[]" context="{'group_by':'date_assign:year'}"/>
</group> </group>
</search> </search>
</field> </field>

4
addons/event/report/report_event_registration_view.xml
View File

@ -41,9 +41,7 @@
<filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/> <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/>
<filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/> <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Event Date (day)" domain="[]" context="{'group_by':'event_date:day'}" help="Event Beginning Date"/> <filter string="Event Date" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
<filter string="Event Date (month)" domain="[]" context="{'group_by':'event_date:month'}" help="Event Beginning Date"/>
<filter string="Event Date (year)" domain="[]" context="{'group_by':'event_date:year'}" help="Event Beginning Date"/>
</group> </group>
<group expand="0" string="Display"> <group expand="0" string="Display">
<filter icon="terp-camera_test" string="Show Confirmed Registrations" <filter icon="terp-camera_test" string="Show Confirmed Registrations"

10
addons/fleet/fleet.py
View File

@ -53,15 +53,6 @@ class fleet_vehicle_cost(osv.Model):
odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context) odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context)
return self.write(cr, uid, id, {'odometer_id': odometer_id}, context=context) return self.write(cr, uid, id, {'odometer_id': odometer_id}, context=context)
def _year_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
res = {}
for record in self.browse(cr, uid, ids, context=context):
if (record.date):
res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
else:
res[record.id] = _('Unknown')
return res
_columns = { _columns = {
'name': fields.related('vehicle_id', 'name', type="char", string='Name', store=True), 'name': fields.related('vehicle_id', 'name', type="char", string='Name', store=True),
'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'), 'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
@ -76,7 +67,6 @@ class fleet_vehicle_cost(osv.Model):
'date' :fields.date('Date',help='Date when the cost has been executed'), 'date' :fields.date('Date',help='Date when the cost has been executed'),
'contract_id': fields.many2one('fleet.vehicle.log.contract', 'Contract', help='Contract attached to this cost'), 'contract_id': fields.many2one('fleet.vehicle.log.contract', 'Contract', help='Contract attached to this cost'),
'auto_generated': fields.boolean('Automatically Generated', readonly=True, required=True), 'auto_generated': fields.boolean('Automatically Generated', readonly=True, required=True),
'year': fields.function(_year_get_fnc, type="char", string='Year', store=True),
} }
_defaults ={ _defaults ={

3
addons/fleet/fleet_view.xml
View File

@ -919,13 +919,12 @@
<search string="Vehicles costs" > <search string="Vehicles costs" >
<field name="vehicle_id" /> <field name="vehicle_id" />
<field name="cost_subtype_id"/> <field name="cost_subtype_id"/>
<field name="year"/>
<field name="date"/> <field name="date"/>
<field name="parent_id"/> <field name="parent_id"/>
<filter name="parent_false" domain="[('parent_id','=',False)]" string="Effective Costs"/> <filter name="parent_false" domain="[('parent_id','=',False)]" string="Effective Costs"/>
<filter name="parent_true" domain="[('parent_id','!=',False)]" string="Indicative Costs"/> <filter name="parent_true" domain="[('parent_id','!=',False)]" string="Indicative Costs"/>
<group expand="1" string="Group By"> <group expand="1" string="Group By">
<filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/> <filter name="groupby_year" context="{'group_by' : 'date:year'}" string="Year"/>
<filter name="groupby_date" context="{'group_by' : 'date'}" string="Vehicle Costs Month" help="Vehicle Costs by Month"/> <filter name="groupby_date" context="{'group_by' : 'date'}" string="Vehicle Costs Month" help="Vehicle Costs by Month"/>
<filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/> <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
<filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/> <filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>

14
addons/hr_evaluation/report/hr_evaluation_report.py
View File

@ -31,14 +31,9 @@ class hr_evaluation_report(osv.Model):
'create_date': fields.date('Create Date', readonly=True), 'create_date': fields.date('Create Date', readonly=True),
'delay_date': fields.float('Delay to Start', digits=(16, 2), readonly=True), 'delay_date': fields.float('Delay to Start', digits=(16, 2), readonly=True),
'overpass_delay': fields.float('Overpassed Deadline', digits=(16, 2), readonly=True), 'overpass_delay': fields.float('Overpassed Deadline', digits=(16, 2), readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'deadline': fields.date("Deadline", readonly=True), 'deadline': fields.date("Deadline", readonly=True),
'request_id': fields.many2one('survey.user_input', 'Request_id', readonly=True), 'request_id': fields.many2one('survey.user_input', 'Request_id', readonly=True),
'closed': fields.date("closed", readonly=True), 'closed': fields.date("closed", readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', readonly=True), 'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', readonly=True),
'employee_id': fields.many2one('hr.employee', "Employee", readonly=True), 'employee_id': fields.many2one('hr.employee', "Employee", readonly=True),
'rating': fields.selection([ 'rating': fields.selection([
@ -73,16 +68,13 @@ class hr_evaluation_report(osv.Model):
create or replace view hr_evaluation_report as ( create or replace view hr_evaluation_report as (
select select
min(l.id) as id, min(l.id) as id,
date_trunc('day',s.create_date) as create_date, date(s.create_date) as create_date,
to_char(s.create_date, 'YYYY-MM-DD') as day,
s.employee_id, s.employee_id,
l.request_id, l.request_id,
s.plan_id, s.plan_id,
s.rating, s.rating,
s.date as deadline, s.date as deadline,
s.date_close as closed, s.date_close as closed,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
count(l.*) as nbr, count(l.*) as nbr,
s.state, s.state,
avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as delay_date, avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as delay_date,
@ -93,10 +85,6 @@ class hr_evaluation_report(osv.Model):
hr_evaluation_evaluation s on (s.id=l.evaluation_id) hr_evaluation_evaluation s on (s.id=l.evaluation_id)
GROUP BY GROUP BY
s.create_date, s.create_date,
date_trunc('day',s.create_date),
to_char(s.create_date, 'YYYY-MM-DD'),
to_char(s.create_date, 'YYYY'),
to_char(s.create_date, 'MM'),
s.state, s.state,
s.employee_id, s.employee_id,
s.date, s.date,

4
addons/hr_evaluation/report/hr_evaluation_report_view.xml
View File

@ -35,9 +35,7 @@
<filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/> <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
<filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/> <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Creation Date" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
</group> </group>
</search> </search>
</field> </field>

26
addons/hr_expense/report/hr_expense_report.py
View File

@ -32,11 +32,7 @@ class hr_expense_report(osv.osv):
_rec_name = 'date' _rec_name = 'date'
_columns = { _columns = {
'date': fields.date('Date ', readonly=True), 'date': fields.date('Date ', readonly=True),
'year': fields.char('Year', size=4, readonly=True), 'create_date': fields.datetime('Creation Date', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True),
'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True), 'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True),
'product_qty':fields.float('Qty', readonly=True), 'product_qty':fields.float('Qty', readonly=True),
@ -70,17 +66,15 @@ class hr_expense_report(osv.osv):
create or replace view hr_expense_report as ( create or replace view hr_expense_report as (
select select
min(l.id) as id, min(l.id) as id,
date_trunc('day',s.date) as date, s.date as date,
s.create_date as create_date,
s.employee_id, s.employee_id,
s.journal_id, s.journal_id,
s.currency_id, s.currency_id,
to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm, s.date_confirm as date_confirm,
to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid, s.date_valid as date_valid,
s.user_valid as user_id, s.user_valid as user_id,
s.department_id, s.department_id,
to_char(date_trunc('day',s.create_date), 'YYYY') as year,
to_char(date_trunc('day',s.create_date), 'MM') as month,
to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day,
avg(extract('epoch' from age(s.date_valid,s.date)))/(3600*24) as delay_valid, avg(extract('epoch' from age(s.date_valid,s.date)))/(3600*24) as delay_valid,
avg(extract('epoch' from age(s.date_valid,s.date_confirm)))/(3600*24) as delay_confirm, avg(extract('epoch' from age(s.date_valid,s.date_confirm)))/(3600*24) as delay_confirm,
l.product_id as product_id, l.product_id as product_id,
@ -97,12 +91,10 @@ class hr_expense_report(osv.osv):
left join hr_expense_expense s on (s.id=l.expense_id) left join hr_expense_expense s on (s.id=l.expense_id)
left join product_uom u on (u.id=l.uom_id) left join product_uom u on (u.id=l.uom_id)
group by group by
date_trunc('day',s.date), s.date,
to_char(date_trunc('day',s.create_date), 'YYYY'), s.create_date,
to_char(date_trunc('day',s.create_date), 'MM'), s.date_confirm,
to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'), s.date_valid,
to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY'),
to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
l.product_id, l.product_id,
l.analytic_account, l.analytic_account,
s.currency_id, s.currency_id,

4
addons/hr_expense/report/hr_expense_report_view.xml
View File

@ -43,9 +43,7 @@
<filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/> <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Create Date" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
</group> </group>
</search> </search>
</field> </field>

9
addons/hr_recruitment/report/hr_recruitment_report.py
View File

@ -61,11 +61,8 @@ class hr_recruitment_report(osv.Model):
select select
min(s.id) as id, min(s.id) as id,
s.create_date as date_create, s.create_date as date_create,
date_trunc('day',s.date_closed) as date_closed, date(s.date_closed) as date_closed,
date_trunc('day',s.date_last_stage_update) as date_last_stage_update, s.date_last_stage_update as date_last_stage_update,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
to_char(s.create_date, 'YYYY-MM-DD') as day,
s.partner_id, s.partner_id,
s.company_id, s.company_id,
s.user_id, s.user_id,
@ -84,8 +81,6 @@ class hr_recruitment_report(osv.Model):
count(*) as nbr count(*) as nbr
from hr_applicant s from hr_applicant s
group by group by
date_trunc('day',s.create_date),
date_trunc('day',s.date_closed),
s.date_open, s.date_open,
s.create_date, s.create_date,
s.write_date, s.write_date,

5
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -67,10 +67,7 @@
<filter string="Last Stage" help="Match this group by with a specific stage filter in order to analyse the recruitment process" context="{'group_by':'last_stage_id'}"/> <filter string="Last Stage" help="Match this group by with a specific stage filter in order to analyse the recruitment process" context="{'group_by':'last_stage_id'}"/>
<filter string="Stage" context="{'group_by':'stage_id'}" /> <filter string="Stage" context="{'group_by':'stage_id'}" />
<filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" /> <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
<filter string="Creation Date (day)" context="{'group_by':'date_create:day'}" help="Creation Date"/> <filter string="Creation Date" context="{'group_by':'date_create'}" help="Creation Date"/>
<filter string="Creation Date (week)" context="{'group_by':'date_create:week'}" help="Creation Date"/>
<filter string="Creation Date (month)" context="{'group_by':'date_create:month'}" help="Creation Date"/>
<filter string="Creation Date (year)" context="{'group_by':'date_create:year'}" help="Creation Date"/>
</group> </group>
</search> </search>
</field> </field>

8
addons/hr_timesheet/report/hr_timesheet_report.py
View File

@ -8,11 +8,6 @@ class hr_timesheet_report(osv.osv):
_description = "Timesheet" _description = "Timesheet"
_auto = False _auto = False
_columns = { _columns = {
'year': fields.char('Year',size=64,required=False, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'date': fields.date('Date', readonly=True), 'date': fields.date('Date', readonly=True),
'name': fields.char('Description', size=64,readonly=True), 'name': fields.char('Description', size=64,readonly=True),
'product_id' : fields.many2one('product.product', 'Product',readonly=True), 'product_id' : fields.many2one('product.product', 'Product',readonly=True),
@ -29,9 +24,6 @@ class hr_timesheet_report(osv.osv):
select_str = """ select_str = """
SELECT min(hat.id) as id, SELECT min(hat.id) as id,
aal.date as date, 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,
sum(aal.amount) as cost, sum(aal.amount) as cost,
sum(aal.unit_amount) as quantity, sum(aal.unit_amount) as quantity,
aal.account_id as account_id, aal.account_id as account_id,

6
addons/hr_timesheet/report/hr_timesheet_report_view.xml
View File

@ -35,9 +35,7 @@
<filter string="Analytic Account" name="analytic_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> <filter string="Analytic Account" name="analytic_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<filter string="General Account" name="general_account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="General Account" name="general_account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/> <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}" help="Group by month of date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
</group> </group>
</search> </search>
</field> </field>
@ -48,7 +46,7 @@
<field name="res_model">hr.timesheet.report</field> <field name="res_model">hr.timesheet.report</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field> <field name="context">{'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
</record> </record>
<menuitem action="action_hr_timesheet_report_stat_all" id="menu_hr_timesheet_report_all" <menuitem action="action_hr_timesheet_report_stat_all" id="menu_hr_timesheet_report_all"

1
addons/hr_timesheet_sheet/report/hr_timesheet_report.py
View File

@ -33,7 +33,6 @@ class hr_timesheet_report(osv.osv):
'department_id':fields.many2one('hr.department','Department',readonly=True), 'department_id':fields.many2one('hr.department','Department',readonly=True),
'date_from': fields.date('Date from',readonly=True,), 'date_from': fields.date('Date from',readonly=True,),
'date_to': fields.date('Date to',readonly=True), 'date_to': fields.date('Date to',readonly=True),
'date_current': fields.date('Current date', required=True),
'state' : fields.selection([ 'state' : fields.selection([
('new', 'New'), ('new', 'New'),
('draft','Draft'), ('draft','Draft'),

32
addons/membership/report/report_membership.py
View File

@ -39,17 +39,10 @@ class report_membership(osv.osv):
_name = 'report.membership' _name = 'report.membership'
_description = __doc__ _description = __doc__
_auto = False _auto = False
_rec_name = 'year' _rec_name = 'start_date'
_columns = { _columns = {
'year': fields.char('Year', size=4, readonly=True, select=1), 'start_date': fields.date('Start Date', readonly=True),
'month': fields.selection([('01', 'January'), ('02', 'February'), \ 'date_to': fields.date('End Date', readonly=True, help="End membership date"),
('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),
'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),
'num_waiting': fields.integer('# Waiting', readonly=True), 'num_waiting': fields.integer('# Waiting', readonly=True),
'num_invoiced': fields.integer('# Invoiced', readonly=True), 'num_invoiced': fields.integer('# Invoiced', readonly=True),
'num_paid': fields.integer('# Paid', readonly=True), 'num_paid': fields.integer('# Paid', readonly=True),
@ -75,10 +68,8 @@ class report_membership(osv.osv):
membership_state, membership_state,
associate_member_id, associate_member_id,
membership_amount, membership_amount,
date_from,
date_to, date_to,
year, start_date,
month,
COUNT(num_waiting) AS num_waiting, COUNT(num_waiting) AS num_waiting,
COUNT(num_invoiced) AS num_invoiced, COUNT(num_invoiced) AS num_invoiced,
COUNT(num_paid) AS num_paid, COUNT(num_paid) AS num_paid,
@ -94,10 +85,8 @@ class report_membership(osv.osv):
p.membership_state AS membership_state, p.membership_state AS membership_state,
p.associate_member AS associate_member_id, p.associate_member AS associate_member_id,
p.membership_amount AS membership_amount, p.membership_amount AS membership_amount,
TO_CHAR(p.membership_start, 'YYYY-MM-DD') AS date_from, p.membership_stop AS date_to,
TO_CHAR(p.membership_stop, 'YYYY-MM-DD') AS date_to, p.membership_start AS start_date,
TO_CHAR(p.membership_start, 'YYYY') AS year,
TO_CHAR(p.membership_start,'MM') AS month,
CASE WHEN ml.state = 'waiting' THEN ml.id END AS num_waiting, CASE WHEN ml.state = 'waiting' THEN ml.id END AS num_waiting,
CASE WHEN ml.state = 'invoiced' THEN ml.id END AS num_invoiced, CASE WHEN ml.state = 'invoiced' THEN ml.id END AS num_invoiced,
CASE WHEN ml.state = 'paid' THEN ml.id END AS num_paid, CASE WHEN ml.state = 'paid' THEN ml.id END AS num_paid,
@ -116,19 +105,14 @@ class report_membership(osv.osv):
p.membership_state, p.membership_state,
p.associate_member, p.associate_member,
p.membership_amount, p.membership_amount,
TO_CHAR(p.membership_start, 'YYYY-MM-DD'), p.membership_start,
TO_CHAR(p.membership_stop, 'YYYY-MM-DD'),
TO_CHAR(p.membership_start, 'YYYY'),
TO_CHAR(p.membership_start,'MM'),
ml.membership_id, ml.membership_id,
p.company_id, p.company_id,
ml.state, ml.state,
ml.id ml.id
) AS foo ) AS foo
GROUP BY GROUP BY
year, start_date,
month,
date_from,
date_to, date_to,
partner_id, partner_id,
user_id, user_id,

10
addons/membership/report/report_membership_view.xml
View File

@ -7,7 +7,6 @@
<field name="model">report.membership</field> <field name="model">report.membership</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Membership"> <search string="Membership">
<field name="date_from"/>
<filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/> <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
<filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/> <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
<field name="partner_id"/> <field name="partner_id"/>
@ -24,10 +23,8 @@
domain="[]" context="{'group_by':'membership_state'}"/> domain="[]" context="{'group_by':'membership_state'}"/>
<filter string="Company" icon="terp-go-home" <filter string="Company" icon="terp-go-home"
domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Year" name="year" icon="terp-go-year" <filter string="Date" name="start_date" icon="terp-go-year"
domain="[]" context="{'group_by':'year'}"/> domain="[]" context="{'group_by':'start_date:year'}"/>
<filter string="Month" name="month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -38,7 +35,6 @@
<field name="model">report.membership</field> <field name="model">report.membership</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph string="Membership" type="pivot"> <graph string="Membership" type="pivot">
<field name="year" type="row" />
<field name="num_paid" type="measure"/> <field name="num_paid" type="measure"/>
<field name="tot_earned" type="measure"/> <field name="tot_earned" type="measure"/>
</graph> </graph>
@ -51,7 +47,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="search_view_id" ref="view_report_membership_search"/> <field name="search_view_id" ref="view_report_membership_search"/>
<field name="context">{"search_default_year":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field> <field name="context">{"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
</record> </record>
<menuitem name="Members Analysis" parent="base.menu_report_association" <menuitem name="Members Analysis" parent="base.menu_report_association"

2
addons/mrp_operations/report/mrp_workorder_analysis.py
View File

@ -45,7 +45,7 @@ class mrp_workorder(osv.osv):
cr.execute(""" cr.execute("""
create or replace view mrp_workorder as ( create or replace view mrp_workorder as (
select select
to_date(to_char(wl.date_planned, 'MM-dd-YYYY'),'MM-dd-YYYY') as date, date(wl.date_planned) as date,
min(wl.id) as id, min(wl.id) as id,
mp.product_id as product_id, mp.product_id as product_id,
sum(wl.hour) as total_hours, sum(wl.hour) as total_hours,

4
addons/mrp_operations/report/mrp_workorder_analysis_view.xml
View File

@ -34,9 +34,7 @@
<filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" /> <filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" />
<filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/> <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Date Planned (day)" icon="terp-go-today" context="{'group_by':'date:day'}" help="Planned Day"/> <filter string="Date Planned" name="terp-go-month" icon="terp-go-month" context="{'group_by':'date:month'}" help="Planned Month"/>
<filter string="Date Planned (month)" name="terp-go-month" icon="terp-go-month" context="{'group_by':'date:month'}" help="Planned Month"/>
<filter string="Date Planned (year)" icon="terp-go-year" context="{'group_by':'date:year'}" help="Planned Year"/>
</group> </group>
</search> </search>
</field> </field>

4
addons/point_of_sale/report/pos_order_report_view.xml
View File

@ -37,9 +37,7 @@
<filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/> <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Stock Location" context="{'group_by': 'location_id'}"/> <filter string="Stock Location" context="{'group_by': 'location_id'}"/>
<filter string="Order Date (day)" icon="terp-go-today" context="{'group_by':'date:day'}" help="Day of order date"/> <filter string="Order Date" icon="terp-go-month" context="{'group_by':'date:month'}" help="Month of order date"/>
<filter string="Order Date (month)" icon="terp-go-month" context="{'group_by':'date:month'}" help="Month of order date"/>
<filter string="Order Date (year)" icon="terp-go-year" context="{'group_by':'date:year'}" help="Year of order date"/>
</group> </group>
</search> </search>
</field> </field>

9
addons/project/report/project_report.py
View File

@ -65,11 +65,10 @@ class report_project_task_user(osv.osv):
SELECT SELECT
(select 1 ) AS nbr, (select 1 ) AS nbr,
t.id as id, t.id as id,
date_trunc('day',t.date_start) as date_start, date(t.date_start) as date_start,
date_trunc('day',t.date_end) as date_end, date(t.date_end) as date_end,
date_trunc('day',t.date_last_stage_update) as date_last_stage_update, date(t.date_last_stage_update) as date_last_stage_update,
to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline, t.date_deadline as date_deadline,
-- sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24)) as no_of_days, abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24)) as no_of_days,
t.user_id, t.user_id,
t.reviewer_id, t.reviewer_id,

4
addons/project/report/project_report_view.xml
View File

@ -64,9 +64,7 @@
<filter string="Contact" context="{'group_by':'partner_id'}" /> <filter string="Contact" context="{'group_by':'partner_id'}" />
<filter string="Assigned to" name="User" context="{'group_by':'user_id'}" /> <filter string="Assigned to" name="User" context="{'group_by':'user_id'}" />
<filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Assignation date (day)" context="{'group_by':'date_start:day'}" help="Creation Date"/> <filter string="Assignation date" context="{'group_by':'date_start:month'}" help="Creation Date"/>
<filter string="Assignation date (month)" context="{'group_by':'date_start:month'}" help="Creation Date"/>
<filter string="Assignation date (year)" context="{'group_by':'date_start:year'}" help="Creation Date"/>
<filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" help="Last Stage Update"/> <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" help="Last Stage Update"/>
</group> </group>
</search> </search>

17
addons/project_issue/report/project_issue_report.py
View File

@ -29,13 +29,10 @@ class project_issue_report(osv.osv):
_auto = False _auto = False
_columns = { _columns = {
'name': fields.char('Year', size=64, required=False, readonly=True),
'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'opening_date': fields.date('Date of Opening', readonly=True), 'opening_date': fields.date('Date of Opening', readonly=True),
'creation_date': fields.date('Creation Date', readonly=True), 'create_date': fields.date('Create Date', readonly=True),
'date_closed': fields.date('Date of Closing', readonly=True), 'date_closed': fields.date('Date of Closing', readonly=True),
'date_last_stage_update': fields.date('Last Stage Update', readonly=True), 'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
'stage_id': fields.many2one('project.task.type', 'Stage'), 'stage_id': fields.many2one('project.task.type', 'Stage'),
@ -63,18 +60,15 @@ class project_issue_report(osv.osv):
CREATE OR REPLACE VIEW project_issue_report AS ( CREATE OR REPLACE VIEW project_issue_report AS (
SELECT SELECT
c.id as id, c.id as id,
to_char(c.create_date, 'YYYY') as name, date(c.date_open) as opening_date,
to_char(c.create_date, 'MM') as month, date(c.create_date) as create_date,
to_char(c.create_date, 'YYYY-MM-DD') as day, date(c.date_last_stage_update) as date_last_stage_update,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
date_trunc('day',c.date_last_stage_update) as date_last_stage_update,
c.user_id, c.user_id,
c.working_hours_open, c.working_hours_open,
c.working_hours_close, c.working_hours_close,
c.section_id, c.section_id,
c.stage_id, c.stage_id,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, date(c.date_closed) as date_closed,
c.company_id as company_id, c.company_id as company_id,
c.priority as priority, c.priority as priority,
c.project_id as project_id, c.project_id as project_id,
@ -83,7 +77,6 @@ class project_issue_report(osv.osv):
c.partner_id, c.partner_id,
c.channel, c.channel,
c.task_id, c.task_id,
date_trunc('day',c.create_date) as create_date,
c.day_open as delay_open, c.day_open as delay_open,
c.day_close as delay_close, c.day_close as delay_close,
(SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email

5
addons/project_issue/report/project_issue_report_view.xml
View File

@ -34,7 +34,6 @@
<field name="model">project.issue.report</field> <field name="model">project.issue.report</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<field name="creation_date"/>
<field name="project_id"/> <field name="project_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
@ -54,9 +53,7 @@
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Create Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Create Date"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
<filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/> <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
</group> </group>
</search> </search>

2
addons/purchase/report/purchase_report.py
View File

@ -68,7 +68,7 @@ class purchase_report(osv.osv):
create or replace view purchase_report as ( create or replace view purchase_report as (
select select
min(l.id) as id, min(l.id) as id,
s.date_order as date, date(s.date_order) as date,
s.state, s.state,
s.date_approve, s.date_approve,
s.minimum_planned_date as expected_date, s.minimum_planned_date as expected_date,

4
addons/purchase/report/purchase_report_view.xml
View File

@ -47,9 +47,7 @@
<filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/> <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Order Date (day)" icon="terp-go-today" context="{'group_by':'date:day'}" help="Order of Day"/> <filter string="Order Date" icon="terp-go-month" context="{'group_by':'date:month'}" help="Order of Day"/>
<filter string="Order Date (month)" icon="terp-go-month" context="{'group_by':'date:month'}" help="Order of Day"/>
<filter string="Order Date (year)" icon="terp-go-year" context="{'group_by':'date:year'}" help="Order of Day"/>
</group> </group>
</search> </search>
</field> </field>