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

Works on canvas integration in third party module

Browse Source
This commit is contained in:
Regis Houssin 2010-09-04 10:48:20 +00:00
parent b9fe774511
commit ee4cd1c500
8 changed files with 334 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/canvas.class.php
View File

@ -123,10 +123,10 @@ class Canvas
} }
/** /**
* Load type of action * Load controller
* @param action Type of action * @param action Type of action
*/ */
function load_control($action) function load_control($action='null')
{ {
global $langs; global $langs;
@ -156,6 +156,14 @@ class Canvas
} }
} }
/**
* Load actions
*/
function load_actions($socid)
{
return $this->control->load_actions($socid);
}
/** /**
* Assign templates values * Assign templates values
* @param action Type of action * @param action Type of action

302
htdocs/societe/canvas/card.common.class.php
View File

@ -27,7 +27,7 @@
* \class CardCommon * \class CardCommon
* \brief Classe permettant la gestion des tiers par defaut * \brief Classe permettant la gestion des tiers par defaut
*/ */
class CardCommon class CardCommon extends Canvas
{ {
//! Numero d'erreur Plage 1280-1535 //! Numero d'erreur Plage 1280-1535
var $errno = 0; var $errno = 0;
@ -334,6 +334,306 @@ class CardCommon
} }
} }
/**
* Charge les actions
*/
function load_actions($socid)
{
global $conf, $user, $langs;
global $canvas;
if ($_POST["getcustomercode"])
{
// We defined value code_client
$_POST["code_client"]="Acompleter";
}
if ($_POST["getsuppliercode"])
{
// We defined value code_fournisseur
$_POST["code_fournisseur"]="Acompleter";
}
// Add new third party
if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
&& ($_POST["action"] == 'add' || $_POST["action"] == 'update') && $user->rights->societe->creer)
{
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
$error=0;
if ($_POST["action"] == 'update')
{
$this->load_control();
// Load properties of company
$this->object->fetch($socid);
}
if ($_REQUEST["private"] == 1)
{
$this->object->particulier = $_REQUEST["private"];
$this->object->nom = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
$this->object->nom_particulier = $_POST["nom"];
$this->object->prenom = $_POST["prenom"];
$this->object->civilite_id = $_POST["civilite_id"];
}
else
{
$this->object->nom = $_POST["nom"];
}
$this->object->address = $_POST["adresse"];
$this->object->adresse = $_POST["adresse"]; // TODO obsolete
$this->object->cp = $_POST["cp"];
$this->object->ville = $_POST["ville"];
$this->object->pays_id = $_POST["pays_id"];
$this->object->departement_id = $_POST["departement_id"];
$this->object->tel = $_POST["tel"];
$this->object->fax = $_POST["fax"];
$this->object->email = trim($_POST["email"]);
$this->object->url = $_POST["url"];
$this->object->siren = $_POST["idprof1"];
$this->object->siret = $_POST["idprof2"];
$this->object->ape = $_POST["idprof3"];
$this->object->idprof4 = $_POST["idprof4"];
$this->object->prefix_comm = $_POST["prefix_comm"];
$this->object->code_client = $_POST["code_client"];
$this->object->code_fournisseur = $_POST["code_fournisseur"];
$this->object->capital = $_POST["capital"];
$this->object->gencod = $_POST["gencod"];
$this->object->canvas = $_REQUEST["canvas"];
$this->object->tva_assuj = $_POST["assujtva_value"];
// Local Taxes
$this->object->localtax1_assuj = $_POST["localtax1assuj_value"];
$this->object->localtax2_assuj = $_POST["localtax2assuj_value"];
$this->object->tva_intra = $_POST["tva_intra"];
$this->object->forme_juridique_code = $_POST["forme_juridique_code"];
$this->object->effectif_id = $_POST["effectif_id"];
if ($_REQUEST["private"] == 1)
{
$this->object->typent_id = 8; // TODO predict another method if the field "special" change of rowid
}
else
{
$this->object->typent_id = $_POST["typent_id"];
}
$this->object->client = $_POST["client"];
$this->object->fournisseur = $_POST["fournisseur"];
$this->object->fournisseur_categorie = $_POST["fournisseur_categorie"];
$this->object->commercial_id = $_POST["commercial_id"];
$this->object->default_lang = $_POST["default_lang"];
// Check parameters
if (empty($_POST["cancel"]))
{
if (! empty($this->object->email) && ! isValidEMail($this->object->email))
{
$error = 1;
$langs->load("errors");
$this->object->error = $langs->trans("ErrorBadEMail",$this->object->email);
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
if (! empty($this->object->url) && ! isValidUrl($this->object->url))
{
$error = 1;
$langs->load("errors");
$this->object->error = $langs->trans("ErrorBadUrl",$this->object->url);
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
if ($this->object->fournisseur && ! $conf->fournisseur->enabled)
{
$error = 1;
$langs->load("errors");
$this->object->error = $langs->trans("ErrorSupplierModuleNotEnabled");
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
}
if (! $error)
{
if ($_POST["action"] == 'add')
{
$this->db->begin();
if (empty($this->object->client)) $this->object->code_client='';
if (empty($this->object->fournisseur)) $this->object->code_fournisseur='';
$result = $this->object->create($user);
if ($result >= 0)
{
if ($this->object->particulier)
{
dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
$contact=new Contact($this->db);
$contact->civilite_id = $this->object->civilite_id;
$contact->name = $this->object->nom_particulier;
$contact->firstname = $this->object->prenom;
$contact->address = $this->object->address;
$contact->cp = $this->object->cp;
$contact->ville = $this->object->ville;
$contact->fk_pays = $this->object->fk_pays;
$contact->socid = $this->object->id; // fk_soc
$contact->status = 1;
$contact->email = $this->object->email;
$contact->priv = 0;
$result=$contact->create($user);
}
}
else
{
$mesg=$this->object->error;
}
if ($result >= 0)
{
$this->db->commit();
if ( $this->object->client == 1 )
{
Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$this->object->id);
return;
}
else
{
if ( $this->object->fournisseur == 1 )
{
Header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$this->object->id);
return;
}
else
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$this->object->id);
return;
}
}
exit;
}
else
{
$this->db->rollback();
$langs->load("errors");
$mesg=$langs->trans($this->object->error);
$_GET["action"]='create';
}
}
if ($_POST["action"] == 'update')
{
if ($_POST["cancel"])
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
$oldsoccanvas = new Canvas($this->db);
$oldsoccanvas->load_canvas('card',$canvas);
$oldsoccanvas->load_control();
$result=$oldsoccanvas->fetch($socid);
// To 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->fournisseur)&& empty($oldsoccanvas->control->object->code_fournisseur)) $this->object->code_fournisseur='';
//var_dump($soccanvas);exit;
$result = $this->object->update($socid,$user,1,$oldsoccanvas->control->object->codeclient_modifiable(),$oldsoccanvas->control->object->codefournisseur_modifiable());
if ($result >= 0)
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
else
{
$this->object->id = $socid;
$reload = 0;
$mesg = $this->object->error;
$_GET["action"]= "edit";
}
}
}
}
if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->societe->supprimer)
{
$soccanvas = new Canvas($this->db);
$soccanvas->load_canvas('card',$canvas);
$soccanvas->load_control();
$soccanvas->fetch($socid);
$result = $soccanvas->control->object->delete($socid);
if ($result >= 0)
{
Header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$soccanvas->control->object->nom."");
exit;
}
else
{
$reload = 0;
$langs->load("errors");
$mesg=$langs->trans($soccanvas->control->object->error);
$_GET["action"]='';
}
}
/*
* Generate document
*/
if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{
if (is_numeric($_REQUEST['model']))
{
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
}
else
{
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php');
$soccanvas = new Canvas($this->db);
$soccanvas->load_canvas('card',$canvas);
$soccanvas->load_control();
$soccanvas->fetch($socid);
$soccanvas->control->object->fetch_thirdparty();
/*if ($_REQUEST['model'])
{
$fac->setDocModel($user, $_REQUEST['model']);
}
*/
// Define output language
$outputlangs = $langs;
$newlang='';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$soccanvas->object->default_lang;
if (! empty($newlang))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
$result=thirdparty_doc_create($this->db, $soccanvas->control->object->id, '', $_REQUEST['model'], $outputlangs);
if ($result <= 0)
{
dol_print_error($this->db,$result);
exit;
}
else
{
Header ('Location: '.$_SERVER["PHP_SELF"].'?socid='.$soccanvas->control->object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
exit;
}
}
}
}
/** /**
* *
*/ */

