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

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

Browse Source 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
This commit is contained in:
Laurent Destailleur 2019-09-15 15:17:38 +02:00
commit 6bfba0b731
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/bankentries_list.php
View File

@ -1376,7 +1376,7 @@ if ($resql)
// Debit // Debit
if (! empty($arrayfields['b.debit']['checked'])) if (! empty($arrayfields['b.debit']['checked']))
{ {
print '<td class="right">'; print '<td class="nowrap right">';
if ($objp->amount < 0) if ($objp->amount < 0)
{ {
print price($objp->amount * -1); print price($objp->amount * -1);
@ -1390,7 +1390,7 @@ if ($resql)
// Credit // Credit
if (! empty($arrayfields['b.credit']['checked'])) if (! empty($arrayfields['b.credit']['checked']))
{ {
print '<td class="right">'; print '<td class="nowrap right">';
if ($objp->amount > 0) if ($objp->amount > 0)
{ {
print price($objp->amount); print price($objp->amount);

26
htdocs/core/class/commonobject.class.php
View File

@ -7624,18 +7624,20 @@ abstract class CommonObject
} }
// Delete cascade first // Delete cascade first
foreach($this->childtablesoncascade as $table) if (! empty($this->childtablesoncascade)) {
{ foreach($this->childtablesoncascade as $table)
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id; {
$resql = $this->db->query($sql); $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
if (! $resql) $resql = $this->db->query($sql);
{ if (! $resql)
$this->error=$this->db->lasterror(); {
$this->errors[]=$this->error; $this->error=$this->db->lasterror();
$this->db->rollback(); $this->errors[]=$this->error;
return -1; $this->db->rollback();
} return -1;
} }
}
}
if (! $error) { if (! $error) {
if (! $notrigger) { if (! $notrigger) {