Merge lp:~savoirfairelinux-openerp/partner-contact-management/add_search_group_option_partner_member_observer into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions

Status: Merged
Merged at revision: 43
Proposed branch: lp:~savoirfairelinux-openerp/partner-contact-management/add_search_group_option_partner_member_observer
Merge into: lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions
Diff against target: 166 lines (+78/-11)
3 files modified
partner_member_observer/i18n/fr.po (+26/-6)
partner_member_observer/i18n/partner_member_observer.pot (+25/-5)
partner_member_observer/res_partner_view.xml (+27/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/partner-contact-management/add_search_group_option_partner_member_observer
Reviewer Review Type Date Requested Status
Sandy Carter (http://www.savoirfairelinux.com) Pending
Review via email: mp+204983@code.launchpad.net

Description of the change

For partner_member_observer module:
- Added filter and group options for member state and member observer fields.
- Regenerate language files.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'partner_member_observer/i18n/fr.po'
2--- partner_member_observer/i18n/fr.po 2014-01-27 15:14:59 +0000
3+++ partner_member_observer/i18n/fr.po 2014-02-05 15:39:15 +0000
4@@ -6,8 +6,8 @@
5 msgstr ""
6 "Project-Id-Version: OpenERP Server 7.0\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-01-03 07:36+0000\n"
9-"PO-Revision-Date: 2014-01-03 02:37-0500\n"
10+"POT-Creation-Date: 2014-02-05 15:28+0000\n"
11+"PO-Revision-Date: 2014-02-05 10:31-0500\n"
12 "Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n"
13 "Language-Team: \n"
14 "MIME-Version: 1.0\n"
15@@ -17,14 +17,19 @@
16 "X-Generator: Poedit 1.5.4\n"
17
18 #. module: partner_member_observer
19+#: view:res.partner:0
20+msgid "Member observer"
21+msgstr "Etat Observateur"
22+
23+#. module: partner_member_observer
24 #: help:res.partner,member_states:0
25 msgid "Member state."
26 msgstr "Etat membre."
27
28 #. module: partner_member_observer
29-#: model:ir.model,name:partner_member_observer.model_res_partner
30-msgid "Partner"
31-msgstr "Organisme"
32+#: view:res.partner:0
33+msgid "Group By..."
34+msgstr "Regrouper par..."
35
36 #. module: partner_member_observer
37 #: help:res.partner,observer_state:0
38@@ -32,11 +37,26 @@
39 msgstr "Etat observateur."
40
41 #. module: partner_member_observer
42-#: field:res.partner,member_states:0
43+#: view:res.partner:0
44+msgid "Search Partner"
45+msgstr "Rechercher un organisme"
46+
47+#. module: partner_member_observer
48+#: view:res.partner:0 field:res.partner,member_states:0
49 msgid "Member state"
50 msgstr "Etat membre"
51
52 #. module: partner_member_observer
53+#: model:ir.model,name:partner_member_observer.model_res_partner
54+msgid "Partner"
55+msgstr "Organisme"
56+
57+#. module: partner_member_observer
58+#: model:ir.actions.act_window,name:partner_member_observer.action_partner_lines
59+msgid "Partner Lines"
60+msgstr "Lignes d'organisme"
61+
62+#. module: partner_member_observer
63 #: field:res.partner,observer_state:0
64 msgid "Observer state"
65 msgstr "Etat observateur"
66
67=== modified file 'partner_member_observer/i18n/partner_member_observer.pot'
68--- partner_member_observer/i18n/partner_member_observer.pot 2014-01-03 15:07:50 +0000
69+++ partner_member_observer/i18n/partner_member_observer.pot 2014-02-05 15:39:15 +0000
70@@ -6,8 +6,8 @@
71 msgstr ""
72 "Project-Id-Version: OpenERP Server 7.0\n"
73 "Report-Msgid-Bugs-To: \n"
74-"POT-Creation-Date: 2014-01-03 07:35+0000\n"
75-"PO-Revision-Date: 2014-01-03 02:36-0500\n"
76+"POT-Creation-Date: 2014-02-05 15:27+0000\n"
77+"PO-Revision-Date: 2014-02-05 10:27-0500\n"
78 "Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n"
79 "Language-Team: \n"
80 "MIME-Version: 1.0\n"
81@@ -17,13 +17,18 @@
82 "X-Generator: Poedit 1.5.4\n"
83
84 #. module: partner_member_observer
85+#: view:res.partner:0
86+msgid "Member observer"
87+msgstr ""
88+
89+#. module: partner_member_observer
90 #: help:res.partner,member_states:0
91 msgid "Member state."
92 msgstr ""
93
94 #. module: partner_member_observer
95-#: model:ir.model,name:partner_member_observer.model_res_partner
96-msgid "Partner"
97+#: view:res.partner:0
98+msgid "Group By..."
99 msgstr ""
100
101 #. module: partner_member_observer
102@@ -32,11 +37,26 @@
103 msgstr ""
104
105 #. module: partner_member_observer
106-#: field:res.partner,member_states:0
107+#: view:res.partner:0
108+msgid "Search Partner"
109+msgstr ""
110+
111+#. module: partner_member_observer
112+#: view:res.partner:0 field:res.partner,member_states:0
113 msgid "Member state"
114 msgstr ""
115
116 #. module: partner_member_observer
117+#: model:ir.model,name:partner_member_observer.model_res_partner
118+msgid "Partner"
119+msgstr ""
120+
121+#. module: partner_member_observer
122+#: model:ir.actions.act_window,name:partner_member_observer.action_partner_lines
123+msgid "Partner Lines"
124+msgstr ""
125+
126+#. module: partner_member_observer
127 #: field:res.partner,observer_state:0
128 msgid "Observer state"
129 msgstr ""
130
131=== modified file 'partner_member_observer/res_partner_view.xml'
132--- partner_member_observer/res_partner_view.xml 2014-01-03 15:07:50 +0000
133+++ partner_member_observer/res_partner_view.xml 2014-02-05 15:39:15 +0000
134@@ -13,5 +13,32 @@
135 </field>
136 </field>
137 </record>
138+
139+ <!-- Add member state and member observer fields to the group for search-->
140+ <record id="customer_member_search_view_custom" model="ir.ui.view">
141+ <field name="name">Search member</field>
142+ <field name="model">res.partner</field>
143+ <field name="inherit_id" ref="base.view_res_partner_filter"/>
144+ <field name="arch" type="xml">
145+ <search string="Search Partner" position="inside">
146+ <filter string="Member state" name="member_states" domain="[('member_states','=',1)]" help="Member state"/>
147+ <filter string="Member observer" name="observer_state" domain="[('observer_state','=',1)]" help="Member observer"/>
148+ </search>
149+ <group string="Group By..." position="inside">
150+ <filter string="Member state" context="{'group_by':'member_states'}"/>
151+ <filter string="Member observer" context="{'group_by':'observer_state'}"/>
152+ </group>
153+ </field>
154+ </record>
155+
156+ <record id="action_partner_lines" model="ir.actions.act_window">
157+ <field name="name">Partner Lines</field>
158+ <field name="res_model">res.partner</field>
159+ <field name="view_type">form</field>
160+ <field name="view_mode">tree,form</field>
161+ <field name="target">current</field>
162+ <field name="search_view_id" ref="customer_member_search_view_custom" />
163+ <field name="context">{'search_default_member_states': 1, 'search_default_observer_state': 2}</field>
164+ </record>
165 </data>
166 </openerp>

Subscribers

People subscribed via source and target branches

to all changes: