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

uniformize code and other stuff

Browse Source
This commit is contained in:
Philippe Grand 2011-06-05 14:05:44 +00:00
parent 20dfcec516
commit 889f2b38b8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -49,7 +49,7 @@ class ActionsCardCommon
/** /**
* Constructor * Constructor
* @param DB Handler acces base de donnees * @param DB Handler acces base de donnees
* @param targmetmodule Name of directory of module where canvas is stored * @param targetmodule Name of directory of module where canvas is stored
* @param canvas Name of canvas * @param canvas Name of canvas
* @param card Name of tab (sub-canvas) * @param card Name of tab (sub-canvas)
*/ */
@ -261,10 +261,9 @@ class ActionsCardCommon
$oldsoccanvas->getCanvas('thirdparty','card',$this->object->canvas); $oldsoccanvas->getCanvas('thirdparty','card',$this->object->canvas);
$result=$oldsoccanvas->fetch($socid); $result=$oldsoccanvas->fetch($socid);
// To not set code if third party is not concerned. But if it had values, we keep them. // To do not set code if third party is not concerned. But if it had values, we keep them.
if (empty($this->object->client) && empty($oldsoccanvas->control->object->code_client)) $this->object->code_client=''; if (empty($this->object->client) && empty($oldsoccanvas->control->object->code_client)) $this->object->code_client='';
if (empty($this->object->fournisseur)&& empty($oldsoccanvas->control->object->code_fournisseur)) $this->object->code_fournisseur=''; if (empty($this->object->fournisseur)&& empty($oldsoccanvas->control->object->code_fournisseur)) $this->object->code_fournisseur=''; //var_dump($soccanvas);exit;
//var_dump($soccanvas);exit;
$result = $this->object->update($socid,$user,1,$oldsoccanvas->control->object->codeclient_modifiable(),$oldsoccanvas->control->object->codefournisseur_modifiable()); $result = $this->object->update($socid,$user,1,$oldsoccanvas->control->object->codeclient_modifiable(),$oldsoccanvas->control->object->codefournisseur_modifiable());
if ($result >= 0) if ($result >= 0)
@ -277,7 +276,7 @@ class ActionsCardCommon
$this->object->id = $socid; $this->object->id = $socid;
$reload = 0; $reload = 0;
$this->errors = $this->object->errors; $this->errors = $this->object->errors;
$_GET["action"]= "edit"; GETPOST("action")= "edit";
} }
} }
} }
@ -298,7 +297,7 @@ class ActionsCardCommon
{ {
$reload = 0; $reload = 0;
$this->errors=$this->object->errors; $this->errors=$this->object->errors;
$_GET["action"]=''; GETPOST("action")='';
} }
} }
@ -536,7 +535,7 @@ class ActionsCardCommon
} }
else else
{ {
/* TODO dol_fiche_head and dol_fiche_end must return a string and no do a print /* TODO dol_fiche_head and dol_fiche_end must return a string and not do a print
$head = societe_prepare_head($this->object); $head = societe_prepare_head($this->object);
$title = $this->getTitle($action); $title = $this->getTitle($action);

2
htdocs/societe/canvas/individual/actions_card_individual.class.php
View File

@ -38,7 +38,7 @@ class ActionsCardIndividual extends ActionsCardCommon
/** /**
* Constructor * Constructor
* @param DB Handler acces base de donnees * @param DB Handler acces base de donnees
* @param targmetmodule Name of directory of module where canvas is stored * @param targetmodule Name of directory of module where canvas is stored
* @param canvas Name of canvas * @param canvas Name of canvas
* @param card Name of tab (sub-canvas) * @param card Name of tab (sub-canvas)
*/ */