10
htdocs/societe/canvas/default/card.default.class.php
View File

@ -54,6 +54,16 @@ class CardDefault extends CardCommon
return $out; return $out;
} }
/**
* Load actions
*/
function load_actions($socid)
{
$return = parent::load_actions($socid);
return $return;
}
/** /**
* Assign custom values for canvas * Assign custom values for canvas
* @param action Type of action * @param action Type of action

10
htdocs/societe/canvas/default/thirdparty.default.class.php
View File

@ -53,16 +53,6 @@ class ThirdPartyDefault extends Societe
return $result; return $result;
} }
/**
* Charge les actions
*/
function load_actions()
{
$result = parent::load_action();
return $result;
}
/** /**
* Fetch datas list * Fetch datas list
*/ */

10
htdocs/societe/canvas/individual/card.individual.class.php
View File

@ -54,6 +54,16 @@ class CardIndividual extends CardCommon
return $out; return $out;
} }
/**
* Load actions
*/
function load_actions($socid)
{
$return = parent::load_actions($socid);
return $return;
}
/** /**
* Assign custom values for canvas * Assign custom values for canvas
* @param action Type of action * @param action Type of action

10
htdocs/societe/canvas/individual/thirdparty.individual.class.php
View File

@ -53,16 +53,6 @@ class ThirdPartyIndividual extends Societe
return $result; return $result;
} }
/**
* Charge les actions
*/
function load_actions()
{
$result = parent::load_action();
return $result;
}
/** /**
* Fetch datas list * Fetch datas list
*/ */

