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

Fix draft invoice must be destroyed once converted into template

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-03 21:14:20 +01:00
parent bc2043cb79
commit 453466f23f
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -77,7 +77,7 @@ class FactureRec extends Facture
* *
* @param User $user User object * @param User $user User object
* @param int $facid Id of source invoice * @param int $facid Id of source invoice
* @return int <0 if KO, id of invoice if OK * @return int <0 if KO, id of invoice created if OK
*/ */
function create($user, $facid) function create($user, $facid)
{ {

44
htdocs/compta/facture/fiche-rec.php
View File

@ -123,7 +123,7 @@ if ($action == 'add')
$object->date_when = $date_next_execution; $object->date_when = $date_next_execution;
// Get first contract linked to invoice used to generate template // Get first contract linked to invoice used to generate template
if (GETPOST('facid','int') > 0) if ($id > 0)
{ {
$srcObject = new Facture($db); $srcObject = new Facture($db);
$srcObject->fetch(GETPOST('facid','int')); $srcObject->fetch(GETPOST('facid','int'));
@ -133,22 +133,48 @@ if ($action == 'add')
if (! empty($srcObject->linkedObjectsIds['contrat'])) if (! empty($srcObject->linkedObjectsIds['contrat']))
{ {
$contractidid = reset($srcObject->linkedObjectsIds['contrat']); $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
}
$object->origin = 'contrat'; $object->origin = 'contrat';
$object->origin_id = $contractidid; $object->origin_id = $contractidid;
$object->linked_objects[$object->origin] = $object->origin_id; $object->linked_objects[$object->origin] = $object->origin_id;
}
} }
if ($object->create($user, $id) > 0) $db->begin();
{
$id = $object->id;
header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id); $oldinvoice = new Facture($db);
$oldinvoice->fetch($id);
$result = $object->create($user, $oldinvoice->id);
if ($result > 0)
{
$result=$oldinvoice->delete(0, 1);
if ($result < 0)
{
$error++;
setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
$action = "create";
}
}
else
{
$error++;
setEventMessages($object->error, $object->errors, 'errors');
$action = "create";
}
if (! $error)
{
$db->commit();
header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
exit; exit;
} }
else else
{ {
$db->rollback();
$error++;
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$action = "create"; $action = "create";
} }