From 5c725aceb8c950e543480e09a6257ad999f2be49 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Tue, 3 Nov 2015 21:40:05 +0100 Subject: [PATCH] sql --- htdocs/admin/receiptprinter.php | 3 +++ htdocs/core/class/dolreceiptprinter.class.php | 2 +- .../core/modules/modReceiptPrinter.class.php | 24 ++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 464f7895967..9e06b327f09 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -239,6 +239,9 @@ if ($mode == 'config' && $user->admin) case 4: $connector = 'CONNECTOR_WINDOWS_PRINT'; break; + case 5: + $connector = 'CONNECTOR_JAVA'; + break; default: $connector = 'CONNECTOR_UNKNOWN'; break; diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 7a9c1be888a..3de7be512af 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -104,7 +104,7 @@ class dolReceiptPrinter extends Escpos const CONNECTOR_FILE_PRINT = 2; const CONNECTOR_NETWORK_PRINT = 3; const CONNECTOR_WINDOWS_PRINT = 4; - //const CONNECTOR_JAVA = 6; + //const CONNECTOR_JAVA = 5; var $db; var $error; var $errors; diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index a4cf99373fa..375ab653d3c 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -93,7 +93,7 @@ class modReceiptPrinter extends DolibarrModules // $this->rights[$r][5] Niveau 2 pour nommer permission dans code $r++; - $this->rights[$r][0] = 67001; + $this->rights[$r][0] = 67000; $this->rights[$r][1] = 'ReceiptPrinter'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 1; @@ -120,4 +120,26 @@ class modReceiptPrinter extends DolibarrModules } + + + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function init($options='') + { + global $conf; + // Clean before activation + $this->remove($options); + $sql = array( + "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), fk_type int(11), parameter varchar(128), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;", + "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), template text, entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;", + ); + return $this->_init($sql,$options); + } + }