4
htdocs/societe/class/societe.class.php
View File

@ -182,8 +182,6 @@ class Societe extends CommonObject
return -1; return -1;
} }
if (empty($this->canvas)) $this->canvas = 'default';
$this->db->begin(); $this->db->begin();
// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts) // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
@ -200,7 +198,7 @@ class Societe extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, entity, datec, datea, fk_user_creat, canvas)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, entity, datec, datea, fk_user_creat, canvas)";
$sql.= " VALUES ('".$this->db->escape($this->nom)."', ".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($now)."'"; $sql.= " VALUES ('".$this->db->escape($this->nom)."', ".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($now)."'";
$sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null"); $sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
$sql.= ", '".$this->canvas."'"; $sql.= ", ".($this->canvas ? "'".$this->canvas."'":"null");
$sql.= ")"; $sql.= ")";
dol_syslog("Societe::create sql=".$sql); dol_syslog("Societe::create sql=".$sql);

290
htdocs/societe/soc.php
View File

@ -1599,293 +1599,8 @@ else
* Actions * Actions
*/ */
if ($_POST["getcustomercode"]) $soccanvas->load_control();
{ $soccanvas->load_actions($socid);
// We defined value code_client
$_POST["code_client"]="Acompleter";
}
if ($_POST["getsuppliercode"])
{
// We defined value code_fournisseur
$_POST["code_fournisseur"]="Acompleter";
}
// Add new third party
if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
&& ($_POST["action"] == 'add' || $_POST["action"] == 'update') && $user->rights->societe->creer)
{
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
$error=0;
if ($_POST["action"] == 'update')
{
$soccanvas->load_control('edit');
// Load properties of company
$soccanvas->fetch($socid);
}
if ($_REQUEST["private"] == 1)
{
$soccanvas->control->object->particulier = $_REQUEST["private"];
$soccanvas->control->object->nom = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
$soccanvas->control->object->nom_particulier = $_POST["nom"];
$soccanvas->control->object->prenom = $_POST["prenom"];
$soccanvas->control->object->civilite_id = $_POST["civilite_id"];
}
else
{
$soccanvas->control->object->nom = $_POST["nom"];
}
$soccanvas->control->object->address = $_POST["adresse"];
$soccanvas->control->object->adresse = $_POST["adresse"]; // TODO obsolete
$soccanvas->control->object->cp = $_POST["cp"];
$soccanvas->control->object->ville = $_POST["ville"];
$soccanvas->control->object->pays_id = $_POST["pays_id"];
$soccanvas->control->object->departement_id = $_POST["departement_id"];
$soccanvas->control->object->tel = $_POST["tel"];
$soccanvas->control->object->fax = $_POST["fax"];
$soccanvas->control->object->email = trim($_POST["email"]);
$soccanvas->control->object->url = $_POST["url"];
$soccanvas->control->object->siren = $_POST["idprof1"];
$soccanvas->control->object->siret = $_POST["idprof2"];
$soccanvas->control->object->ape = $_POST["idprof3"];
$soccanvas->control->object->idprof4 = $_POST["idprof4"];
$soccanvas->control->object->prefix_comm = $_POST["prefix_comm"];
$soccanvas->control->object->code_client = $_POST["code_client"];
$soccanvas->control->object->code_fournisseur = $_POST["code_fournisseur"];
$soccanvas->control->object->capital = $_POST["capital"];
$soccanvas->control->object->gencod = $_POST["gencod"];
$soccanvas->control->object->canvas = $_GET["canvas"];
$soccanvas->control->object->tva_assuj = $_POST["assujtva_value"];
// Local Taxes
$soccanvas->control->object->localtax1_assuj = $_POST["localtax1assuj_value"];
$soccanvas->control->object->localtax2_assuj = $_POST["localtax2assuj_value"];
$soccanvas->control->object->tva_intra = $_POST["tva_intra"];
$soccanvas->control->object->forme_juridique_code = $_POST["forme_juridique_code"];
$soccanvas->control->object->effectif_id = $_POST["effectif_id"];
if ($_REQUEST["private"] == 1)
{
$soccanvas->control->object->typent_id = 8; // TODO predict another method if the field "special" change of rowid
}
else
{
$soccanvas->control->object->typent_id = $_POST["typent_id"];
}
$soccanvas->control->object->client = $_POST["client"];
$soccanvas->control->object->fournisseur = $_POST["fournisseur"];
$soccanvas->control->object->fournisseur_categorie = $_POST["fournisseur_categorie"];
$soccanvas->control->object->commercial_id = $_POST["commercial_id"];
$soccanvas->control->object->default_lang = $_POST["default_lang"];
// Check parameters
if (empty($_POST["cancel"]))
{
if (! empty($soccanvas->control->object->email) && ! isValidEMail($soccanvas->control->object->email))
{
$error = 1;
$langs->load("errors");
$soccanvas->control->object->error = $langs->trans("ErrorBadEMail",$soccanvas->control->object->email);
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
if (! empty($soccanvas->control->object->url) && ! isValidUrl($soccanvas->control->object->url))
{
$error = 1;
$langs->load("errors");
$soccanvas->control->object->error = $langs->trans("ErrorBadUrl",$soccanvas->control->object->url);
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
if ($soccanvas->control->object->fournisseur && ! $conf->fournisseur->enabled)
{
$error = 1;
$langs->load("errors");
$soccanvas->control->object->error = $langs->trans("ErrorSupplierModuleNotEnabled");
$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
}
}
if (! $error)
{
if ($_POST["action"] == 'add')
{
$db->begin();
if (empty($soccanvas->control->object->client)) $soccanvas->control->object->code_client='';
if (empty($soccanvas->control->object->fournisseur)) $soccanvas->control->object->code_fournisseur='';
$result = $soccanvas->control->object->create($user);
if ($result >= 0)
{
if ($soccanvas->control->object->particulier)
{
dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
$contact=new Contact($db);
$contact->civilite_id = $soccanvas->control->object->civilite_id;
$contact->name=$soccanvas->control->object->nom_particulier;
$contact->firstname=$soccanvas->control->object->prenom;
$contact->address=$soccanvas->control->object->address;
$contact->cp=$soccanvas->control->object->cp;
$contact->ville=$soccanvas->control->object->ville;
$contact->fk_pays=$soccanvas->control->object->fk_pays;
$contact->socid=$soccanvas->control->object->id; // fk_soc
$contact->status=1;
$contact->email=$soccanvas->control->object->email;
$contact->priv=0;
$result=$contact->create($user);
}
}
else
{
$mesg=$soccanvas->control->object->error;
}
if ($result >= 0)
{
$db->commit();
if ( $soccanvas->control->object->client == 1 )
{
Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$soccanvas->control->object->id);
return;
}
else
{
if ( $soccanvas->control->object->fournisseur == 1 )
{
Header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$soccanvas->control->object->id);
return;
}
else
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$soccanvas->control->object->id);
return;
}
}
exit;
}
else
{
$db->rollback();
$langs->load("errors");
$mesg=$langs->trans($soccanvas->control->object->error);
$_GET["action"]='create';
}
}
if ($_POST["action"] == 'update')
{
if ($_POST["cancel"])
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
$oldsoccanvas = new Canvas($db);
$oldsoccanvas->load_canvas('card',$canvas);
$oldsoccanvas->load_control('edit');
$result=$oldsoccanvas->fetch($socid);
// To not set code if third party is not concerned. But if it had values, we keep them.
if (empty($soccanvas->control->object->client) && empty($oldsoccanvas->control->object->code_client)) $soccanvas->control->object->code_client='';
if (empty($soccanvas->control->object->fournisseur)&& empty($oldsoccanvas->control->object->code_fournisseur)) $soccanvas->control->object->code_fournisseur='';
//var_dump($soccanvas);exit;
$result = $soccanvas->control->object->update($socid,$user,1,$oldsoccanvas->control->object->codeclient_modifiable(),$oldsoccanvas->control->object->codefournisseur_modifiable());
if ($result >= 0)
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
else
{
$soccanvas->control->object->id = $socid;
$reload = 0;
$mesg = $soccanvas->control->object->error;
$_GET["action"]= "edit";
}
}
}
}
if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->societe->supprimer)
{
$soc = new Societe($db);
$soc->fetch($socid);
$result = $soc->delete($socid);
if ($result >= 0)
{
Header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$soc->nom."");
exit;
}
else
{
$reload = 0;
$langs->load("errors");
$mesg=$langs->trans($soc->error);
$_GET["action"]='';
}
}
/*
* Generate document
*/
if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{
if (is_numeric($_REQUEST['model']))
{
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
}
else
{
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php');
$soc = new Societe($db);
$soc->fetch($socid);
$soc->fetch_thirdparty();
/*if ($_REQUEST['model'])
{
$fac->setDocModel($user, $_REQUEST['model']);
}
*/
// Define output language
$outputlangs = $langs;
$newlang='';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$fac->client->default_lang;
if (! empty($newlang))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
$result=thirdparty_doc_create($db, $soc->id, '', $_REQUEST['model'], $outputlangs);
if ($result <= 0)
{
dol_print_error($db,$result);
exit;
}
else
{
Header ('Location: '.$_SERVER["PHP_SELF"].'?socid='.$soc->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
exit;
}
}
}
/* /*
* View * View
@ -2009,7 +1724,6 @@ else
} }
print '<table width="100%"><tr><td valign="top" width="50%">'; print '<table width="100%"><tr><td valign="top" width="50%">';
print '<a name="builddoc"></a>'; // ancre print '<a name="builddoc"></a>'; // ancre