lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas usage is an option

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-02 21:34:43 +00:00
parent 3956d5904f
commit 2ea124d32e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/societe/soc.php
View File

@ -51,8 +51,17 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe', $socid); $result = restrictedArea($user, 'societe', $socid);
// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
$socstatic = new Societe($db);
if (!empty($socid)) $socstatic->getCanvas($socid);
$canvas = (!empty($socstatic->canvas)?$socstatic->canvas:GETPOST("canvas"));
if (! GETPOST("canvas"))
// If canvas is defined, because on url, or because company was created with canvas feature on,
// we use the canvas feature.
// If canvas is not defined, we use standard feature.
if (empty($canvas))
{ {
// ----------------------------------------- // -----------------------------------------
// When used in standard mode // When used in standard mode
@ -61,7 +70,6 @@ if (! GETPOST("canvas"))
// Initialization Company Object // Initialization Company Object
$soc = new Societe($db); $soc = new Societe($db);
/* /*
* Actions * Actions
*/ */
@ -1579,16 +1587,9 @@ else
// When used with CANVAS // When used with CANVAS
// ----------------------------------------- // -----------------------------------------
$_GET["canvas"] = 'default'; //$_GET["canvas"] = 'default';
//if ($_REQUEST["private"]==1) $_GET["canvas"] = 'individual'; To switch to other canvas, we must use another value for canvas //if ($_REQUEST["private"]==1) $_GET["canvas"] = 'individual'; To switch to other canvas, we must use another value for canvas
// Get object canvas
$socstatic = new Societe($db);
if (!empty($socid)) $socstatic->getCanvas($socid);
// Initialization Company Canvas
$canvas = (!empty($socstatic->canvas)?$socstatic->canvas:GETPOST("canvas"));
$soccanvas = new Canvas($db); $soccanvas = new Canvas($db);
$soccanvas->load_canvas('thirdparty@societe',$canvas); $soccanvas->load_canvas('thirdparty@societe',$canvas);