diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 1318447ee35..6538c1fe2ee 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -60,7 +60,7 @@ if (empty($action)) {
exit;
}
-if ($element === 'facture') {
+if ($element === 'facture') { // Test on permission done in top of page
require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0befd9431f7..c301d46211f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3929,7 +3929,7 @@ if (!function_exists("llxFooter")) {
print ''."\n";
}
- // Wrapper to add log when clicking on download or preview
+ // JS wrapper to add log when clicking on download or preview
if (isModEnabled('blockedlog') && is_object($object) && !empty($object->id) && $object->id > 0) {
if (in_array($object->element, array('facture')) && $object->statut > 0) { // Restrict for the moment to element 'facture'
print "\n\n";
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index e667a8b2215..cbce49031ab 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -68,7 +68,7 @@ if (!$user->hasRight('takepos', 'run')) {
* View
*/
-top_httphead('text/html', 1);
+top_htmlhead('', '', 1);
if ($place > 0) {
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
@@ -81,6 +81,25 @@ if ($place > 0) {
$object = new Facture($db);
$object->fetch($facid);
+
+// Record entry in blocked logs
+// DOL_DOCUMENT_ROOT.'/blockedlog/ajax/block-add.php?id='.$object->id.'&element='.$object->element.'&action=DOC_PREVIEW&token='.newToken();
+print "
+";
+
+
// Call to external receipt modules if exist
$parameters = array();
$hookmanager->initHooks(array('takeposfrontend'));
@@ -103,6 +122,16 @@ if (!empty($hookmanager->resPrint)) {
.left {
text-align: left;
}
+.centpercent {
+ width: 100%;
+}
+@media only screen and (min-width: 1024px)
+{
+ body {
+ margin-left: 50px;
+ margin-right: 50px;
+ }
+}
@@ -132,7 +161,7 @@ print $langs->trans('Date')." ".dol_print_date($object->date, 'day').'
';
if (getDolGlobalString('TAKEPOS_RECEIPT_NAME')) {
print getDolGlobalString('TAKEPOS_RECEIPT_NAME') . " ";
}
-if ($object->statut == Facture::STATUS_DRAFT) {
+if ($object->status == Facture::STATUS_DRAFT) {
print str_replace(")", "", str_replace("-", " ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref)));
} else {
print $object->ref;
@@ -155,7 +184,7 @@ if (getDolGlobalString('TAKEPOS_SHOW_DATE_OF_PRINING')) {
-
+
| trans("Label"); ?> |
@@ -194,7 +223,7 @@ if (getDolGlobalString('TAKEPOS_SHOW_DATE_OF_PRINING')) {
product_label)) {
echo $line->product_label;
} else {
- echo $line->description;
+ echo $line->desc;
} ?>
qty; ?> |
@@ -219,7 +248,7 @@ if (getDolGlobalString('TAKEPOS_SHOW_DATE_OF_PRINING')) {
-
+
| trans("TotalHT");
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2f2b735e97b..8164157664b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -372,7 +372,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
print 'topMenuFontSize='.$topMenuFontSize."\n";
print 'toolTipBgColor='.$toolTipBgColor."\n";
print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_SATURATE_RATIO='.(!getDolGlobalString('THEME_SATURATE_RATIO') ? '' : $conf->global->THEME_SATURATE_RATIO)." (must be between 0 and 1)\n";
+print 'conf->global->THEME_SATURATE_RATIO='.getDolGlobalString('THEME_SATURATE_RATIO')." (must be between 0 and 1)\n";
print '*/'."\n";
|