[IMP]: Improve SQL report for Invoice.
bzr revid: rch_open_erp-20100429082753-ao26rotnkwjwmtfh
This commit is contained in:
rch (Open ERP)
parent
6460e5ab80
commit
68137a3117
|
|
@ -61,6 +61,11 @@ class account_invoice_report(osv.osv):
|
|||
('paid','Done'),
|
||||
('cancel','Cancelled')
|
||||
], 'Order State', readonly=True),
|
||||
'date_due': fields.date('Due Date', readonly=True),
|
||||
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True),
|
||||
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True),
|
||||
'account_id': fields.many2one('account.account', 'Account',readonly=True),
|
||||
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True)
|
||||
}
|
||||
_order = 'date desc'
|
||||
def init(self, cr):
|
||||
|
|
@ -87,8 +92,13 @@ class account_invoice_report(osv.osv):
|
|||
(sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
|
||||
count(*) as nbr,
|
||||
s.type as type,
|
||||
s.state
|
||||
from
|
||||
s.state,
|
||||
s.date_due as date_due,
|
||||
s.address_contact_id as address_contact_id,
|
||||
s.address_invoice_id as address_invoice_id,
|
||||
s.account_id as account_id,
|
||||
s.partner_bank as partner_bank
|
||||
from
|
||||
account_invoice_line l
|
||||
left join
|
||||
account_invoice s on (s.id=l.invoice_id)
|
||||
|
|
@ -106,7 +116,12 @@ class account_invoice_report(osv.osv):
|
|||
s.period_id,
|
||||
s.fiscal_position,
|
||||
s.currency_id,
|
||||
s.journal_id
|
||||
s.journal_id,
|
||||
s.date_due,
|
||||
s.address_contact_id,
|
||||
s.address_invoice_id,
|
||||
s.account_id,
|
||||
s.partner_bank
|
||||
)
|
||||
""")
|
||||
account_invoice_report()
|
||||
|
|
|
|||
|
|
@ -27,6 +27,11 @@
|
|||
<field name="fiscal_position" invisible="1"/>
|
||||
<field name="currency_id" invisible="1"/>
|
||||
<field name="journal_id" invisible="1"/>
|
||||
<field name="date_due" invisible="1"/>
|
||||
<field name="address_contact_id" invisible="1"/>
|
||||
<field name="address_invoice_id" invisible="1"/>
|
||||
<field name="account_id" invisible="1"/>
|
||||
<field name="partner_bank" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -76,7 +81,6 @@
|
|||
domain="[('state', '=' ,'open')]"
|
||||
help = "In progress tasks"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="product_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
|
||||
<filter icon="terp-account"
|
||||
|
|
@ -88,6 +92,7 @@
|
|||
help="Invoices Non Users"
|
||||
domain="[('user_id','=',False)]"/>
|
||||
</field>
|
||||
<field name="product_id"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
|
|
@ -102,28 +107,44 @@
|
|||
domain="[('state', '=' ,'cancel')]"
|
||||
help = "Cancelled tasks"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="type"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="currency_id" widget="selection"/>
|
||||
<field name="journal_id" widget="selection"/>
|
||||
<newline/>
|
||||
<field name="type"/>
|
||||
<field name="address_contact_id"/>
|
||||
<field name="address_invoice_id"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="account_id"/>
|
||||
<field name="partner_bank"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="period_id" widget="selection"/>
|
||||
<field name="fiscal_position" widget="selection"/>
|
||||
<field name="date"/>
|
||||
<newline/>
|
||||
<field name="date" string="Date Invoiced"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="date_due"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="10" col="12">
|
||||
<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
|
||||
<filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
|
||||
<filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
|
||||
<filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
|
||||
<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
|
||||
<filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
|
||||
<filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
|
||||
<filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
|
||||
<filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
|
||||
<filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
|
||||
<filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
|
||||
<filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
|
||||
<filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
|
||||
<newline/>
|
||||
<filter string="Contact Address" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
|
||||
<filter string="Invoice Address" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
|
||||
<filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue