Merge lp:~openerp-dev/openobject-addons/trunk-bug-1188300-psa into lp:openobject-addons
- trunk-bug-1188300-psa
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Olivier Dony (Odoo) |
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-bug-1188300-psa |
Merge into: | lp:openobject-addons |
Diff against target: |
352 lines (+29/-29) 23 files modified
account/account_invoice_view.xml (+1/-1) account/project/project_view.xml (+1/-1) account_analytic_analysis/account_analytic_analysis_view.xml (+1/-1) account_asset/account_asset_view.xml (+1/-1) account_asset/report/account_asset_report_view.xml (+1/-1) account_voucher/account_voucher_view.xml (+1/-1) account_voucher/voucher_payment_receipt_view.xml (+2/-2) account_voucher/voucher_sales_purchase_view.xml (+2/-2) crm/crm_lead_view.xml (+2/-2) crm/crm_phonecall_view.xml (+1/-1) crm/report/crm_lead_report_view.xml (+1/-1) crm/report/crm_phonecall_report_view.xml (+1/-1) crm_claim/crm_claim_view.xml (+1/-1) crm_claim/report/crm_claim_report_view.xml (+1/-1) crm_helpdesk/crm_helpdesk_view.xml (+1/-1) crm_helpdesk/report/crm_helpdesk_report_view.xml (+1/-1) mrp_repair/mrp_repair_view.xml (+1/-1) project/project_view.xml (+1/-1) project/report/project_report_view.xml (+1/-1) project_issue/project_issue_view.xml (+1/-1) project_issue/report/project_issue_report_view.xml (+1/-1) stock/report/report_stock_move_view.xml (+1/-1) stock/stock_view.xml (+4/-4) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1188300-psa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Dony (Odoo) | Disapprove | ||
Purnendu Singh (OpenERP) (community) | Approve | ||
Review via email: mp+168634@code.launchpad.net |
Commit message
Description of the change
Hello,
Fixed the generic issue of all modules where filter_domain is passed on partner_id, there the result is displayed when the company is their and in case of contacts the filter_domain was not working.
So, improved the filter_domain to make it available for contacts also.
Thankz YoU.
-PSA.
Purnendu Singh (OpenERP) (purnendu-singh) wrote : | # |
Olivier Dony (Odoo) (odo-openerp) wrote : | # |
This patches fixes the wrong place. The domain that is used currently is supposed to match contacts properly, because it finds the partner using name_search(), and name_search() is supposed to support contacts properly.
So there is no need to update all search views, we need to fix the root cause of the problem: name_search() does not work for complete contact names.
The reason is that name_get() of res.partner was adapted in 7.0 to use the new format "Company, Contact" instead of "Contact (Company)", and the name_search() method was not properly adapted to follow this change.
This needs to be fixed in res.partner directly: lp:~openerp-dev/openobject-server/7.0-bug-1188300-odo
Unmerged revisions
- 8758. By Paramjit Singh Sahota(OpenERP)
-
[IMP] Missed 2 occurance for placing filter_domain, so done that.
- 8757. By Paramjit Singh Sahota(OpenERP)
-
[FIX] Fixed the generic issue of all modules where filter_domain is passed on partner_id, there the result is displayed when the company is their and in case of contacts the filter_domain was not working.
Preview Diff
1 | === modified file 'account/account_invoice_view.xml' | |||
2 | --- account/account_invoice_view.xml 2013-06-04 11:00:41 +0000 | |||
3 | +++ account/account_invoice_view.xml 2013-06-11 10:12:22 +0000 | |||
4 | @@ -455,7 +455,7 @@ | |||
5 | 455 | <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> | 455 | <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> |
6 | 456 | <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> | 456 | <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> |
7 | 457 | <separator/> | 457 | <separator/> |
9 | 458 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 458 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
10 | 459 | <field name="user_id" string="Salesperson"/> | 459 | <field name="user_id" string="Salesperson"/> |
11 | 460 | <field name="period_id" string="Period"/> | 460 | <field name="period_id" string="Period"/> |
12 | 461 | <separator/> | 461 | <separator/> |
13 | 462 | 462 | ||
14 | === modified file 'account/project/project_view.xml' | |||
15 | --- account/project/project_view.xml 2013-06-03 12:18:52 +0000 | |||
16 | +++ account/project/project_view.xml 2013-06-11 10:12:22 +0000 | |||
17 | @@ -31,7 +31,7 @@ | |||
18 | 31 | <search string="Analytic Account"> | 31 | <search string="Analytic Account"> |
19 | 32 | <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/> | 32 | <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/> |
20 | 33 | <field name="date"/> | 33 | <field name="date"/> |
22 | 34 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 34 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
23 | 35 | <field name="manager_id"/> | 35 | <field name="manager_id"/> |
24 | 36 | <field name="parent_id"/> | 36 | <field name="parent_id"/> |
25 | 37 | <field name="user_id"/> | 37 | <field name="user_id"/> |
26 | 38 | 38 | ||
27 | === modified file 'account_analytic_analysis/account_analytic_analysis_view.xml' | |||
28 | --- account_analytic_analysis/account_analytic_analysis_view.xml 2013-04-29 15:14:10 +0000 | |||
29 | +++ account_analytic_analysis/account_analytic_analysis_view.xml 2013-06-11 10:12:22 +0000 | |||
30 | @@ -213,7 +213,7 @@ | |||
31 | 213 | <search string="Contracts"> | 213 | <search string="Contracts"> |
32 | 214 | <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/> | 214 | <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/> |
33 | 215 | <field name="date"/> | 215 | <field name="date"/> |
35 | 216 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 216 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
36 | 217 | <field name="manager_id"/> | 217 | <field name="manager_id"/> |
37 | 218 | <field name="parent_id"/> | 218 | <field name="parent_id"/> |
38 | 219 | <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/> | 219 | <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/> |
39 | 220 | 220 | ||
40 | === modified file 'account_asset/account_asset_view.xml' | |||
41 | --- account_asset/account_asset_view.xml 2013-04-20 02:26:42 +0000 | |||
42 | +++ account_asset/account_asset_view.xml 2013-06-11 10:12:22 +0000 | |||
43 | @@ -223,7 +223,7 @@ | |||
44 | 223 | <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/> | 223 | <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/> |
45 | 224 | <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/> | 224 | <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/> |
46 | 225 | <field name="category_id"/> | 225 | <field name="category_id"/> |
48 | 226 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 226 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
49 | 227 | </search> | 227 | </search> |
50 | 228 | </field> | 228 | </field> |
51 | 229 | </record> | 229 | </record> |
52 | 230 | 230 | ||
53 | === modified file 'account_asset/report/account_asset_report_view.xml' | |||
54 | --- account_asset/report/account_asset_report_view.xml 2013-04-20 02:26:42 +0000 | |||
55 | +++ account_asset/report/account_asset_report_view.xml 2013-06-11 10:12:22 +0000 | |||
56 | @@ -49,7 +49,7 @@ | |||
57 | 49 | <field name="asset_id"/> | 49 | <field name="asset_id"/> |
58 | 50 | <field name="asset_category_id"/> | 50 | <field name="asset_category_id"/> |
59 | 51 | <group expand="0" string="Extended Filters..."> | 51 | <group expand="0" string="Extended Filters..."> |
61 | 52 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 52 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
62 | 53 | <field name="company_id" groups="base.group_multi_company"/> | 53 | <field name="company_id" groups="base.group_multi_company"/> |
63 | 54 | </group> | 54 | </group> |
64 | 55 | <group expand="1" string="Group By..."> | 55 | <group expand="1" string="Group By..."> |
65 | 56 | 56 | ||
66 | === modified file 'account_voucher/account_voucher_view.xml' | |||
67 | --- account_voucher/account_voucher_view.xml 2013-04-08 00:55:26 +0000 | |||
68 | +++ account_voucher/account_voucher_view.xml 2013-06-11 10:12:22 +0000 | |||
69 | @@ -129,7 +129,7 @@ | |||
70 | 129 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> | 129 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> |
71 | 130 | <separator/> | 130 | <separator/> |
72 | 131 | <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> | 131 | <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> |
74 | 132 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 132 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
75 | 133 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" /> | 133 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" /> |
76 | 134 | <field name="period_id"/> | 134 | <field name="period_id"/> |
77 | 135 | <group expand="0" string="Group By..."> | 135 | <group expand="0" string="Group By..."> |
78 | 136 | 136 | ||
79 | === modified file 'account_voucher/voucher_payment_receipt_view.xml' | |||
80 | --- account_voucher/voucher_payment_receipt_view.xml 2013-05-14 11:52:13 +0000 | |||
81 | +++ account_voucher/voucher_payment_receipt_view.xml 2013-06-11 10:12:22 +0000 | |||
82 | @@ -11,7 +11,7 @@ | |||
83 | 11 | <field name="date"/> | 11 | <field name="date"/> |
84 | 12 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> | 12 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> |
85 | 13 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> | 13 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> |
87 | 14 | <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/> | 14 | <field name="partner_id" string="Customer" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
88 | 15 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> | 15 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> |
89 | 16 | <field name="period_id"/> | 16 | <field name="period_id"/> |
90 | 17 | <group expand="0" string="Group By..."> | 17 | <group expand="0" string="Group By..."> |
91 | @@ -34,7 +34,7 @@ | |||
92 | 34 | <field name="date"/> | 34 | <field name="date"/> |
93 | 35 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> | 35 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> |
94 | 36 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> | 36 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> |
96 | 37 | <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/> | 37 | <field name="partner_id" string="Supplier" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
97 | 38 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> | 38 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> |
98 | 39 | <field name="period_id"/> | 39 | <field name="period_id"/> |
99 | 40 | <group expand="0" string="Group By..."> | 40 | <group expand="0" string="Group By..."> |
100 | 41 | 41 | ||
101 | === modified file 'account_voucher/voucher_sales_purchase_view.xml' | |||
102 | --- account_voucher/voucher_sales_purchase_view.xml 2013-05-14 11:52:13 +0000 | |||
103 | +++ account_voucher/voucher_sales_purchase_view.xml 2013-06-11 10:12:22 +0000 | |||
104 | @@ -10,7 +10,7 @@ | |||
105 | 10 | <field name="date"/> | 10 | <field name="date"/> |
106 | 11 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> | 11 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> |
107 | 12 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> | 12 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> |
109 | 13 | <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/> | 13 | <field name="partner_id" string="Supplier" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
110 | 14 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> | 14 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> |
111 | 15 | <field name="period_id"/> | 15 | <field name="period_id"/> |
112 | 16 | <group expand="0" string="Group By..."> | 16 | <group expand="0" string="Group By..."> |
113 | @@ -32,7 +32,7 @@ | |||
114 | 32 | <field name="date"/> | 32 | <field name="date"/> |
115 | 33 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> | 33 | <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> |
116 | 34 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> | 34 | <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> |
118 | 35 | <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/> | 35 | <field name="partner_id" string="Customer" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
119 | 36 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> | 36 | <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> |
120 | 37 | <field name="period_id"/> | 37 | <field name="period_id"/> |
121 | 38 | <group expand="0" string="Group By..."> | 38 | <group expand="0" string="Group By..."> |
122 | 39 | 39 | ||
123 | === modified file 'crm/crm_lead_view.xml' | |||
124 | --- crm/crm_lead_view.xml 2013-06-04 10:56:48 +0000 | |||
125 | +++ crm/crm_lead_view.xml 2013-06-11 10:12:22 +0000 | |||
126 | @@ -331,7 +331,7 @@ | |||
127 | 331 | <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/> | 331 | <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/> |
128 | 332 | <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> | 332 | <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> |
129 | 333 | <field name="user_id"/> | 333 | <field name="user_id"/> |
131 | 334 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 334 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
132 | 335 | <field name="create_date"/> | 335 | <field name="create_date"/> |
133 | 336 | <field name="country_id" context="{'invisible_country': False}"/> | 336 | <field name="country_id" context="{'invisible_country': False}"/> |
134 | 337 | <separator/> | 337 | <separator/> |
135 | @@ -549,7 +549,7 @@ | |||
136 | 549 | <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/> | 549 | <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/> |
137 | 550 | <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> | 550 | <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> |
138 | 551 | <field name="user_id"/> | 551 | <field name="user_id"/> |
140 | 552 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 552 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
141 | 553 | <separator/> | 553 | <separator/> |
142 | 554 | <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/> | 554 | <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/> |
143 | 555 | <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/> | 555 | <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/> |
144 | 556 | 556 | ||
145 | === modified file 'crm/crm_phonecall_view.xml' | |||
146 | --- crm/crm_phonecall_view.xml 2013-04-22 15:34:49 +0000 | |||
147 | +++ crm/crm_phonecall_view.xml 2013-06-11 10:12:22 +0000 | |||
148 | @@ -186,7 +186,7 @@ | |||
149 | 186 | <separator/> | 186 | <separator/> |
150 | 187 | <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]" | 187 | <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]" |
151 | 188 | help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/> | 188 | help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/> |
153 | 189 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 189 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
154 | 190 | <field name="user_id"/> | 190 | <field name="user_id"/> |
155 | 191 | <field name="section_id" string="Sales Team" | 191 | <field name="section_id" string="Sales Team" |
156 | 192 | groups="base.group_multi_salesteams"/> | 192 | groups="base.group_multi_salesteams"/> |
157 | 193 | 193 | ||
158 | === modified file 'crm/report/crm_lead_report_view.xml' | |||
159 | --- crm/report/crm_lead_report_view.xml 2013-05-21 14:27:53 +0000 | |||
160 | +++ crm/report/crm_lead_report_view.xml 2013-06-11 10:12:22 +0000 | |||
161 | @@ -82,7 +82,7 @@ | |||
162 | 82 | groups="base.group_multi_salesteams"/> | 82 | groups="base.group_multi_salesteams"/> |
163 | 83 | <field name="user_id" string="Salesperson"/> | 83 | <field name="user_id" string="Salesperson"/> |
164 | 84 | <group expand="0" string="Extended Filters..."> | 84 | <group expand="0" string="Extended Filters..."> |
166 | 85 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 85 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
167 | 86 | <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" /> | 86 | <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" /> |
168 | 87 | <field name="type_id"/> | 87 | <field name="type_id"/> |
169 | 88 | <field name="channel_id"/> | 88 | <field name="channel_id"/> |
170 | 89 | 89 | ||
171 | === modified file 'crm/report/crm_phonecall_report_view.xml' | |||
172 | --- crm/report/crm_phonecall_report_view.xml 2013-05-21 14:27:53 +0000 | |||
173 | +++ crm/report/crm_phonecall_report_view.xml 2013-06-11 10:12:22 +0000 | |||
174 | @@ -64,7 +64,7 @@ | |||
175 | 64 | groups="base.group_multi_salesteams"/> | 64 | groups="base.group_multi_salesteams"/> |
176 | 65 | <field name="user_id" string="Salesperson"/> | 65 | <field name="user_id" string="Salesperson"/> |
177 | 66 | <group expand="0" string="Extended Filters..."> | 66 | <group expand="0" string="Extended Filters..."> |
179 | 67 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 67 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
180 | 68 | <field name="company_id" groups="base.group_multi_company"/> | 68 | <field name="company_id" groups="base.group_multi_company"/> |
181 | 69 | <field name="creation_date"/> | 69 | <field name="creation_date"/> |
182 | 70 | <field name="opening_date"/> | 70 | <field name="opening_date"/> |
183 | 71 | 71 | ||
184 | === modified file 'crm_claim/crm_claim_view.xml' | |||
185 | --- crm_claim/crm_claim_view.xml 2013-04-22 15:34:49 +0000 | |||
186 | +++ crm_claim/crm_claim_view.xml 2013-06-11 10:12:22 +0000 | |||
187 | @@ -201,7 +201,7 @@ | |||
188 | 201 | <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> | 201 | <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> |
189 | 202 | <separator/> | 202 | <separator/> |
190 | 203 | <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" /> | 203 | <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" /> |
192 | 204 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 204 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
193 | 205 | <field name="user_id"/> | 205 | <field name="user_id"/> |
194 | 206 | <group expand="0" string="Group By..."> | 206 | <group expand="0" string="Group By..."> |
195 | 207 | <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/> | 207 | <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/> |
196 | 208 | 208 | ||
197 | === modified file 'crm_claim/report/crm_claim_report_view.xml' | |||
198 | --- crm_claim/report/crm_claim_report_view.xml 2013-05-21 14:27:53 +0000 | |||
199 | +++ crm_claim/report/crm_claim_report_view.xml 2013-06-11 10:12:22 +0000 | |||
200 | @@ -65,7 +65,7 @@ | |||
201 | 65 | <field name="section_id" string="Sales Team" context="{'invisible_section': False}" | 65 | <field name="section_id" string="Sales Team" context="{'invisible_section': False}" |
202 | 66 | groups="base.group_multi_salesteams"/> | 66 | groups="base.group_multi_salesteams"/> |
203 | 67 | <group expand="0" string="Extended Filters..."> | 67 | <group expand="0" string="Extended Filters..."> |
205 | 68 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 68 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
206 | 69 | <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/> | 69 | <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/> |
207 | 70 | <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/> | 70 | <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/> |
208 | 71 | <field name="priority"/> | 71 | <field name="priority"/> |
209 | 72 | 72 | ||
210 | === modified file 'crm_helpdesk/crm_helpdesk_view.xml' | |||
211 | --- crm_helpdesk/crm_helpdesk_view.xml 2013-05-21 14:27:53 +0000 | |||
212 | +++ crm_helpdesk/crm_helpdesk_view.xml 2013-06-11 10:12:22 +0000 | |||
213 | @@ -152,7 +152,7 @@ | |||
214 | 152 | <separator/> | 152 | <separator/> |
215 | 153 | <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" | 153 | <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" |
216 | 154 | help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" groups="base.group_multi_salesteams"/> | 154 | help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" groups="base.group_multi_salesteams"/> |
218 | 155 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 155 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
219 | 156 | <field name="user_id"/> | 156 | <field name="user_id"/> |
220 | 157 | <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/> | 157 | <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/> |
221 | 158 | <group expand="0" string="Group By..."> | 158 | <group expand="0" string="Group By..."> |
222 | 159 | 159 | ||
223 | === modified file 'crm_helpdesk/report/crm_helpdesk_report_view.xml' | |||
224 | --- crm_helpdesk/report/crm_helpdesk_report_view.xml 2013-05-21 14:27:53 +0000 | |||
225 | +++ crm_helpdesk/report/crm_helpdesk_report_view.xml 2013-06-11 10:12:22 +0000 | |||
226 | @@ -62,7 +62,7 @@ | |||
227 | 62 | <field name="user_id" string="Salesperson"/> | 62 | <field name="user_id" string="Salesperson"/> |
228 | 63 | <field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> | 63 | <field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> |
229 | 64 | <field name="company_id" groups="base.group_multi_company"/> | 64 | <field name="company_id" groups="base.group_multi_company"/> |
231 | 65 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 65 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
232 | 66 | <group expand="0" string="Extended Filters..." groups="base.group_no_one"> | 66 | <group expand="0" string="Extended Filters..." groups="base.group_no_one"> |
233 | 67 | <field name="priority" string="Priority"/> | 67 | <field name="priority" string="Priority"/> |
234 | 68 | <field name="categ_id"/> | 68 | <field name="categ_id"/> |
235 | 69 | 69 | ||
236 | === modified file 'mrp_repair/mrp_repair_view.xml' | |||
237 | --- mrp_repair/mrp_repair_view.xml 2013-04-20 02:26:42 +0000 | |||
238 | +++ mrp_repair/mrp_repair_view.xml 2013-06-11 10:12:22 +0000 | |||
239 | @@ -210,7 +210,7 @@ | |||
240 | 210 | <separator/> | 210 | <separator/> |
241 | 211 | <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/> | 211 | <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/> |
242 | 212 | <field name="product_id"/> | 212 | <field name="product_id"/> |
244 | 213 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 213 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
245 | 214 | <group expand="0" string="Group By..."> | 214 | <group expand="0" string="Group By..."> |
246 | 215 | <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> | 215 | <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> |
247 | 216 | <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> | 216 | <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> |
248 | 217 | 217 | ||
249 | === modified file 'project/project_view.xml' | |||
250 | --- project/project_view.xml 2013-05-30 09:22:04 +0000 | |||
251 | +++ project/project_view.xml 2013-06-11 10:12:22 +0000 | |||
252 | @@ -190,7 +190,7 @@ | |||
253 | 190 | <separator/> | 190 | <separator/> |
254 | 191 | <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> | 191 | <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> |
255 | 192 | <field name="user_id" string="Project Manager"/> | 192 | <field name="user_id" string="Project Manager"/> |
257 | 193 | <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/> | 193 | <field name="partner_id" string="Contact" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
258 | 194 | <group expand="0" string="Group By..."> | 194 | <group expand="0" string="Group By..."> |
259 | 195 | <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> | 195 | <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> |
260 | 196 | <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> | 196 | <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> |
261 | 197 | 197 | ||
262 | === modified file 'project/report/project_report_view.xml' | |||
263 | --- project/report/project_report_view.xml 2013-04-20 02:26:42 +0000 | |||
264 | +++ project/report/project_report_view.xml 2013-06-11 10:12:22 +0000 | |||
265 | @@ -69,7 +69,7 @@ | |||
266 | 69 | <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/> | 69 | <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/> |
267 | 70 | <field name="project_id"/> | 70 | <field name="project_id"/> |
268 | 71 | <field name="user_id"/> | 71 | <field name="user_id"/> |
270 | 72 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 72 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
271 | 73 | <group expand="0" string="Extended Filters..."> | 73 | <group expand="0" string="Extended Filters..."> |
272 | 74 | <field name="priority"/> | 74 | <field name="priority"/> |
273 | 75 | <field name="company_id" groups="base.group_multi_company"/> | 75 | <field name="company_id" groups="base.group_multi_company"/> |
274 | 76 | 76 | ||
275 | === modified file 'project_issue/project_issue_view.xml' | |||
276 | --- project_issue/project_issue_view.xml 2013-05-27 11:43:50 +0000 | |||
277 | +++ project_issue/project_issue_view.xml 2013-06-11 10:12:22 +0000 | |||
278 | @@ -159,7 +159,7 @@ | |||
279 | 159 | <field name="user_id"/> | 159 | <field name="user_id"/> |
280 | 160 | <field name="project_id"/> | 160 | <field name="project_id"/> |
281 | 161 | <field name="categ_ids"/> | 161 | <field name="categ_ids"/> |
283 | 162 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 162 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
284 | 163 | <group expand="0" string="Group By..." > | 163 | <group expand="0" string="Group By..." > |
285 | 164 | <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> | 164 | <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> |
286 | 165 | <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> | 165 | <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> |
287 | 166 | 166 | ||
288 | === modified file 'project_issue/report/project_issue_report_view.xml' | |||
289 | --- project_issue/report/project_issue_report_view.xml 2013-04-22 15:34:49 +0000 | |||
290 | +++ project_issue/report/project_issue_report_view.xml 2013-06-11 10:12:22 +0000 | |||
291 | @@ -55,7 +55,7 @@ | |||
292 | 55 | <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> | 55 | <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> |
293 | 56 | <field name="project_id"/> | 56 | <field name="project_id"/> |
294 | 57 | <field name="user_id"/> | 57 | <field name="user_id"/> |
296 | 58 | <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> | 58 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
297 | 59 | <field name="version_id"/> | 59 | <field name="version_id"/> |
298 | 60 | <group expand="1" string="Group By..."> | 60 | <group expand="1" string="Group By..."> |
299 | 61 | <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> | 61 | <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> |
300 | 62 | 62 | ||
301 | === modified file 'stock/report/report_stock_move_view.xml' | |||
302 | --- stock/report/report_stock_move_view.xml 2013-04-20 02:26:42 +0000 | |||
303 | +++ stock/report/report_stock_move_view.xml 2013-06-11 10:12:22 +0000 | |||
304 | @@ -149,7 +149,7 @@ | |||
305 | 149 | <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/> | 149 | <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/> |
306 | 150 | <field name="company_id" groups="base.group_multi_company"/> | 150 | <field name="company_id" groups="base.group_multi_company"/> |
307 | 151 | <group expand="0" string="Extended Filters..."> | 151 | <group expand="0" string="Extended Filters..."> |
309 | 152 | <field name="partner_id" context="{'contact_display':'partner'}" filter_domain="[('partner_id', 'child_of', self)]"/> | 152 | <field name="partner_id" context="{'contact_display':'partner'}" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
310 | 153 | <field name="product_categ_id" /> | 153 | <field name="product_categ_id" /> |
311 | 154 | <field name="prodlot_id"/> | 154 | <field name="prodlot_id"/> |
312 | 155 | <field name="state"/> | 155 | <field name="state"/> |
313 | 156 | 156 | ||
314 | === modified file 'stock/stock_view.xml' | |||
315 | --- stock/stock_view.xml 2013-05-21 12:23:59 +0000 | |||
316 | +++ stock/stock_view.xml 2013-06-11 10:12:22 +0000 | |||
317 | @@ -817,7 +817,7 @@ | |||
318 | 817 | <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/> | 817 | <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/> |
319 | 818 | <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/> | 818 | <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/> |
320 | 819 | <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> | 819 | <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> |
322 | 820 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 820 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
323 | 821 | <field name="product_id"/> | 821 | <field name="product_id"/> |
324 | 822 | <field name="stock_journal_id"/> | 822 | <field name="stock_journal_id"/> |
325 | 823 | <group expand="0" string="Group By..."> | 823 | <group expand="0" string="Group By..."> |
326 | @@ -944,7 +944,7 @@ | |||
327 | 944 | <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> | 944 | <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> |
328 | 945 | <separator/> | 945 | <separator/> |
329 | 946 | <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/> | 946 | <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/> |
331 | 947 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 947 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
332 | 948 | <field name="stock_journal_id"/> | 948 | <field name="stock_journal_id"/> |
333 | 949 | <field name="company_id" groups="base.group_multi_company"/> | 949 | <field name="company_id" groups="base.group_multi_company"/> |
334 | 950 | <group expand="0" string="Group By..."> | 950 | <group expand="0" string="Group By..."> |
335 | @@ -1070,7 +1070,7 @@ | |||
336 | 1070 | <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> | 1070 | <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> |
337 | 1071 | <separator/> | 1071 | <separator/> |
338 | 1072 | <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> | 1072 | <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> |
340 | 1073 | <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> | 1073 | <field name="partner_id" filter_domain="['|',('partner_id','child_of',self),('partner_id.display_name','ilike', self)]"/> |
341 | 1074 | <field name="stock_journal_id"/> | 1074 | <field name="stock_journal_id"/> |
342 | 1075 | <field name="product_id"/> | 1075 | <field name="product_id"/> |
343 | 1076 | <group expand="0" string="Group By..."> | 1076 | <group expand="0" string="Group By..."> |
344 | @@ -1382,7 +1382,7 @@ | |||
345 | 1382 | <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/> | 1382 | <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/> |
346 | 1383 | <field name="product_id"/> | 1383 | <field name="product_id"/> |
347 | 1384 | <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/> | 1384 | <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/> |
349 | 1385 | <field name="partner_id" string="Partner" filter_domain="[('picking_id.partner_id','child_of',self)]"/> | 1385 | <field name="partner_id" string="Partner" filter_domain="['|',('picking_id.partner_id','child_of',self),('picking_id.partner_id.display_name','ilike', self)]"/> |
350 | 1386 | <field name="prodlot_id"/> | 1386 | <field name="prodlot_id"/> |
351 | 1387 | <group expand="0" string="Group By..."> | 1387 | <group expand="0" string="Group By..."> |
352 | 1388 | <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> | 1388 | <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> |
Seems ok to me
Regards,
Purnendu Singh