diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 5bee14b74d4828c5d4cde3a5c8a7783ace110107..90bf948e21571eecbf9c702067f5c1058058decb 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -80,7 +80,7 @@ * <dol_print_customer_points> Print customer points * <dol_print_order_points> Print number of points for this order * - * Conditional code at line start (if�then Print) + * Conditional code at line start (if�then Print) * <dol_print_if_customer> Print the line IF a customer is affected to the order * <dol_print_if_vendor> Print the line IF a vendor is affected to the order * <dol_print_if_happy_hour> Print the line IF Happy Hour @@ -520,8 +520,12 @@ class dolReceiptPrinter extends Escpos $ret = $this->InitPrinter($printerid); if ($ret>0) { setEventMessages($this->error, $this->errors, 'errors'); - } else { - for ($line=0; $line < count($vals); $line++) { + } + else + { + $nboflines = count($vals); + for ($line=0; $line < $nboflines; $line++) + { switch ($vals[$line]['tag']) { case 'DOL_ALIGN_CENTER': $this->printer->setJustification(Escpos::JUSTIFY_CENTER); diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index 15a25bf10ed734e2a0d8dc23a7c160e0df25daf1..b843f83e1d0618a340caba88767f2e05a1b2c6b5 100644 --- a/htdocs/core/js/lib_head.js.php +++ b/htdocs/core/js/lib_head.js.php @@ -940,7 +940,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton, function copyToClipboard(text,text2) { text = text.replace(/<br>/g,"\n"); - var newElem = "<textarea id=\"coords\" style=\"border: none; width: 90%; height: 120px;\">"+text+"</textarea><br><br>"+text2; + var newElem = '<textarea id="coords" style="border: none; width: 90%; height: 120px;">'+text+'</textarea><br><br>'+text2; $("#dialog").html(newElem); $("#dialog").dialog(); $("#coords").select(); diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index ea9dbee01e39a3a6327cc3d078c24faf69af9e13..df6f58af77de827b8c20a2dc96a36bf86d2a3329 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -151,8 +151,8 @@ (1) ou n'indiquez que les renseignements concernant l'organisme <br> (2) dons effectués par les entreprises - </div> </font> + </div> <div style="height: 297mm; width: 210mm; page-break-inside: avoid;"> <table width="100%" border="1" cellspacing="0" cellpadding="1" bgcolor="#000000"> <tr> diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 2801ebb8855dff6914aab1df857d4069c7f7018a..ac4d9eb3c5422ce30fe4095530da4229ff8f0f53 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -65,8 +65,8 @@ else <h1> This page is a sample of page using tables. It is designed to make test with<br> -- css (add parameter &theme=newtheme to test another theme or edit css of current theme)<br> -- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&dol_optimize_smallscreen=1</a> to enable view with jmobile)<br> +- css (add parameter &theme=newtheme to test another theme or edit css of current theme)<br> +- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&dol_optimize_smallscreen=1</a> to enable view with jmobile)<br> - no javascript / usage for bind people (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?nojs=1'; ?>">nojs=1</a> to force disable javascript)<br> - dataTables<br> - tablednd<br> @@ -181,8 +181,8 @@ if (! empty($moreforfilter)) print '</div>'; } -print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'; ?> +<table class="tagtable liste<?php echo $moreforfilter?" listwithfilterbefore":""; ?>" id="tablelines3"> <tr class="liste_titre"> <?php print getTitleFieldOfList($langs->trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?> <?php print getTitleFieldOfList($langs->trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?> @@ -190,9 +190,7 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"") </tr> <tr class="pair"><td><?php echo $productspecimen->getNomUrl(1); ?></td><td align="right">b1</td><td class="tdlineupdown" align="left">c1</td></tr> <tr class="impair"><td>a2</td><td align="right">b2</td><td class="tdlineupdown" align="left">c2</td></tr> -<?php -print '</table>'; -?> +</table> <br> diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index 7fec8e895b6f7a36c1fdc7afbdbe285c70325b19..a697b371438566949db91fe18a3adb59e73777f2 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -16,8 +16,8 @@ llxHeader(); <h1> This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with<br> -- css (add parameter &theme=newtheme to test another theme or edit css of current theme)<br> -- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&dol_optimize_smallscreen=1</a> to enable view with jmobile)<br> +- css (add parameter &theme=newtheme to test another theme or edit css of current theme)<br> +- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&dol_optimize_smallscreen=1</a> to enable view with jmobile)<br> - no javascript / usage for bind people (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?nojs=1'; ?>">nojs=1</a> to force disable javascript)<br> </h1> <br>