Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-group_by_create_last_modif_user-dev_luis into lp:addons-vauxoo/7.0

  1. 7.0-group_by_create_last_modif_user-dev_luis
  2. Merge into 7.0
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Approved by: Jorge Angel Naranjo Rogel - http://www.vauxoo.com
Approved revision: 1081
Merged at revision: 1127
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-group_by_create_last_modif_user-dev_luis
Merge into: lp:addons-vauxoo/7.0
Diff against target: 61 lines (+15/-5)
4 files modified
project_search_create_uid/i18n/es.po (+9/-5)
project_search_create_uid/i18n/es_MX.po (+1/-0)
project_search_create_uid/i18n/es_VE.po (+1/-0)
project_search_create_uid/project_view.xml (+4/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-group_by_create_last_modif_user-dev_luis
Reviewer Review Type Date Requested Status
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+226872@code.launchpad.net

Description of the change

Se agrego el agrupado por el ultimo usuario que modifico y por el usuario que creo la tarea

To post a comment you must log in.
lp:~vauxoo/addons-vauxoo/7.0-group_by_create_last_modif_user-dev_luis updated
1080. By Luis Torres - http://www.vauxoo.com

[MERGE]Updated by parent

1081. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com

[MERGE] Merge from lp:addons-vauxoo/7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_search_create_uid/i18n/es.po'
2--- project_search_create_uid/i18n/es.po 2014-08-30 07:37:00 +0000
3+++ project_search_create_uid/i18n/es.po 2014-09-01 18:57:25 +0000
4@@ -12,9 +12,13 @@
5 "Language-Team: \n"
6 "MIME-Version: 1.0\n"
7 "Content-Type: text/plain; charset=UTF-8\n"
8-"Content-Transfer-Encoding: 8bit\n"
9-"X-Launchpad-Export-Date: 2014-08-30 07:36+0000\n"
10-"X-Generator: Launchpad (build 17176)\n"
11+"Content-Transfer-Encoding: \n"
12+"Plural-Forms: \n"
13+
14+#. module: project_search_create_uid
15+#: view:project.task:0
16+msgid "User Created"
17+msgstr "Usuario que creó"
18
19 #. module: project_search_create_uid
20 #: model:ir.model,name:project_search_create_uid.model_project_task
21@@ -40,12 +44,12 @@
22 #. module: project_search_create_uid
23 #: field:project.task,date_from_create:0
24 msgid "Create Date From"
25-msgstr "Creadas despues del"
26+msgstr "Creadas después del"
27
28 #. module: project_search_create_uid
29 #: field:project.task,date_from_write:0
30 msgid "Write Date From"
31-msgstr "Modificadas despues de"
32+msgstr "Modificadas después de"
33
34 #. module: project_search_create_uid
35 #: view:project.task:0
36
37=== added file 'project_search_create_uid/i18n/es_MX.po'
38--- project_search_create_uid/i18n/es_MX.po 1970-01-01 00:00:00 +0000
39+++ project_search_create_uid/i18n/es_MX.po 2014-09-01 18:57:25 +0000
40@@ -0,0 +1,1 @@
41+
42
43=== added file 'project_search_create_uid/i18n/es_VE.po'
44--- project_search_create_uid/i18n/es_VE.po 1970-01-01 00:00:00 +0000
45+++ project_search_create_uid/i18n/es_VE.po 2014-09-01 18:57:25 +0000
46@@ -0,0 +1,1 @@
47+
48
49=== modified file 'project_search_create_uid/project_view.xml'
50--- project_search_create_uid/project_view.xml 2014-05-09 21:51:34 +0000
51+++ project_search_create_uid/project_view.xml 2014-09-01 18:57:25 +0000
52@@ -15,6 +15,10 @@
53 <field name="date_from_write" filter_domain="[('write_date','&gt;=',self)]"/>
54 <field name="date_to_write" filter_domain="[('write_date','&lt;=',self)]"/>
55 </xpath>
56+ <xpath expr="//filter[@string='End Date']" position="after">
57+ <filter string="Last Modification User" icon="terp-personal" domain="[]" context="{'group_by':'write_uid'}"/>
58+ <filter string="User Created" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
59+ </xpath>
60 </field>
61 </record>
62