From cc465380dafdc0f7ae2635a0771840bd6e1a94a7 Mon Sep 17 00:00:00 2001 From: fhenry Date: Sat, 6 Apr 2013 12:20:19 +0200 Subject: [PATCH] Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) --- .../modules/supplier_order/pdf/pdf_muscadet.modules.php | 1 + htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 6 ++++-- htdocs/install/mysql/tables/llx_printer_ipp.sql | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index fcf0c6763f5..fe7fc85ab27 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -990,6 +990,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders { $pdf->SetTextColor(0,0,60); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date_commande,"day",false,$outputlangs,true), '', 'R'); + $pdf->MultiCell(190, 3, $outputlangs->transnoentities("DeliveryDate")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R'); } else { diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 348698972e9..3b5c88f503c 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -210,16 +210,18 @@ ALTER TABLE llx_user ADD COLUMN fk_state integer DEFAULT 0; ALTER TABLE llx_user ADD COLUMN fk_country integer DEFAULT 0; ALTER TABLE llx_product_price ADD COLUMN import_key varchar(14) AFTER price_by_qty; - +DROP TABLE llx_printer_ipp; CREATE TABLE llx_printer_ipp ( rowid int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + datec datetime, printer_name text NOT NULL, printer_location text NOT NULL, printer_uri varchar(256) NOT NULL, copy int(11) NOT NULL DEFAULT '1', module varchar(16) NOT NULL, - login varchar(32) NOT NULL, + login varchar(32) NOT NULL )ENGINE=innodb; ALTER TABLE llx_socpeople ADD COLUMN ref_ext varchar(128) after entity; diff --git a/htdocs/install/mysql/tables/llx_printer_ipp.sql b/htdocs/install/mysql/tables/llx_printer_ipp.sql index 0e030b24c95..ba76af5a90e 100644 --- a/htdocs/install/mysql/tables/llx_printer_ipp.sql +++ b/htdocs/install/mysql/tables/llx_printer_ipp.sql @@ -19,10 +19,12 @@ CREATE TABLE llx_printer_ipp ( rowid int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + datec datetime, printer_name text NOT NULL, printer_location text NOT NULL, printer_uri varchar(256) NOT NULL, copy int(11) NOT NULL DEFAULT '1', module varchar(16) NOT NULL, - login varchar(32) NOT NULL, + login varchar(32) NOT NULL )ENGINE=innodb;