imp
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 28 Jun 2010 17:56:45 +0000 (19:56 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 28 Jun 2010 17:56:45 +0000 (19:56 +0200)
bzr revid: fp@tinyerp.com-20100628175645-hwzgngtqjycbwodw

addons/account/account_cash_statement.py
addons/crm/report/crm_lead_report_view.xml
addons/crm/report/crm_phonecall_report_view.xml
addons/partner_geo_assign/partner_geo_assign.py

index afe024b..2a7922c 100644 (file)
@@ -177,7 +177,6 @@ class account_cash_statement(osv.osv):
             ('confirm', 'Confirm'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
         'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
-        'date':fields.datetime("Open On"),
         'closing_date':fields.datetime("Closed On"),
         'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on transactions"),
         'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
index c20ea9b..1372553 100644 (file)
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
+            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
index c0f8128..0f06a5a 100644 (file)
         </record>
 
         <menuitem name="Phone Calls Analysis"
+            groups="base.group_extended"
             action="action_report_crm_phonecall"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 
index e0a0d49..2407268 100644 (file)
@@ -23,6 +23,7 @@ from osv import osv
 from osv import fields
 import urllib,re
 import random, time
+from tools.translate import _
 
 def geo_find(addr):
     import urllib,re
@@ -82,7 +83,7 @@ class crm_lead(osv.osv):
                 if lead.partner_assigned_id.address:
                     email = lead.partner_assigned_id.address[0].email
                 if not email:
-                    raise osv.except_osv(_('Error !'), _('No partner assigned to this opportunity'))
+                    raise osv.except_osv(_('Error !'), _('No email on the partner assigned to this opportunity'))
                 forward = fobj.create(cr, uid, {
                     'name': 'email',
                     'history': 'whole',