From 2ed446d014ac54faeed3b4822fc4063a24bf60c7 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 15 Jul 2016 19:35:01 +0200 Subject: [PATCH 1/2] FIX Option strict mode compatibility --- htdocs/product/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index c78483bb93d..9e22cad4279 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012-2013 Marcos García - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013-2016 Juanjo Menent * Copyright (C) 2013-2015 Raphaël Doursenaud * Copyright (C) 2013 Jean Heimburger * Copyright (C) 2013 Cédric Salvador @@ -272,7 +272,7 @@ else $sql.=$hookmanager->resPrint; $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,"; $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,"; - $sql.= ' p.datec, p.tms'; + $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy'; // Add fields from extrafields foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : ''); // Add fields from hooks From cd0849209c3b83da6253b353185959a706cebf71 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 15 Jul 2016 19:44:45 +0200 Subject: [PATCH 2/2] FIX Failed to open file --- dev/initdata/generate-invoice.php | 4 ++-- dev/initdata/generate-order.php | 4 ++-- dev/initdata/generate-product.php | 4 ++-- dev/initdata/generate-proposal.php | 4 ++-- dev/initdata/generate-thirdparty.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php index c1b2f2646a5..daa1bf29c96 100755 --- a/dev/initdata/generate-invoice.php +++ b/dev/initdata/generate-invoice.php @@ -31,8 +31,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); +require (__DIR__. '/../../htdocs/master.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php index 082d5428c97..b22e4549394 100755 --- a/dev/initdata/generate-order.php +++ b/dev/initdata/generate-order.php @@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +//$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); +require (__DIR__. '/../../htdocs/master.inc.php'); include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/dev/initdata/generate-product.php b/dev/initdata/generate-product.php index 975fc1ba33d..e1efc4dda6e 100755 --- a/dev/initdata/generate-product.php +++ b/dev/initdata/generate-product.php @@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); +require (__DIR__. '/../../htdocs/master.inc.php'); include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php index 8d413a518c1..f9dc064c7af 100755 --- a/dev/initdata/generate-proposal.php +++ b/dev/initdata/generate-proposal.php @@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +//$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); +require (__DIR__. '/../../htdocs/master.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php index d6e9d4c9393..61f09520466 100755 --- a/dev/initdata/generate-thirdparty.php +++ b/dev/initdata/generate-thirdparty.php @@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +//$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); +require (__DIR__. '/../../htdocs/master.inc.php'); include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';