diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index dc86853859e..65ad4c091a0 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -38,13 +38,10 @@ function takepos_prepare_head()
$head[$h][2] = 'setup';
$h++;
- if ($conf->global->TAKEPOS_CUSTOM_RECEIPT)
- {
- $head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';
- $head[$h][1] = $langs->trans("Receipt");
- $head[$h][2] = 'receipt';
- $h++;
- }
+ $head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';
+ $head[$h][1] = $langs->trans("Receipt");
+ $head[$h][2] = 'receipt';
+ $h++;
$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
for ($i = 1; $i <= $numterminals; $i++)
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 804ce8152ab..2243437d20f 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -265,6 +265,10 @@ class modTakePos extends DolibarrModules
*/
public function init($options = '')
{
+ global $conf,$db;
+
+ dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", "browser", 'chaine', 0, '', $conf->entity);
+
$this->_load_tables('/takepos/sql/');
$sql = array();
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index a468b7d6ab1..28e87394089 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -85,3 +85,8 @@ ColorTheme=Color theme
Colorful=Colorful
HeadBar=Head Bar
SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from de cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
\ No newline at end of file
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 967881e33d7..ef31bc2392c 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -46,6 +46,9 @@ if (GETPOST('action', 'alpha') == 'set')
$res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'alpha'), 'chaine', 0, '', $conf->entity);
$res = dolibarr_set_const($db, "TAKEPOS_RECEIPT_NAME", GETPOST('TAKEPOS_RECEIPT_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
$res = dolibarr_set_const($db, "TAKEPOS_SHOW_CUSTOMER", GETPOST('TAKEPOS_SHOW_CUSTOMER', 'alpha'), 'chaine', 0, '', $conf->entity);
+ $res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
+ $res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
+
dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
@@ -62,6 +65,10 @@ if (GETPOST('action', 'alpha') == 'set')
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
+elseif (GETPOST('action', 'alpha') == 'setmethod')
+{
+ dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+}
/*
@@ -79,64 +86,139 @@ $head = takepos_prepare_head();
dol_fiche_head($head, 'receipt', 'TakePOS', -1);
print '
';
-
-// Mode
print '