[MERGE] account_analytic_analysis disable quickcreate on contracts, add group by pricelist

bzr revid: al@openerp.com-20130221015720-1w7qduk9ivzgdd9r

addons/account_analytic_analysis/account_analytic_analysis_cron.xml

@@ -30,7 +30,7 @@ Hello ${object.name},
             <td>${account.date_start} to ${account.date and account.date or '???'}</td>
             <td>
             % if account.quantity_max != 0.0:
-                ${account.quantity}/${account.quantity_max} hours
+                ${account.remaining_hours}/${account.quantity_max} units
             % endif
             </td>
             <td>${account.partner_id.phone or ''}, ${account.partner_id.email or ''}</td>

addons/account_analytic_analysis/account_analytic_analysis_view.xml

@@ -161,6 +161,7 @@
                     <field name="last_invoice_date"/>
                     <field name="toinvoice_total"/>
                     <field name="remaining_hours"/>
+                    <field name="pricelist_id" invisible="1"/>
                 </field>
             </field>
         </record>
@@ -201,6 +202,7 @@
                         <filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
                         <filter string="Start Date" domain="[]" context="{'group_by' : 'date_start'}" />
                         <filter string="End Date" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string="Pricelist" domain="[]" context="{'group_by' : 'pricelist_id'}" />
                     </group>
                 </search>
             </field>

addons/analytic/analytic.py

@@ -258,6 +258,9 @@ class account_analytic_account(osv.osv):
         (check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']),
     ]
 
+    def name_create(self, cr, uid, name, context=None):
+        raise osv.except_osv(_('Warning'), _("Quick account creation disallowed."))
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}