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

[FIX]: fix a changes for the sale receipt and account voucher search view 

bzr revid: mga@tinyerp.com-20100914090306-ht9iqm98goi6it9g
This commit is contained in:
Mantavya Gajjar 2010-09-14 14:33:06 +05:30
parent da3be9e496
commit 596a6ccbc6
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account_voucher/voucher.py
View File

@ -652,11 +652,11 @@ class account_voucher(osv.osv):
type_search = {
'bank':[('type','in',['bank','cash'])],
'cash':[('type','in',['bank','cash'])],
'sale':[('type','in',['sale','purchase_refund'])],
'purchase':[('type','in',['purchase','sale_refund'])],
'sale':[('type','in',['sale','sale_refund'])],
'purchase':[('type','in',['purchase','purchase_refund'])],
'expense':[('type','in',['purchase'])],
'sale_refund':[('type','in',['sale','purchase_refund'])],
'purchase_refund':[('type','in',['purchase','sale_refund'])]
'sale_refund':[('type','in',['sale','sale_refund'])],
'purchase_refund':[('type','in',['purchase','purchase_refund'])]
}
domain = type_search.get(context.get('journal_type'))
journal_list = journal_pool.name_search(cr, uid, '', domain)

9
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -19,7 +19,7 @@
<form string="Sales Receipt">
<group col="6" colspan="4">
<field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id)" string="Customer"/>
<field name="journal_id" domain="[('type','in',['sale','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
<field name="number"/>
<field name="name" colspan="4"/>
<field name="date" on_change="onchange_date(date)"/>
@ -50,6 +50,7 @@
<field name="reference"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
</group>
<group col="4" colspan="1">
<separator string="Total" colspan="4"/>
@ -85,7 +86,7 @@
<field name="name">Sales Receipt</field>
<field name="res_model">account.voucher.open</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type','in',['sale','purchase_refund']), ('type','=','sale')]</field>
<field name="domain">[('journal_id.type','in',['sale','sale_refund']), ('type','=','sale')]</field>
<field name="context">{'journal_type':'sale', 'type':'sale'}</field>
<field name="view_id" ref="account_open_vouchers_view"/>
<field name="target">new</field>
@ -111,7 +112,7 @@
<form string="Vendor Bills">
<group col="6" colspan="4">
<field name="partner_id" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
<field name="journal_id" domain="[('type','in',['purchase','sale_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
<field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
<field name="reference" select="1"/>
<field name="name" colspan="4"/>
<field name="number"/>
@ -171,7 +172,7 @@
<field name="name">Vendor Bills</field>
<field name="res_model">account.voucher.open</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type','in',['purchase','sale_refund']), ('type','=','purchase')]</field>
<field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
<field name="context">{'journal_type':'purchase', 'type':'purchase'}</field>
<field name="view_id" ref="account_open_vouchers_view"/>
<field name="target">new</field>

24
addons/account_voucher/voucher_view.xml
View File

@ -104,6 +104,12 @@
<field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended options..." col='8' colspan='4'>
<field name="reference" select="1"/>
<field name="name" select='1'/>
<field name="narration" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." col='8' colspan='4'>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@ -111,12 +117,6 @@
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." col='8' colspan='4'>
<field name="reference" select="1"/>
<field name="name" select='1'/>
<field name="narration" select="1"/>
</group>
</search>
</field>
</record>
@ -143,18 +143,18 @@
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended options..." col='8' colspan='4'>
<field name="reference" select="1"/>
<field name="name" select='1'/>
<field name="narration" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." col='8' colspan='4'>
<field name="reference" select="1"/>
<field name="name" select='1'/>
<field name="narration" select="1"/>
</group>
</search>
</field>
</record>