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

FIX pb of duplicate event on command with eldy's recommendations

Browse Source
This commit is contained in:
lmarcouiller 2020-10-23 09:56:35 +02:00
parent 1ee8c34bf5
commit 42aafeb8b5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/commande/card.php
View File

@ -1282,15 +1282,6 @@ if (empty($reshook))
exit(); exit();
} }
//Used to not reclass as a billed or closed command which is already billed by refreshing the page
if (strpos($_SERVER["REQUEST_URI"], 'action=classifybilled') && $object->billed
|| strpos($_SERVER["REQUEST_URI"], 'action=confirm_shipped') && Commande::STATUS_CLOSED
)
{
header("Location: $_SERVER[PHP_SELF]?id=$object->id");
exit();
}
// add lines from objectlinked // add lines from objectlinked
if ($action == 'import_lines_from_object' if ($action == 'import_lines_from_object'
&& $usercancreate && $usercancreate

8
htdocs/commande/class/commande.class.php
View File

@ -745,6 +745,10 @@ class Commande extends CommonOrder
if ($usercanclose) if ($usercanclose)
{ {
$this->db->begin(); $this->db->begin();
if ($this->statut == self::STATUS_CLOSED)
{
return 0;
}
$now = dol_now(); $now = dol_now();
@ -2882,6 +2886,10 @@ class Commande extends CommonOrder
$error = 0; $error = 0;
$this->db->begin(); $this->db->begin();
if ($this->billed)
{
return 0;
}
$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1'; $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT; $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;