From 863f6a06b09aee7b671de315fca9f3f24603ee44 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Nov 2010 14:41:13 +0530
Subject: [PATCH 1/4] [Fix] audittrail: Fix the bug of _last_update field and
 read log, [ADD] add the search view audittrail rule

bzr revid: sbh@tinyerp.com-20101123091113-fp0c010wc5anw4ru
---
 addons/audittrail/audittrail.py       |  5 +++++
 addons/audittrail/audittrail_view.xml | 31 +++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index c2ef5f5d4a4..eca93debaab 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -198,6 +198,8 @@ class audittrail_objects_proxy(osv_pool):
         """
         if not context:
             context = {}
+        if field_name in('__last_update','id'):
+            return values            
         pool = pooler.get_pool(cr.dbname)
         field_pool = pool.get('ir.model.fields')
         model_pool = pool.get('ir.model')
@@ -248,6 +250,8 @@ class audittrail_objects_proxy(osv_pool):
         log_line_pool = pool.get('audittrail.log.line')
         #start Loop
         for line in lines:
+            if line['name'] in('__last_update','id'):
+                continue                
             if obj_pool._inherits:
                 inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
                 field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (model.id, inherits_ids[0]))])
@@ -279,6 +283,7 @@ class audittrail_objects_proxy(osv_pool):
                     "field_description": field['field_description']
                     }
             line_id = log_line_pool.create(cr, uid, vals)
+            cr.commit()
         #End Loop
         return True
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index aee308785a8..fad57df3304 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -23,9 +23,9 @@
                     <field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/>
                     <field name="state" select="1" readonly="1" />
                     <group colspan="2" col="2">
-                        <button string="Subscribe" name="subscribe"
+                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
                             type="object" states="draft" />
-                        <button string="UnSubscribe" name="unsubscribe"
+                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
                             type="object" states="subscribed" />
                     </group>
                 </form>
@@ -40,18 +40,36 @@
                 <tree colors="blue:state in ('draft');black:state in ('subscribed')" string="AuditTrail Rules">
                     <field name="name" />
                     <field name="object_id"/>
-                    <field name="user_id" />
                     <field name="log_read" />
                     <field name="log_write" />
                     <field name="log_unlink" />
                     <field name="log_create" />
-                     <field name="log_action"/>
+                    <field name="log_action"/>
                     <field name="log_workflow"/>
                     <field name="state" />
                 </tree>
             </field>
         </record>
-
+       <record id="view_audittrail_rule_search" model="ir.ui.view">
+            <field name="name">audittrail.rule.search</field>
+            <field name="model">audittrail.rule</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Audittrail Rule">
+                 <group col='10' colspan='4'>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" />
+                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Audittrail Subscribed Rule"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="object_id"/>
+                </group>
+                <newline/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                </group>
+                </search>
+            </field>
+        </record>
     <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
@@ -60,7 +78,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <!--<field name="view_id" ref="view_audittrail_rule_form" />-->
+            <field name="context">{'search_default_draft': 1}</field>
+            <field name="search_view_id" ref="view_audittrail_rule_search"/>
         </record>
 
         <menuitem name="Rules" id="menu_action_audittrail_rule_tree"

From 0b541635de2e3ace5f47d1b314d85329b80b8405 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Nov 2010 15:17:58 +0530
Subject: [PATCH 2/4] [ADD] audittrail:Add search view for audit log and remove
 unused code

bzr revid: sbh@tinyerp.com-20101123094758-k18avasj7uujcido
---
 addons/audittrail/audittrail_view.xml | 40 +++++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index fad57df3304..e312d8639bc 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -57,8 +57,8 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" />
-                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Audittrail Subscribed Rule"/>
+                    <filter icon="terp-document-new" string="Current" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="object_id"/>
@@ -84,17 +84,6 @@
 
         <menuitem name="Rules" id="menu_action_audittrail_rule_tree"
             action="action_audittrail_rule_tree" parent="base.menu_audit" />
-
-
-        <record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
-            <field name="name">Subscribed Rules</field>
-            <field name="res_model">audittrail.rule</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','subscribed')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
         <!-- AuditTrail Log form -->
 
         <record model="ir.ui.view" id="view_audittrail_log_form">
@@ -138,7 +127,6 @@
                             <field name="new_value_text" nolabel="1"
                                 colspan="2" readonly="1" />
                         </form>
-
                         <tree string="Log Lines">
                             <field name="field_description" />
                             <field name="old_value_text" />
@@ -163,13 +151,35 @@
                 </tree>
             </field>
         </record>
-
+        
+       <record id="view_audittrail_log_search" model="ir.ui.view">
+            <field name="name">audittrail.log.search</field>
+            <field name="model">audittrail.log</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Audittrail Log">
+                 <group col='10' colspan='4'>
+                    <field name="name"/>
+                    <field name="object_id"/>
+                    <field name="user_id"  widget="selection"/>
+                </group>
+                <newline/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+   					<separator orientation="vertical"/>                    
+                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
+					<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                </group>
+                </search>
+            </field>
+        </record>
 <!--  Action for Audittrail Log  -->
 
         <record model="ir.actions.act_window" id="action_audittrail_log_tree">
             <field name="name">Audit Logs</field>
             <field name="res_model">audittrail.log</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_audittrail_log_search"/>
         </record>
         <menuitem name="Audit Logs" id="menu_action_audittrail_log_tree"
             action="action_audittrail_log_tree" parent="base.menu_audit" />

From 6cd711340de877ecec4a8fbdd5d1ccf2580c4a9b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Nov 2010 15:38:10 +0530
Subject: [PATCH 3/4] [ADD] audittrail: improve search view

bzr revid: sbh@tinyerp.com-20101123100810-5dlqvsxaycc9f183
---
 addons/audittrail/audittrail.py       | 2 +-
 addons/audittrail/audittrail_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index eca93debaab..52819428dbc 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -366,7 +366,7 @@ class audittrail_objects_proxy(osv_pool):
                     lines.append(line)
 
                 self.create_log_line(cr, uid, log_id, model, lines)
-
+            cr.commit()
             cr.close()
             return res
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index e312d8639bc..1229a63f860 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -56,8 +56,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                 <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" string="Current" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                   <group col="8" colspan="4">
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                     <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
@@ -158,7 +158,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group col='10' colspan='4'>
+                 <group col="8" colspan="4">
                     <field name="name"/>
                     <field name="object_id"/>
                     <field name="user_id"  widget="selection"/>

From 8145062c0d0b9bdfe379b164f1b747cbc470cd21 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 23 Nov 2010 12:06:00 +0100
Subject: [PATCH 4/4] [ADD] packaging script for thunderbird

bzr revid: tfr@openerp.com-20101123110600-q3gy9idxmddtdj8i
---
 addons/thunderbird/plugin/openerp_plugin/packaging.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 addons/thunderbird/plugin/openerp_plugin/packaging.sh

diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
new file mode 100755
index 00000000000..140e254a056
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
@@ -0,0 +1,9 @@
+rm chrome/openerp_plugin.jar
+rm ../openerp_plugin.xpi 
+cd chrome/openerp_plugin/
+jar cvf openerp_plugin.jar *
+cd ..
+mv openerp_plugin/openerp_plugin.jar openerp_plugin.jar
+cd ..
+zip -r ../openerp_plugin.xpi *
+