Merge pull request #6287 from grandoc/develop

update code for next php versions
This commit is contained in:
Laurent Destailleur 2017-01-18 16:36:39 +01:00 committed by GitHub
commit 47c37855b1

View File

@ -40,23 +40,47 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
*/ */
class pdf_einstein extends ModelePDFCommandes class pdf_einstein extends ModelePDFCommandes
{ {
var $db; /**
var $name; * @var DoliDb Database handler
var $description; */
var $type; public $db;
var $phpmin = array(4,3,0); // Minimum version of PHP required by module /**
var $version = 'dolibarr'; * @var string model name
*/
public $name;
var $page_largeur; /**
var $page_hauteur; * @var string model description (short text)
var $format; */
var $marge_gauche; public $description;
var $marge_droite;
var $marge_haute;
var $marge_basse;
var $emetteur; // Objet societe qui emet /**
* @var string document type
*/
public $type;
/**
* @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.3 = array(5, 3)
*/
public $phpmin = array(5, 2);
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';
public $page_largeur;
public $page_hauteur;
public $format;
public $marge_gauche;
public $marge_droite;
public $marge_haute;
public $marge_basse;
public $emetteur; // Objet societe qui emet
/** /**
@ -64,7 +88,7 @@ class pdf_einstein extends ModelePDFCommandes
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;