pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge lp:~openerp-dev/openobject-addons/trunk-clean-search-account_followup-tpa

Browse Source 
bzr revid: jam@tinyerp.com-20120723121555-6dwo0fmb3b4y9lfc
This commit is contained in:
Jigar Amin - OpenERP
2012-07-23 17:45:55 +05:30
parent 5f45952e2a 900934007a
commit 6aede87bca
3 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_followup/account_followup_view.xml
+2 -5
View File
@@ -71,11 +71,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Follow-up">
<group>
<field name="name" string="Follow-up"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<field name="name" string="Follow-up"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
</record>
addons/account_followup/report/account_followup_report.xml
+9 -20
View File
@@ -40,31 +40,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Follow-ups Sent">
<group>
<field name="date_move"/>
<field name="date_move_last"/>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string="This Fiscal year"
name="fiscalyear"
domain="[('period_id','in','current_year')]"
help="Follow-up Entries with period in current year"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Not Litigation"
domain="[('blocked','=', False)]"
help = "Including journal entries marked as a litigation"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="balance"/>
</group>
<newline/>
<field name="date_move"/>
<field name="date_move_last"/>
<field name="partner_id"/>
<field name="balance"/>
<filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]"
help="Follow-up Entries with period in current year"/>
<separator/>
<filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
help = "Including journal entries marked as a litigation"/>
<group expand="1" string="Group By...">
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="Litigation" icon="terp-camera_test" context="{'group_by':'blocked'}" />
<separator orientation="vertical"/>
<filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
<filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
</group>
</search>
addons/account_followup/wizard/account_followup_print_view.xml
+1 -3
View File
@@ -42,12 +42,10 @@
<field name="arch" type="xml">
<search string="Partner to Remind">
<field name="date_followup"/>
<separator orientation="vertical"/>
<filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="max_followup_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
</search>
</field>
</record>