[MERGE] merge with main branch

bzr revid: mra@mra-laptop-20100823105659-ypstj2aog3gzul1h
2010-08-23 16:26:59 +05:30
parent bf6f28068a 9298971abc
commit 8bff08ad12
2 changed files with 2 additions and 1 deletions
@@ -18,7 +18,7 @@
                            <field name="type" select="1"/>
                            <newline/>
                            <field name="color_font"/>
-                            <field name="color_back"/>-->
+                            <field name="color_back"/>
                            <field name="badness_limit"/>
                            <field name="goodness_limit"/>
                            <field colspan="4" name="expression"/>
@@ -43,6 +43,7 @@ def get_journal(self, cr, uid, context):
    res_obj = [(r1['id'])for r1 in res_obj]
    res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context)
    res = [(r['journal_id']) for r in res]
+    res.insert(0, ('', ''))
    return res

 class pos_box_entries(osv.osv_memory):