[MERGE]

bzr revid: hmo@tinyerp.com-20100929123105-r0t3lvbxwvjv9zoy

diff --cc bin/addons/base/ir/ir.xml
index d6c092b,0e88dfc..86b1724
--- 1/bin/addons/base/ir/ir.xml
--- 2/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@@ -1010,13 -977,21 +977,21 @@@
              <field name="arch" type="xml">
                  <search string="Attachments">
                      <group colspan="4" col="10">
+                       <filter icon="terp-stage"
+                         string="URL"
+                         domain="[('type','=','url')]"/>
+                       <filter icon="terp-stock_align_left_24"
+                         string="Binary"
+                         domain="[('type','=','binary')]"/>
+                     <separator orientation="vertical"/>
                          <field name="name"/>
-                         <field name="datas_fname"/>
                          <field name="type"/>
+                         <field name="datas_fname"/>
                      </group>
                      <newline/>
-                     <group expand="0" string="Group By" colspan="4">
-                         <filter string="File Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                     <group expand="0" string="Group By...">
+                         <filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
 -                        <filter string="Date" icon="terp-calendar" domain="[]" context="{'group_by':'create_date'}"/>
++                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                      </group>
                  </search>
              </field>
@@@ -1715,9 -1665,22 +1665,22 @@@
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Access Controls">
-                     <field name="name"/>
-                     <field name="model_id"/>
-                     <field name="group_id"/>
+                 <group>
+                               <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                         <separator orientation="vertical"/>
+                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
 -                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
 -                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
++                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
++                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                           <separator orientation="vertical"/>
+                               <field name="name"/>
+                                       <field name="model_id"/>
+                               <field name="group_id"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                      <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                      <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                       </group>
                  </search>
              </field>
          </record>
@@@ -1796,9 -1758,21 +1758,21 @@@
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Record rules">
-                     <field name="model_id"/>
-                     <field name="global"/>
-                     <field name="groups"/>
+                       <group>
+                         <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                         <separator orientation="vertical"/>
+                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
 -                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
 -                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
++                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
++                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                           <separator orientation="vertical"/>
+                           <field name="model_id"/>
+                           <field name="global"/>
+                           <field name="groups"/>
+                       </group>
+                     <newline/>
+                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                       </group>
                  </search>
              </field>
          </record>

diff --cc bin/addons/base/maintenance/maintenance_view.xml
index 8b40213,9a66e5b..8422d01
--- 1/bin/addons/base/maintenance/maintenance_view.xml
--- 2/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@@ -22,11 -22,12 +22,11 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Maintenance Contract">
--                    <separator string="Information" colspan="4"/>
-                     <field name="name"/>
-                     <newline/>
-                     <field name="date_start"/>
-                     <field name="date_stop"/>
+                     <group col="6" colspan="4">
+                           <field name="name"/>
+                           <field name="date_start"/>
+                           <field name="date_stop"/>
+                       </group>
                      <separator string="Covered Modules" colspan="4"/>
                      <field name="module_ids" nolabel="1" colspan="4">
                          <tree string="Covered Modules">

diff --cc bin/addons/base/module/wizard/base_export_language_view.xml
index cae5154,99435be..07c5a34
--- 1/bin/addons/base/module/wizard/base_export_language_view.xml
--- 2/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@@ -3,48 -3,54 +3,54 @@@
      <data>
  
          <record id="wizard_lang_export" model="ir.ui.view">
--            <field name="name">Export a Translation File</field>
++            <field name="name">Export Translation</field>
              <field name="model">base.language.export</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="Export language">
-                     <notebook>
-                         <page string="Export Data">
-                             <group colspan="4" states="choose">
-                                 <separator colspan="4" string="Export translation file"/>
-                                 <field name="lang" required="1"/>
-                                 <field name="format" required="1"/>
-                                 <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                 <field invisible="1" name="state"/>
-                             </group>
-                             <group colspan="4" states="get">
-                                 <separator string="Export done" colspan="4"/>
-                                 <field name="name" invisible="1" colspan="4"/>
-                                 <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
-                                 <field height="80" name="advice" nolabel="1" colspan="4"/>
-                             </group>
-                             <separator string="" colspan="4"/>
-                                 <group col="2" colspan="2">
-                                 </group>
-                                 <group col="2" colspan="2">
-                                     <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Cancel" type="object"/>
-                                     <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
-                                     <button icon="gtk-cancel" name="act_destroy" special="cancel" states="get" string="_Cancel" type="object"/>
-                                 </group>
-                         </page>
-                         <page string="Help">
 -                <form string="Export Translation File">
++                <form string="Export Translation">
+                   <group colspan="3">
+                       <group colspan="1">
                              <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
+                             <label align="0.0" colspan="4" string=""/>
                              <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
+                             <label align="0.0" colspan="4" string=""/>
                              <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
                              <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                         </page>
-                     </notebook>
+                        </group>
+                        <group colspan="1">
+                        <separator orientation="vertical" rowspan="15"/>
+                        </group>
+                                      <group colspan="1">
+                           <group colspan="4" states="choose">
 -                              <separator colspan="4" string="Export Translation File"/>
