lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-09 23:32:36 +01:00
commit c4ff1f983c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/cashdesk/css/style.css
View File

@ -115,7 +115,7 @@ li.menu_choix0 {
float: right;
}
/* ------------------- R<EFBFBD>capitulatif des articles ------------------- */
/* ------------------- Remind of products ------------------- */
.liste_articles {
min-width: 215px;
float: right;
@ -212,6 +212,9 @@ p.titre {
max-width: 900px;
}
.blocksellfinished {
min-width: 215px;
}
.titre1 {
font-weight: bold;
color: #ff9900;

6
htdocs/cashdesk/tpl/validation2.tpl.php
View File

@ -22,9 +22,10 @@ $langs->load("bills");
?>
<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3><br>
<div class="blocksellfinished">
<div class="cadre_facturation">
<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3><br>
<script type="text/javascript">
@ -45,3 +46,6 @@ $langs->load("bills");
<p><a class="lien1" href="#" onclick="Javascript: popupTicket(); return(false);"><?php echo $langs->trans("PrintTicket"); ?></a></p>
</div>
</div>
<br>