From 738e0e458ed9eeb8e4d8dd7e5b19946dbc8a41cc Mon Sep 17 00:00:00 2001 From: ldestail Date: Thu, 11 Aug 2011 04:24:48 +0200 Subject: [PATCH 1/2] Add custom to ignore Signed-off-by: ldestail --- .gitignore | 3 +++ htdocs/custom/docgen | 1 - htdocs/custom/dropbox | 1 - htdocs/custom/extrafields | 1 - htdocs/custom/index.html | 0 htdocs/custom/milestone | 1 - htdocs/custom/multicompany | 1 - htdocs/custom/paypalplus | 1 - htdocs/custom/productdiscount | 1 - 9 files changed, 3 insertions(+), 7 deletions(-) delete mode 160000 htdocs/custom/docgen delete mode 160000 htdocs/custom/dropbox delete mode 160000 htdocs/custom/extrafields delete mode 100644 htdocs/custom/index.html delete mode 160000 htdocs/custom/milestone delete mode 160000 htdocs/custom/multicompany delete mode 160000 htdocs/custom/paypalplus delete mode 160000 htdocs/custom/productdiscount diff --git a/.gitignore b/.gitignore index 427616604c0..dc37550eb4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ htdocs/conf/conf.php htdocs/conf/conf.php.old documents/ +custom/ +custom2/ nbproject .settings/ .buildpath +/.git diff --git a/htdocs/custom/docgen b/htdocs/custom/docgen deleted file mode 160000 index 58113a85f2e..00000000000 --- a/htdocs/custom/docgen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58113a85f2e6ff0078472074c0855d526b80857f diff --git a/htdocs/custom/dropbox b/htdocs/custom/dropbox deleted file mode 160000 index 69c05090e23..00000000000 --- a/htdocs/custom/dropbox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 69c05090e23b487912843de657b5ef5e6e774f42 diff --git a/htdocs/custom/extrafields b/htdocs/custom/extrafields deleted file mode 160000 index e7373fbca4a..00000000000 --- a/htdocs/custom/extrafields +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7373fbca4a1fe67024ccdf53767cc7de41d9d7b diff --git a/htdocs/custom/index.html b/htdocs/custom/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/custom/milestone b/htdocs/custom/milestone deleted file mode 160000 index eba88cab13b..00000000000 --- a/htdocs/custom/milestone +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eba88cab13b18aba6ee012a4cd3c24f4e86b4524 diff --git a/htdocs/custom/multicompany b/htdocs/custom/multicompany deleted file mode 160000 index f4ca36ca040..00000000000 --- a/htdocs/custom/multicompany +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4ca36ca0402c555f44995c519974e6e014ab61c diff --git a/htdocs/custom/paypalplus b/htdocs/custom/paypalplus deleted file mode 160000 index 18f0be9c65f..00000000000 --- a/htdocs/custom/paypalplus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18f0be9c65f631ac879bae36221d3f9523848faa diff --git a/htdocs/custom/productdiscount b/htdocs/custom/productdiscount deleted file mode 160000 index a6ae73bf87b..00000000000 --- a/htdocs/custom/productdiscount +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6ae73bf87bc22cd0791ac99403d9da142f5b087 From a85c53bb992eff3f08f49c1f77de01c6bfb5fc99 Mon Sep 17 00:00:00 2001 From: ldestail Date: Thu, 11 Aug 2011 14:05:19 +0200 Subject: [PATCH 2/2] Fix: Preview of canelle was broken --- htdocs/admin/fournisseur.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 3b6047e5330..7f95e7b43a4 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier @@ -109,10 +109,11 @@ if ($action == 'specimenfacture') // For invoices // Charge le modele $dir = "/includes/modules/supplier_invoice/pdf/"; $file = "pdf_".$modele.".modules.php"; - if (file_exists($dir.$file)) + $file = dol_buildpath($dir.$file); + if (file_exists($file)) { $classname = "pdf_".$modele; - require_once($dir.$file); + require_once($file); $obj = new $classname($db,$facture);