++                              <separator colspan="4" string="Export Translation"/>
+                               <field name="lang" required="1"/>
+                               <field name="format" required="1"/>
+                               <field height="200" name="modules" nolabel="1" colspan="4"/>
+                               <field invisible="1" name="state"/>
+                           </group>
+                           <group colspan="4" states="get">
+                               <separator string="Export done" colspan="4"/>
+                               <field name="name" invisible="1" colspan="4"/>
+                               <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
+                               <field height="80" name="advice" nolabel="1" colspan="4"/>
+                           </group>
+                            <separator string="" colspan="4"/>
+                               <group colspan="2" col="2">
+                               </group>
+                           <group col="2" colspan="2">
+                              <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
+                              <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
+                              <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
+                           </group>
+                         </group>
+                     </group>
+ 
                  </form>
              </field>
          </record>
  
          <record id="action_wizard_lang_export" model="ir.actions.act_window">
--            <field name="name">Export a Translation File</field>
++            <field name="name">Export Translation</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">base.language.export</field>
              <field name="view_type">form</field>

diff --cc bin/addons/base/module/wizard/base_import_language_view.xml
index eb73e8d,32c828e..70a4885
--- 1/bin/addons/base/module/wizard/base_import_language_view.xml
--- 2/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@@ -3,15 -3,25 +3,25 @@@
      <data>
  
          <record id="view_base_import_language" model="ir.ui.view">
--            <field name="name">Import Language</field>
++            <field name="name">Import Translation</field>
              <field name="model">base.language.import</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-             <form string="Import language">
-             <notebook colspan="4">
-                 <page string="Import Data">
 -            <form string="Import Translation File">
++            <form string="Import Language">
+             <group colspan="3">
+                  <group colspan="1">
+                       <label string="You have to import a .CSV file which is encoded in UTF-8."/>
+                       <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+                       <label string="type,name,res_id,src,value" colspan="4"/>
+                       <label string="module,type,name,res_id,src,value" colspan="4"/>
+                       <label string="You can also import .po files." colspan="4" align="0.0"/>
+                  </group>
+                  <group colspan="1">
+                       <separator orientation="vertical" rowspan="8"/>
+                  </group>
+                  <group colspan="1">
                      <group colspan="4" col="4">
-                         <separator string="Import New Language" colspan="4"/>
 -                        <separator string="Import Translation File" colspan="4"/>
++                        <separator string="Import Translation" colspan="4"/>
                          <field name="name" width="200"/>
                          <field name="code"/>
                          <field name="data" colspan="4"/>
@@@ -38,7 -40,7 +40,7 @@@
          </record>
  
          <record id="action_view_base_import_language" model="ir.actions.act_window">
--            <field name="name">Import Language</field>
++            <field name="name">Import Translation</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">base.language.import</field>
              <field name="view_type">form</field>
@@@ -47,7 -49,7 +49,6 @@@
          </record>
  
          <menuitem
--        name="Import a Translation File"
          action="action_view_base_import_language"
          id="menu_view_base_import_language"
          parent="menu_translation_export"/>

diff --cc bin/addons/base/module/wizard/base_language_install_view.xml
index 794ea6b,794ea6b..3d9f4ea
--- 1/bin/addons/base/module/wizard/base_language_install_view.xml
--- 2/bin/addons/base/module/wizard/base_language_install_view.xml
+++ b/bin/addons/base/module/wizard/base_language_install_view.xml
@@@ -32,7 -32,7 +32,7 @@@
          name="Load an Official Translation"
          action="action_view_base_language_install"
          id="menu_view_base_language_install"
--        parent="menu_translation"/>
++        parent="menu_translation" sequence="2"/>
  
          <record id="view_base_language_install_msg" model="ir.ui.view">
              <field name="name">Official Translation Loaded</field>

diff --cc bin/addons/base/res/res_log.py
index 886221a,97ee249..8ce4468
--- 1/bin/addons/base/res/res_log.py
--- 2/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@@ -20,8 -20,8 +20,8 @@@
  ##############################################################################
  
  from osv import fields, osv
- import tools 
- 
+ import tools
 -
++import time
  class res_log(osv.osv_memory):
      _name = 'res.log'
      _columns = {
@@@ -29,12 -29,13 +29,14 @@@
          'user_id': fields.many2one('res.users','User', required=True),
          'res_model': fields.char('Object', size=128),
          'res_id': fields.integer('Object ID'),
-         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on')
+         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
+         'create_date': fields.datetime('Created Date', readonly=True),
      }
      _defaults = {
--        'user_id': lambda self,cr,uid,ctx: uid
++        'user_id': lambda self,cr,uid,ctx: uid,
++        'create_date': time.strftime('%Y-%m-%d %H:%M:%S')
      }
--    _order='date desc'
++    _order='create_date desc'
  
      # TODO: do not return secondary log if same object than in the model (but unlink it)
      def get(self, cr, uid, context={}):

diff --cc bin/addons/base/res/res_log_view.xml
index 046d93f,59592fe..6dac6c0
--- 1/bin/addons/base/res/res_log_view.xml
--- 2/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@@ -12,6 -12,6 +12,7 @@@
                      <field name="name"/>
                      <field name="user_id"/>
                      <field name="res_model"/>
++                    <field name="create_date"/>
                  </search>
              </field>
          </record>
@@@ -21,8 -21,9 +22,9 @@@
              <field name="type">tree</field>
              <field name="arch" type="xml">
                  <tree string="Logs">
++                    <field name="create_date"/>
                      <field name="name"/>
                      <field name="user_id"/>
 -                    <field name="create_date"/>
                  </tree>
              </field>
          </record>
@@@ -32,8 -33,8 +34,9 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Logs">
 -                 <field name="name"/>
 -                 <group colspan="4" col="8">
++                    <field name="name"/>
++                    <field name="create_date"/>
 +                    <group colspan="4" col="6">
-                         <field name="name" colspan="4"/>
                          <field name="user_id" />
                          <field name="res_model"/>
                          <field name="res_id"/>