trunk merge

bzr revid: aag@tinyerp.co.in-20101014080103-58ysx9lo20h9kogo

1 files changed, 72 insertions, 10 deletions

diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index 97995106070..e35a43837fa 100755
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -30,6 +30,37 @@
             </field>
         </record>
 
+        <record id="ir_filters_transfer_line_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Transfered Ids Details">
+                    <group colspan="4" col="10">
+                      <field name="name"/>
+                      <field name="obj_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By" colspan="4">
+                      <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'obj_id'}"/>
+                      <separator orientation="vertical"/>
+                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!--        Filters action-->
+
+        <record id="actions_transfer_line_form" model="ir.actions.act_window">
+            <field name="name">Filters</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_transfer_line_tree"/>
+            <field name="search_view_id" ref="ir_filters_transfer_line_form"/>
+        </record>
+
 
         <record id="action_base_synchro_obj_line_tree" model="ir.actions.act_window">
             <field name="name">Synchronized instances</field>
@@ -56,7 +87,7 @@
                     <field colspan="4" name="domain"/>
                     <field name="synchronize_date"/>
                     <newline/>
-                    <field name="avoid_ids" colspan="4">
+                    <field name="avoid_ids" colspan="4" nolabel="1">
                         <tree string="Fields" editable="bottom">
                             <field name="name"/>
                         </tree>
@@ -81,6 +112,37 @@
             </field>
         </record>
 
+        <record id="ir_filters_regclass_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Synchronized objects">
+                    <group colspan="4" col="10">
+                      <field name="model_id"/>
+                      <field name="synchronize_date"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By" colspan="4">
+                      <filter string="Object to synchronize" icon="terp-stage" domain="[]" context="{'group_by':'model_id'}"/>
+                      <separator orientation="vertical"/>
+                      <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!--        Filters action-->
+
+        <record id="actions_regclass_tree" model="ir.actions.act_window">
+            <field name="name">Filters</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_regclass_tree"/>
+            <field name="search_view_id" ref="ir_filters_regclass_tree"/>
+        </record>
+
         <record id="action_transfer_tree" model="ir.actions.act_window">
             <field name="name">Synchronized objects</field>
             <field name="type">ir.actions.act_window</field>
@@ -115,15 +177,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Synchronized server">
-                    <field name="name" select="1"/>
-                    <newline/>
-                    <field name="server_url" select="2"/>
-                    <newline/>
-                    <field name="server_port"/>
-                    <field name="server_db"/>
-                    <newline/>
-                    <field name="login" select="1"/>
-                    <field name="password"/>
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="login"/>
+                        <field name="password" password="True"/>
+                        <field name="server_url"/>
+                        <field name="server_port"/>
+                        <field name="server_db"/>
+                    </group>
+                    
                 </form>
             </field>
         </record>