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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-03 00:28:44 +02:00
commit 2f2f141fd8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_actions.php
View File

@ -95,6 +95,7 @@ class box_actions extends ModeleBoxes
$late = ''; $late = '';
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$datelimite = $db->jdate($objp->dp); $datelimite = $db->jdate($objp->dp);
$actionstatic->id = $objp->id;
$actionstatic->label = $objp->label; $actionstatic->label = $objp->label;
$actionstatic->type_label = $objp->type_label; $actionstatic->type_label = $objp->type_label;
$actionstatic->code = $objp->code; $actionstatic->code = $objp->code;
@ -108,7 +109,6 @@ class box_actions extends ModeleBoxes
//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label) //($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
$label = empty($objp->label)?$objp->type_label:$objp->label; $label = empty($objp->label)?$objp->type_label:$objp->label;
$tooltip = $langs->trans('Action'.$objp->code).': '.$label;
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $actionstatic->getNomUrl(1), 'text' => $actionstatic->getNomUrl(1),

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

@ -709,13 +709,13 @@ class Don extends CommonObject
* Classify the donation as paid, the donation was received * Classify the donation as paid, the donation was received
* *
* @param int $id id of donation * @param int $id id of donation
* @param int $modepayment mode de payment * @param int $modepayment mode of payment
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function set_paid($id, $modepaiement='') function set_paid($id, $modepayment='')
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
if ($modepaiement) if ($modepayment)
{ {
$sql .= ", fk_payment=$modepayment"; $sql .= ", fk_payment=$modepayment";
} }