Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-move_line_view-chs into
lp:openobject-addons.
Requested reviews:
qdp (OpenERP) (qdp)
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-move_line_view-chs/+merge/114883
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-move_line_view-chs/+merge/114883
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-move_line_view-chs into
lp:openobject-addons.
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-06-15 13:49:45 +0000
+++ account/account_move_line.py 2012-07-13 15:00:29 +0000
@@ -19,6 +19,7 @@
#
##############################################################################
+import sys
import time
from datetime import datetime
from operator import itemgetter
@@ -985,37 +986,32 @@
if context.get('view_mode', False):
return result
fld = []
- fields = {}
flds = []
- title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
+ title = _("Accounting Entries") # self.view_header_get(cr, uid, view_id, view_type, context)
- ids = journal_pool.search(cr, uid, [])
+ ids = journal_pool.search(cr, uid, [], context=context)
journals = journal_pool.browse(cr, uid, ids, context=context)
- all_journal = [None]
- common_fields = {}
- total = len(journals)
for journal in journals:
- all_journal.append(journal.id)
for field in journal.view_id.columns_id:
- # sometimes, it's possible that a defined column is not loaded (the module containing
+ # sometimes, it's possible that a defined column is not loaded (the module containing
# this field is not loaded) when we make an update.
- if field.name not in self._columns:
+ if field.field not in self._columns:
continue
- if not field.field in fields:
- fields[field.field] = [journal.id]
+ if not field.field in flds:
fld.append((field.field, field.sequence))
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))
- flds.append('period_id')
- flds.append('journal_id')
- fields['period_id'] = all_journal
- fields['journal_id'] = all_journal
+
+ default_columns = {
+ 'period_id': 3,
+ 'journal_id': 10,
+ 'state': sys.maxint,
+ }
+ for d in default_columns:
+ if d not in flds:
+ fld.append((d, default_columns[d]))
+ flds.append(d)
+
fld = sorted(fld, key=itemgetter(1))
widths = {
'statement_id': 50,
@@ -1029,10 +1025,7 @@
colors="red:state=='draft';black:state=='valid'")
fields_get = self.fields_get(cr, uid, flds, context)
for field, _seq in fld:
- if common_fields.get(field) == total:
- fields.get(field).append(None)
- # if field=='state':
- # state = 'colors="red:state==\'draft\'"'
+ # TODO add string to element
f = etree.SubElement(document, 'field', name=field)
if field == 'debit':
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
