diff --git a/addons/account/account.py b/addons/account/account.py
index 1520c4f0646..5de913c45a7 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2019,7 +2019,7 @@ class account_model(osv.osv):
}
_defaults = {
- 'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+ 'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
}
def generate(self, cr, uid, ids, datas={}, context=None):
move_ids = []
@@ -2221,7 +2221,7 @@ class account_subscription_line(osv.osv):
account_subscription_line()
# ---------------------------------------------------------------
-# Account Templates : Account, Tax, Tax Code and chart. + Wizard
+# Account Templates: Account, Tax, Tax Code and chart. + Wizard
# ---------------------------------------------------------------
class account_tax_template(osv.osv):
@@ -2394,7 +2394,7 @@ class account_chart_template(osv.osv):
'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
- 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+ 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
}
account_chart_template()
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d9b78795998..b10ced65e88 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -26,6 +26,7 @@ from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
import tools
+from operator import itemgetter
class account_move_line(osv.osv):
_name = "account.move.line"
@@ -863,9 +864,8 @@ class account_move_line(osv.osv):
result['toolbar']['action'] = []
#Restrict the list of journal view in search view
- if view_type == 'search':
- journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
- result['fields']['journal_id']['selection'] = journal_list
+ if view_type == 'search' and result['fields'].get('journal_id', False):
+ result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
return result
if context.get('view_mode', False):
@@ -887,21 +887,20 @@ class account_move_line(osv.osv):
for field in journal.view_id.columns_id:
if not field.field in fields:
fields[field.field] = [journal.id]
- fld.append((field.field, field.sequence))
+ fld.append((field.field, field.sequence, field.name))
flds.append(field.field)
common_fields[field.field] = 1
else:
fields.get(field.field).append(journal.id)
common_fields[field.field] = common_fields[field.field] + 1
- fld.append(('period_id', 3))
- fld.append(('journal_id', 10))
+ fld.append(('period_id', 3, 'Period'))
+ fld.append(('journal_id', 10, 'Journal'))
flds.append('period_id')
flds.append('journal_id')
fields['period_id'] = all_journal
fields['journal_id'] = all_journal
- from operator import itemgetter
fld = sorted(fld, key=itemgetter(1))
widths = {
@@ -955,7 +954,7 @@ class account_move_line(osv.osv):
if field in widths:
attrs.append('width="'+str(widths[field])+'"')
-
+ attrs.append('string="'+field_it[2]+'"')
attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
xml += '''\n''' % (field,' '.join(attrs))
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fa9d5ba5e95..49de367122b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -23,8 +23,8 @@
- account.treasory.graph
- account.account
- graph
-
-
-
-
-
+ account.treasory.graph
+ account.account
+ graph
+
+
+
+
+
-
+
Accounts
account.account
@@ -314,13 +314,33 @@
+
+ account.journal.view.search
+ account.journal.view
+ search
+
+
+
+
+
+
+
+ account.journal.view.tree
+ account.journal.view
+ tree
+
+
+
+
+
+
account.journal.view.form
account.journal.view
form
@@ -330,7 +350,9 @@
account.journal.view
form
tree,form
+
+
+
+ account.account.type.search
+ account.account.type
+ search
+
+
+
+
+
+
+
+
account.account.type.tree
account.account.type
@@ -705,6 +740,7 @@
account.account.type
form
tree,form
+
+
+ account.tax.code.search
+ account.tax.code
+ search
+
+
+
+
+
+
+
+
+
account.tax.code.tree
account.tax.code
@@ -777,10 +826,10 @@
@@ -834,7 +884,6 @@
-
@@ -845,8 +894,8 @@
+
+ account.payment.term.search
+ account.payment.term
+ search
+
+
+
+
+
+
+
+
account.payment.term.form
account.payment.term
@@ -1745,6 +1806,7 @@
account.payment.term
form
tree,form
+