[MERGE] Repair current trunk breakage in [project*,pad] + minor wording fix

bzr revid: odo@openerp.com-20120830123643-ekgvub73pftsnxtl

addons/pad/pad.py

@@ -12,6 +12,8 @@ class pad_common(osv.osv_memory):
     def pad_generate_url(self, cr, uid, context=None):
         pad_server = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.pad_server
         # make sure pad server in the form of http://hostname
+        if not pad_server:
+            return ''
         if not pad_server.startswith('http'):
             pad_server = 'http://' + pad_server
         pad_server = pad_server.rstrip('/')

addons/project_long_term/project_long_term.py

@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:

addons/project_long_term/project_long_term_view.xml

@@ -96,11 +96,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -347,8 +350,8 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="options_active"]' position='after'>
-                    <field name="use_phases" class="oe_inline"/>
+                <xpath expr='//div[@name="project"]' position='inside'>
+                    <field name="use_phases"/>
                     <label for="use_phases"/>
                 </xpath>
             </field>