diff --git a/addons/account/account.py b/addons/account/account.py index bc4989cff6d..7ad20843e4c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -607,8 +607,8 @@ class account_journal(osv.osv): } _defaults = { - 'user_id': lambda self,cr,uid,context: uid, - 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, + 'user_id': lambda self, cr, uid, context: uid, + 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } _sql_constraints = [ ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'), @@ -708,7 +708,6 @@ class account_journal(osv.osv): return self.name_get(cr, user, ids, context=context) - def onchange_type(self, cr, uid, ids, type, currency, context=None): obj_data = self.pool.get('ir.model.data') user_pool = self.pool.get('res.users') diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index 5f4ed44adfe..650bffc58e9 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -14,7 +14,7 @@ action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments" - sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/> + sequence="0" groups="base.group_extended"/> diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 22ab46a1775..7b7e6b308b1 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -26,14 +26,19 @@ - - + + - - + + + diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2c4293f2ba4..2522e53b2a0 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -309,7 +309,7 @@ class account_move_line(osv.osv): context = {} c = context.copy() c['initital_bal'] = True - sql = """SELECT l2.id, SUM(l1.debit-l1.credit) + sql = """SELECT l2.id, SUM(l1.debit-l1.credit) FROM account_move_line l1, account_move_line l2 WHERE l2.account_id = l1.account_id AND l1.id <= l2.id @@ -318,8 +318,7 @@ class account_move_line(osv.osv): " GROUP BY l2.id" cr.execute(sql, [tuple(ids)]) - res = dict(cr.fetchall()) - return res + return dict(cr.fetchall()) def _invoice(self, cursor, user, ids, name, arg, context=None): invoice_obj = self.pool.get('account.invoice') @@ -1284,4 +1283,4 @@ class account_move_line(osv.osv): account_move_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a8b3f5ad31d..39b861d1775 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -762,7 +762,7 @@ An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company. - + @@ -1227,7 +1227,7 @@ id="menu_action_account_moves_all" parent="account.menu_finance_entries" sequence="1" - groups="group_account_user,group_account_manager" + groups="group_account_user" /> @@ -1475,7 +1475,7 @@ action="action_move_journal_line" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" - groups="group_account_user,group_account_manager" + groups="group_account_user" sequence="5"/> @@ -1742,7 +1742,7 @@ + parent="account.menu_configuration_misc" groups="base.group_extended"/> - - Leads Analysis - crm.lead.report - form - {'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} - tree,graph - [('type', '=', 'lead')] - Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis. - - + + Leads Analysis + crm.lead.report + form + {'search_default_filter_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]} + tree,graph + [] + Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis. + tree - graph diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index e4b228e0bb9..b0a2ba01e4e 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -74,7 +74,7 @@ -