Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-account_voucher-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-account_voucher-tpa/+merge/115887
[IMP] improved search view of account_voucher module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-account_voucher-tpa/+merge/115887
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-07-18 10:21:09 +0000
+++ account_voucher/account_voucher_view.xml 2012-07-20 05:45:32 +0000
@@ -126,21 +126,14 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group>
- <field name="number" string="Voucher"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
- <separator orientation="vertical"/>
- <field name="partner_id"/>
- <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
- <field name="period_id"/>
- </group>
- <newline/>
+ <field name="number" string="Voucher"/>
+ <field name="date"/>
+ <field name="partner_id"/>
+ <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
+ <field name="period_id"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+ <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+ <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
<group expand="0" string="Group By...">
<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'}"/>
=== modified file 'account_voucher/report/account_voucher_sales_receipt_view.xml'
--- account_voucher/report/account_voucher_sales_receipt_view.xml 2012-06-28 17:11:01 +0000
+++ account_voucher/report/account_voucher_sales_receipt_view.xml 2012-07-20 05:45:32 +0000
@@ -48,48 +48,26 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales Receipt Analysis">
- <group>
- <field name="date"/>
- <field name="date_due"/>
- <separator orientation="vertical"/>
- <filter string="Draft"
- icon="terp-document-new"
- domain="[('state','=','draft')]"
- help = "Draft Vouchers"/>
- <filter string="Pro-forma"
- icon="terp-gtk-media-pause"
- domain="[('state','=','proforma')]"
- help = "Pro-forma Vouchers"/>
- <filter string="Posted"
- name="current"
- icon="terp-check"
- domain="[('state','not in', ('draft','cancel'))]"
- help = "Validated Vouchers"/>
- <separator orientation="vertical"/>
- <field name="partner_id"/>
- </group>
- <newline/>
+ <field name="date"/>
+ <field name="date_due"/>
+ <field name="partner_id"/>
+ <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
+ <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
+ <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
<group expand="0" string="Extended Filters...">
<field name="journal_id" widget="selection"/>
<field name="account_id"/>
<field name="pay_now"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="company_id" groups="base.group_multi_company"/>
</group>
- <newline/>
<group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
- <separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
- <separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by 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"/>
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2012-07-18 06:49:21 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2012-07-20 05:45:32 +0000
@@ -8,21 +8,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group>
- <field name="number" string="Voucher"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
- <separator orientation="vertical"/>
- <field name="partner_id" string="Customer"/>
- <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
- <field name="period_id"/>
- </group>
- <newline/>
+ <field name="number" string="Voucher"/>
+ <field name="date"/>
+ <field name="partner_id" string="Customer"/>
+ <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
+ <field name="period_id"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+ <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -40,21 +32,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group>
- <field name="number" string="Voucher"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
- <separator orientation="vertical"/>
- <field name="partner_id" string="Supplier"/>
- <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
- <field name="period_id"/>
- </group>
- <newline/>
+ <field name="number" string="Voucher"/>
+ <field name="date"/>
+ <field name="partner_id" string="Supplier"/>
+ <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
+ <field name="period_id"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+ <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2012-07-19 04:43:15 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2012-07-20 05:45:32 +0000
@@ -7,21 +7,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group>
- <field name="number" string="Voucher"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
- <separator orientation="vertical"/>
- <field name="partner_id" string="Supplier"/>
- <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
- <field name="period_id"/>
- </group>
- <newline/>
+ <field name="number" string="Voucher"/>
+ <field name="date"/>
+ <field name="partner_id" string="Supplier"/>
+ <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
+ <field name="period_id"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+ <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -38,21 +30,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group>
- <field name="number" string="Voucher"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
- <separator orientation="vertical"/>
- <field name="partner_id" string="Customer"/>
- <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
- <field name="period_id"/>
- </group>
- <newline/>
+ <field name="number" string="Voucher"/>
+ <field name="date"/>
+ <field name="partner_id" string="Customer"/>
+ <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
+ <field name="period_id"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+ <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
_______________________________________________
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
