[MERGE] forward port of branch saas-9 up to 93aea2c6526e3ad7d27686eaca9ffbe2e6d30e19

Conflicts:
	project_timesheet_synchro/project_timesheet.py
	sale_contract/views/sale_contract_view.xml
This commit is contained in:
Jeremy Kersten
2016-04-27 12:13:54 +02:00
+1 -1
View File
@@ -6,7 +6,7 @@
<form action="/website_form/" method="post" class="s_website_form form-horizontal container-fluid mt32" enctype="multipart/form-data">
<div class="form-group">
<div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
<button class="btn btn-primary btn-lg o_website_form_send">Send</button>
<span class="btn btn-primary btn-lg o_website_form_send">Send</span>
<span id="o_website_form_result"/>
</div>
</div>