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

Better isolation of code when using canvas: Actions first in two mode, then view in two mode.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-06 23:53:55 +00:00
parent 99ac43e40c
commit 285a3d59dd
1 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
htdocs/societe/soc.php
View File

@ -56,20 +56,22 @@ $socstatic = new Societe($db);
if (!empty($socid)) $socstatic->getCanvas($socid); if (!empty($socid)) $socstatic->getCanvas($socid);
$canvas = (!empty($socstatic->canvas)?$socstatic->canvas:GETPOST("canvas")); $canvas = (!empty($socstatic->canvas)?$socstatic->canvas:GETPOST("canvas"));
$soc = new Societe($db);
/*
* Actions
*/
// If canvas is defined, because on url, or because company was created with canvas feature on, // If canvas is defined, because on url, or because company was created with canvas feature on,
// we use the canvas feature. // we use the canvas feature.
// If canvas is not defined, we use standard feature. // If canvas is not defined, we use standard feature.
if (empty($canvas)) if (empty($canvas))
{ {
// ----------------------------------------- // -----------------------------------------
// When used in standard mode // When used in standard mode
// ----------------------------------------- // -----------------------------------------
// Initialization Company Object
$soc = new Societe($db);
/* /*
* Actions * Actions
*/ */
@ -290,7 +292,6 @@ if (empty($canvas))
if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->societe->supprimer) if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->societe->supprimer)
{ {
$soc = new Societe($db);
$soc->fetch($socid); $soc->fetch($socid);
$result = $soc->delete($socid); $result = $soc->delete($socid);
@ -349,23 +350,38 @@ if (empty($canvas))
} }
} }
} }
}
else
{
// -----------------------------------------
// When used with CANVAS
// -----------------------------------------
$soccanvas = new Canvas($db);
$soccanvas->getCanvas('thirdparty','card',$canvas);
// Load data control
$soccanvas->loadControl($socid);
}
/*
* View
*/
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; /*
llxHeader('','',$help_url); * View
*/
$form = new Form($db); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
$formfile = new FormFile($db); llxHeader('','',$help_url);
$formadmin = new FormAdmin($db);
$formcompany = new FormCompany($db);
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; $form = new Form($db);
$formfile = new FormFile($db);
$formadmin = new FormAdmin($db);
$formcompany = new FormCompany($db);
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
if (empty($canvas))
{
if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
$_GET["action"] == 'create' || $_POST["action"] == 'create') $_GET["action"] == 'create' || $_POST["action"] == 'create')
{ {
@ -1583,29 +1599,6 @@ if (empty($canvas))
} }
else else
{ {
// -----------------------------------------
// When used with CANVAS
// -----------------------------------------
$soccanvas = new Canvas($db);
$soccanvas->getCanvas('thirdparty','card',$canvas);
// Load data control
$soccanvas->loadControl($socid);
/*
* View
*/
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('','',$help_url);
$form = new Form($db);
$formfile = new FormFile($db);
$formadmin = new FormAdmin($db);
$formcompany = new FormCompany($db);
if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || GETPOST("action") == 'create') if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || GETPOST("action") == 'create')
{ {
/* /*
@ -1766,5 +1759,4 @@ else
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>