[MERGE] merge with parent branch

bzr revid: rma@tinyerp.com-20120801110735-itpg43wfkdpr08hl
bzr revid: rma@tinyerp.com-20120801111514-pq4bh5f4i3w0jmlu

addons/analytic_contract_hr_expense/__openerp__.py

@@ -40,7 +40,6 @@ This module is for modifying account analytic view to show some data related to
              ],
     'installable': True,
     'auto_install': True,
-    'certificate': '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_setup/res_config_view.xml

@@ -22,7 +22,7 @@
                     <group>
                         <label for="id" string="Options"/>
                         <div>
-                            <div>
+                            <div name="multi_company">
                                 <field name="module_multi_company" class="oe_inline"/>
                                 <label for="module_multi_company"/>
                             </div>
@@ -35,7 +35,7 @@
                                 <field name="module_share" class="oe_inline"/>
                                 <label for="module_share"/>
                             </div>
-                            <div name="portal">
+                            <div>
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>

addons/event/report/report_event_registration.py

@@ -27,7 +27,6 @@ class report_event_registration(osv.osv):
     _name = "report.event.registration"
     _description = "Events Analysis"
     _auto = False
-    _rec_name = 'date'
     _columns = {
         'event_date': fields.char('Event Start Date', size=64, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),

addons/hr_evaluation/report/hr_evaluation_report.py

@@ -26,7 +26,6 @@ class hr_evaluation_report(osv.osv):
     _name = "hr.evaluation.report"
     _description = "Evaluations Statistics"
     _auto = False
-    _rec_name = 'date'
     _columns = {
         'create_date': fields.date('Create Date', readonly=True),
         'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),

addons/l10n_ar/__openerp__.py

@@ -45,7 +45,6 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
 			],
     "active": False,
     "installable": True,
-    "certificate" : "",
     'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_cl/__openerp__.py

@@ -45,7 +45,6 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
 			],
     "active": False,
     "installable": True,
-    "certificate" : "",
     'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/signup/res_config.xml

@@ -6,8 +6,8 @@
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <div name="portal" position="after">
-                    <div name="portal">
+                <div name="multi_company" position="after">
+                    <div>
                         <label for="signup_template_user_id"/>
                         <field name="signup_template_user_id" class="oe_inline"/>
                     </div>