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

Debug

Browse Source
This commit is contained in:
aspangaro 2015-03-26 20:43:34 +01:00
parent b60f1e33d6
commit 059bb40345
5 changed files with 211 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/don/card.php
View File

@ -47,25 +47,25 @@ $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');
$cancel=GETPOST('cancel'); $cancel=GETPOST('cancel');
$amount=GETPOST('amount'); $amount=GETPOST('amount');
$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$object = new Don($db); $object = new Don($db);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
// Security check // Security check
$result = restrictedArea($user, 'don', $id); $result = restrictedArea($user, 'don', $id);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('doncard','globalcard')); $hookmanager->initHooks(array('doncard','globalcard'));
/* /*
* Actions * Actions
*/ */
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if ($action == 'update') if ($action == 'update')
{ {
@ -174,17 +174,21 @@ if ($action == 'add')
} }
} }
} }
if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
if ($action == 'delete')
{ {
$object->delete($id); $object->fetch($id);
header("Location: list.php"); $result=$object->delete($user);
exit; if ($result > 0)
} {
if ($action == 'commentaire') header("Location: index.php");
{ exit;
$object->fetch($id); }
$object->update_note(GETPOST("commentaire")); else
{
dol_syslog($object->error,LOG_DEBUG);
setEventMessage($object->error,'errors');
setEventMessage($object->errors,'errors');
}
} }
if ($action == 'valid_promesse') if ($action == 'valid_promesse')
{ {
@ -486,6 +490,13 @@ if (! empty($id) && $action == 'edit')
/* ************************************************************ */ /* ************************************************************ */
if (! empty($id) && $action != 'edit') if (! empty($id) && $action != 'edit')
{ {
// Confirmation delete
if ($action == 'delete')
{
$text=$langs->trans("ConfirmDeleteADonation");
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteADonation"),$text,"confirm_delete",'','',1);
}
$result=$object->fetch($id); $result=$object->fetch($id);
if ($result < 0) { if ($result < 0) {
dol_print_error($db,$object->error); exit; dol_print_error($db,$object->error); exit;
@ -689,6 +700,7 @@ if (! empty($id) && $action != 'edit')
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>"; print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
} }
// Delete
if ($user->rights->don->supprimer) if ($user->rights->don->supprimer)
{ {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>"; print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";

320
htdocs/don/class/don.class.php
View File

@ -34,8 +34,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/ */
class Don extends CommonObject class Don extends CommonObject
{ {
public $element='don'; public $element='don'; // Id that identify managed objects
public $table_element='don'; public $table_element='don'; // Name of table without prefix where object is stored
public $fk_element = 'fk_don';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; var $id;
var $ref; var $ref;
@ -299,14 +301,19 @@ class Don extends CommonObject
/** /**
* Create donation record into database * Create donation record into database
* *
* @param User $user Objet utilisateur qui cree le don * @param User $user User who created the donation
* @return int Id don cree si ok, <0 si ko * @param int $notrigger Disable triggers
* @return int <0 if KO, id of created donation if OK
* TODO add numbering module for Ref * TODO add numbering module for Ref
*/ */
function create($user) function create($user)
{ {
global $conf; global $conf, $langs;
$error = 0;
$ret = 0;
$now=dol_now();
// Clean parameters // Clean parameters
$this->address=($this->address>0?$this->address:$this->address); $this->address=($this->address>0?$this->address:$this->address);
$this->zip=($this->zip>0?$this->zip:$this->zip); $this->zip=($this->zip>0?$this->zip:$this->zip);
@ -314,8 +321,6 @@ class Don extends CommonObject
$this->country_id=($this->country_id>0?$this->country_id:$this->country_id); $this->country_id=($this->country_id>0?$this->country_id:$this->country_id);
$this->country=($this->country?$this->country:$this->country); $this->country=($this->country?$this->country:$this->country);
$now=dol_now();
$this->db->begin(); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."don ("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
@ -365,41 +370,54 @@ class Don extends CommonObject
$sql.= ", '".$this->db->escape($this->phone_mobile)."'"; $sql.= ", '".$this->db->escape($this->phone_mobile)."'";
$sql.= ")"; $sql.= ")";
dol_syslog("Don::create", LOG_DEBUG); dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result = $this->db->query($sql); $resql = $this->db->query($sql);
if ($result) if ($resql)
{ {
// Actions on extra fields (by external module or standard code) $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don");
$hookmanager->initHooks(array('donationdao')); $ret = $this->id;
$parameters=array('id'=>$this->id);
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}
else if ($reshook < 0) $error++;
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don");
// Call trigger if (!$notrigger)
$result=$this->call_trigger('DON_CREATE',$user); {
if ($result < 0) { $error++; $this->db->rollback(); return -1; } // Call trigger
// End call triggers $result=$this->call_trigger('DON_CREATE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
}
else
{
$this->error = $this->db->lasterror();
$this->errno = $this->db->lasterrno();
$error++;
}
// Update extrafield
if (!$error) {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}
if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
{
$res = $this->setValid($user);
if ($res < 0) $error++;
}
if (!$error)
{
$this->db->commit(); $this->db->commit();
return $this->id; return $ret;
} }
else else
{ {
$this->db->rollback(); $this->db->rollback();
dol_print_error($this->db);
return -1; return -1;
} }
} }
@ -410,8 +428,12 @@ class Don extends CommonObject
* @param User $user Objet utilisateur qui met a jour le don * @param User $user Objet utilisateur qui met a jour le don
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
function update($user) function update($user, $notrigger=0)
{ {
global $langs, $conf;
$error=0;
// Clean parameters // Clean parameters
$this->address=($this->address>0?$this->address:$this->address); $this->address=($this->address>0?$this->address:$this->address);
$this->zip=($this->zip>0?$this->zip:$this->zip); $this->zip=($this->zip>0?$this->zip:$this->zip);
@ -440,91 +462,126 @@ class Don extends CommonObject
$sql .= ",phone='".$this->phone."'"; $sql .= ",phone='".$this->phone."'";
$sql .= ",phone_mobile='".$this->phone_mobile."'"; $sql .= ",phone_mobile='".$this->phone_mobile."'";
$sql .= ",fk_statut=".$this->statut; $sql .= ",fk_statut=".$this->statut;
$sql .= " WHERE rowid = $this->id"; $sql .= " WHERE rowid = '".$this->id."'";
dol_syslog("Don::update", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
// Actions on extra fields (by external module or standard code)
$hookmanager->initHooks(array('donationdao'));
$parameters=array('id'=>$this->id);
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}
else if ($reshook < 0) $error++;
// Call trigger
$result=$this->call_trigger('DON_UPDATE',$user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
$this->db->commit();
return 1;
}
else
{
$this->db->rollback();
dol_print_error($this->db);
return -1;
}
}
/**
* Delete a donation
*
* @param int $rowid Id of donation to delete
* @return int <0 if KO, >0 if OK
*/
function delete($rowid)
{
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";
dol_syslog(get_class($this)."::Update", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
if ( $this->db->affected_rows($resql) ) if (!$notrigger)
{ {
// Remove extrafields // Call trigger
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used $result=$this->call_trigger('DON_MODIFY',$user);
{ if ($result < 0) { $error++; }
$result=$this->deleteExtraFields();
if ($result < 0)
{
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
// Call trigger
$result=$this->call_trigger('DON_DELETE',$user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers // End call triggers
}
// Update extrafield
if (!$error)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}
if (! $error )
{
$this->db->commit(); $this->db->commit();
return 1; $result = 1;
} }
else else
{ {
$this->db->rollback(); $this->db->rollback();
return -1; $result = -1;
} }
} }
else else
{
$this->error = $this->db->lasterror();
$this->errors[] = $this->error;
$this->db->rollback();
dol_syslog(get_class($this)."::Update error -2 " . $this->error, LOG_ERR);
$result = -2;
}
return $result;
}
/**
* Delete a donation from database
*
* @param User $user User
* @param int $notrigger Disable triggers
* @return int <0 if KO, 0 if not possible, >0 if OK
*/
function delete($user, $notrigger=0)
{
global $conf, $langs;
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$error = 0;
$this->db->begin();
// Delete donation
if (! $error)
{ {
dol_print_error($this->db); $sql = "DELETE FROM " . MAIN_DB_PREFIX . "don";
$sql.= " WHERE rowid=" . $this->id;
$resql = $this->db->query($sql);
if (!$resql)
{
$this->errors[] = $this->db->lasterror();
$error++;
}
}
if (! $error)
{
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "don_extrafields";
$sql.= " WHERE fk_object=" . $this->id;
$resql = $this->db->query($sql);
if (! $resql)
{
$this->errors[] = $this->db->lasterror();
$error++;
}
}
if (! $error)
{
if (!$notrigger)
{
// Call trigger
$result=$this->call_trigger('DON_DELETE',$user);
if ($result < 0) {
$error++;
}
// End call triggers
}
}
if (! $error)
{
$this->db->commit();
return 1;
}
else
{
foreach ( $this->errors as $errmsg )
{
dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
}
dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR);
$this->db->rollback();
return -1; return -1;
} }
} }
@ -536,7 +593,7 @@ class Don extends CommonObject
* @param string $ref Ref of donation to load * @param string $ref Ref of donation to load
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function fetch($rowid,$ref='') function fetch($id,$ref='')
{ {
global $conf; global $conf;
@ -550,7 +607,15 @@ class Don extends CommonObject
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
$sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity; if (! empty($id))
{
$sql.= " WHERE d.rowid=".$id;
}
else if (! empty($ref))
{
$sql.= " WHERE ref='".$this->db->escape($ref)."'";
}
$sql.= " AND d.entity = ".$conf->entity;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG); dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
@ -615,10 +680,10 @@ class Don extends CommonObject
* @param int $userid User who validate the promise * @param int $userid User who validate the promise
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function valid_promesse($rowid, $userid) function valid_promesse($id, $userid)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = $userid WHERE rowid = $rowid AND fk_statut = 0"; $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -646,7 +711,7 @@ class Don extends CommonObject
* @param int $modepaiement mode de paiement * @param int $modepaiement mode de paiement
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function set_paye($rowid, $modepaiement='') function set_paid($id, $modepaiement='')
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
if ($modepaiement) if ($modepaiement)
@ -674,46 +739,15 @@ class Don extends CommonObject
} }
} }
/**
* Classe le don comme encaisse
*
* @param int $rowid id du don a modifier
* @return int <0 if KO, >0 if OK
*/
function set_encaisse($rowid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2";
$resql=$this->db->query($sql);
if ($resql)
{
if ( $this->db->affected_rows($resql) )
{
return 1;
}
else
{
return 0;
}
}
else
{
dol_print_error($this->db);
return -1;
}
}
/** /**
* Set donation to status canceled * Set donation to status canceled
* *
* @param int $rowid id of donation * @param int $rowid id of donation
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function set_cancel($rowid) function set_cancel($id)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$rowid; $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

6
htdocs/install/mysql/tables/llx_don.sql
View File

@ -26,7 +26,7 @@ create table llx_don
ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL) ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL)
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
tms timestamp, tms timestamp,
fk_statut smallint NOT NULL DEFAULT 0, -- etat du don promesse/valid fk_statut smallint NOT NULL DEFAULT 0, -- Status of donation promise or validate
datec datetime, -- date de creation de l'enregistrement datec datetime, -- date de creation de l'enregistrement
datedon datetime, -- date du don/promesse datedon datetime, -- date du don/promesse
amount real DEFAULT 0, amount real DEFAULT 0,
@ -43,8 +43,8 @@ create table llx_don
email varchar(255), email varchar(255),
phone varchar(24), phone varchar(24),
phone_mobile varchar(24), phone_mobile varchar(24),
public smallint DEFAULT 1 NOT NULL, -- le don est-il public (0,1) public smallint DEFAULT 1 NOT NULL, -- Donation is public ? (0,1)
fk_project integer NULL, -- projet auquel est fait le don fk_project integer NULL, -- Donation is given for a project ?
fk_user_author integer NOT NULL, fk_user_author integer NOT NULL,
fk_user_valid integer NULL, fk_user_valid integer NULL,
note_private text, note_private text,

2
htdocs/langs/en_US/donations.lang
View File

@ -6,6 +6,8 @@ Donor=Donor
Donors=Donors Donors=Donors
AddDonation=Create a donation AddDonation=Create a donation
NewDonation=New donation NewDonation=New donation
DeleteADonation=Delete a donation
ConfirmDeleteADonation=Are you sure you want to delete this donation ?
ShowDonation=Show donation ShowDonation=Show donation
DonationPromise=Gift promise DonationPromise=Gift promise
PromisesNotValid=Not validated promises PromisesNotValid=Not validated promises

2
htdocs/projet/class/project.class.php
View File

@ -506,7 +506,7 @@ class Project extends CommonObject
// Set fk_projet into elements to null // Set fk_projet into elements to null
$listoftables=array( $listoftables=array(
'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet','facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet', 'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet','facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet',
'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet' 'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_project'
); );
foreach($listoftables as $key => $value) foreach($listoftables as $key => $value)
{ {