odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to revid 4169 mat@openerp.com-20140407120612-mjb08yts2oa4k4jz 

bzr revid: chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407144625-jfimvsx4mgrkztqv
This commit is contained in:
Christophe Simonis 2014-04-07 16:46:25 +02:00
parent 1e9ed7baf6 d0b7e7fc7b
commit ffae380725
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_be/account_tax_template.xml
View File

@ -2052,6 +2052,8 @@
<field name="description">VAT-IN-V82-CAR-EXC-C1</field>
<field name="name">Frais de voiture - VAT 50% Non Deductible</field>
<field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
<field name="account_collected_id" ref="a64012"/>
<field name="account_paid_id" ref="a64012"/>
<field name="price_include" eval="0"/>
<field name="amount">0.105</field>
<field name="type">percent</field>

2
addons/purchase/res_config.py
View File

@ -62,7 +62,7 @@ class purchase_config_settings(osv.osv_memory):
}
_defaults = {
'default_invoice_method': 'manual',
'default_invoice_method': 'order',
}
def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):

1
addons/web/static/src/css/base.css
View File

@ -2364,6 +2364,7 @@
}
.openerp .oe_hidden_input_file {
position: relative;
overflow-x: hidden;
}
.openerp .oe_hidden_input_file input.oe_form_binary_file {
z-index: 0;

1
addons/web/static/src/css/base.sass
View File

@ -1922,6 +1922,7 @@ $sheet-padding: 16px
// Position: relative is used for the hidden input[type=file]
// Do not remove it anymore !
position: relative
overflow-x: hidden
input.oe_form_binary_file
z-index: 0
line-height: 0

1
addons/web/static/src/xml/base.xml
View File

@ -1252,7 +1252,6 @@
<td>
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
<t t-set="fileupload_style" t-translation="off">width: 83px;</t>
<button class="oe_button oe_field_button" type="button">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
<span>Select</span>