Merge remote-tracking branch 'odoo/7.0' into 7.0

OCA · Nov 4, 2014 · fb978c6 · fb978c6
2 parents c4438af + d115ef9
commit fb978c6
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 116 deletions.
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
@@ -2273,7 +2273,6 @@
                         <group>
                             <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
                             <field name="user_id" readonly="1" string="Responsible"/>
-                            <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>

diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.css b/addons/web/static/lib/cleditor/jquery.cleditor.css
@@ -6,7 +6,7 @@
 .cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('images/buttons.gif')}
 .cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)}
 .cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC}
-.cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
+.cleditorPopup {border:solid 1px #999; background-color:white; color:#333333; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
 .cleditorList div {padding:2px 4px 2px 4px}
 .cleditorList p,
 .cleditorList h1,