diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 8d349c2a249..bce04a72175 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -117,10 +117,11 @@ print "\n";
print '
| ';
print $langs->trans('TicketVatGrouped');
print ' | ';
-var_dump(isALNERunningVersion());
if (isALNERunningVersion()) {
// Always forced to true
- print img_picto($langs->trans("AlwaysOn"), 'switch_off', 'class="disabled"');
+ $conf->global->TAKEPOS_TICKET_VAT_GROUPPED = 1;
+ print img_picto($langs->trans("Enabled"), 'switch_on', 'class="opacitymedium valignmiddle"');
+ print ' '.$langs->trans("Always").'';
} else {
print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
}
@@ -194,7 +195,7 @@ print ' |
| ';
print $langs->trans('ShowPriceHTOnReceipt');
print ' | ';
if (isALNERunningVersion()) {
- $conf->global->TAKEPOS_PRINT_PAYMENT_METHOD = 1;
+ $conf->global->TAKEPOS_SHOW_HT_RECEIPT = 1;
print ajax_constantonoff("TAKEPOS_SHOW_HT_RECEIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', '', 'inline-block', 0, '', 1);
print ''.$langs->trans("Always").'';
} else {
@@ -222,7 +223,14 @@ if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector" && filter_v
print ' |
| ';
print $langs->trans('PrintWithoutDetailsButton');
print ' | ';
-print ajax_constantonoff('TAKEPOS_PRINT_WITHOUT_DETAILS', array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', '', 'inline-block', 0, '');
+if (isALNERunningVersion()) {
+ // Always forced to true
+ $conf->global->TAKEPOS_PRINT_WITHOUT_DETAILS = 1;
+ print img_picto($langs->trans("Disabled"), 'switch_off', 'class="opacitymedium valignmiddle"');
+ print ' '.$form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("NotAvailableForCountryWhenModuleIsOn", $mysoc->country_code, $langs->transnoentitiesnoconv('Module3200Name'))).'';
+} else {
+ print ajax_constantonoff('TAKEPOS_PRINT_WITHOUT_DETAILS', array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', '', 'inline-block', 0, '');
+}
print " |
\n";
if (getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS')) {
print '| ';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 1adbdc11278..2decc5d983b 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -445,6 +445,7 @@ $orderprinterallowed = (getDolGlobalString('TAKEPOS_BAR_RESTAURANT') && getDolGl
$customprinttemplateallowed = true;
include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
if (isALNERunningVersion()) { // No need to show the custom template when isALNERunningVersion is true because it has no effect (disabled by receipt.php).
+ $customprinterallowed = false;
$customprinttemplateallowed = false; // Custom printer may be allowed if mandatory information in template are guaranteed. For the moment, we prefer not allow this.
}
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 0507f0fcd68..fcbdd0b28a7 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -137,9 +137,12 @@ print "
// Call to external receipt modules factory if it exists and if we can (not allowed in some cases)
if (isALNERunningVersion()) {
- // If LNE version, we force format. Custom templates is not allowed
+ // If LNE version, we force parameters.
$conf->global->TAKEPOS_SHOW_HT_RECEIPT = 1;
$conf->global->TAKEPOS_TICKET_VAT_GROUPPED = 1;
+ $conf->global->TAKEPOS_PRINT_PAYMENT_METHOD = 1;
+ $conf->global->TAKEPOS_GIFT_RECEIPT = 0;
+ $conf->global->TAKEPOS_PRINT_WITHOUT_DETAILS = 0;
} else {
$parameters = array();
$hookmanager->initHooks(array('takeposfrontend'));
diff --git a/htdocs/version.inc.php b/htdocs/version.inc.php
index 41b589a34ab..b335bbacd22 100644
--- a/htdocs/version.inc.php
+++ b/htdocs/version.inc.php
@@ -43,8 +43,9 @@ define('DOL_VERSION', constant('DOL_MAJOR_VERSION').'.'.constant('DOL_MINOR_VERS
// DOL_VERSION is now a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
// Set to 1 if the beta version is the candidate for certification or if the stable version has been certified.
-// Use 2 to force LNE features for debug purposes, without less restrictions: Same than 1 but https not required in this mode
-// Unset for standard version.
-//if (!defined('CERTIF_LNE')) {
+// Set to 2 to force LNE features for debug purposes, and flag version as candidate for certification. It just has one difference with 1: https is not required in this mode
+// Set to 0 for standard version or if you don't want to use the certification because you chosen to comply the law by using an attestation of an IT provider that guarantee
+// the the software is compliant. WARNING: In this case, you must find an IT company that give you the attestation of conformity.
+if (!defined('CERTIF_LNE')) {
define('CERTIF_LNE', '2');
-//}
+}
|