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-02 12:55:58 +02:00
commit 8390b9bd16
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/class/propal.class.php
View File

@ -2415,7 +2415,7 @@ class Propal extends CommonObject
} }
$response = new WorkboardResponse(); $response = new WorkboardResponse();
$response->warning_delay = $delay_warning; $response->warning_delay = $delay_warning/60/60/24;
$response->label = $label; $response->label = $label;
$response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut; $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut;
$response->img = img_object($langs->trans("Propals"),"propal"); $response->img = img_object($langs->trans("Propals"),"propal");

2
htdocs/don/payment/card.php
View File

@ -202,7 +202,7 @@ $sql.= ' WHERE pd.fk_donation = d.rowid';
$sql.= ' AND d.entity = '.$conf->entity; $sql.= ' AND d.entity = '.$conf->entity;
$sql.= ' AND pd.rowid = '.$id; $sql.= ' AND pd.rowid = '.$id;
dol_syslog("donations/payment/card.php", LOG_DEBUG); dol_syslog("don/payment/card.php", LOG_DEBUG);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {