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 2021-06-26 12:00:42 +02:00
commit df6d160374
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -193,7 +193,7 @@ if (empty($reshook)) {
exit(); exit();
} else { } else {
$langs->load("errors"); $langs->load("errors");
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($objectutil->error, $objectutil->errors, 'errors');
$action = ''; $action = '';
} }
} elseif ($action == 'reopen' && $usercanreopen) { } elseif ($action == 'reopen' && $usercanreopen) {

6
htdocs/compta/facture/class/facture.class.php
View File

@ -1235,14 +1235,20 @@ class Facture extends CommonInvoice
$result = $object->create($user); $result = $object->create($user);
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->error = $object->error;
$this->errors = $object->errors;
} else { } else {
// copy internal contacts // copy internal contacts
if ($object->copy_linked_contact($this, 'internal') < 0) { if ($object->copy_linked_contact($this, 'internal') < 0) {
$error++; $error++;
$this->error = $object->error;
$this->errors = $object->errors;
} elseif ($this->socid == $object->socid) { } elseif ($this->socid == $object->socid) {
// copy external contacts if same company // copy external contacts if same company
if ($object->copy_linked_contact($this, 'external') < 0) { if ($object->copy_linked_contact($this, 'external') < 0) {
$error++; $error++;
$this->error = $object->error;
$this->errors = $object->errors;
} }
} }
} }