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

Merge pull request #5271 from aschio/develop

Browse Source 
FIX #5192
This commit is contained in:
Laurent Destailleur 2016-06-04 00:17:45 +02:00
commit 5c36aa3802
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1458,12 +1458,10 @@ class CommandeFournisseur extends CommonOrder
//print $sql; //print $sql;
if ($resql) if ($resql)
{ {
$this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'commande_fournisseurdet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{ {
$linetmp = new CommandeFournisseurLigne($this->db); $linetmp = new CommandeFournisseurLigne($this->db);
$linetmp->id=$this->rowid; $linetmp->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'commande_fournisseurdet');
$linetmp->array_options = $array_options; $linetmp->array_options = $array_options;
$result=$linetmp->insertExtraFields(); $result=$linetmp->insertExtraFields();
if ($result < 0) if ($result < 0)

2
htdocs/fourn/commande/list.php
View File

@ -252,7 +252,7 @@ if ($status)
if ($status == '6,7') $title.=' - '.$langs->trans("StatusOrderCanceled"); if ($status == '6,7') $title.=' - '.$langs->trans("StatusOrderCanceled");
else $title.=' - '.$langs->trans($commandestatic->statuts[$status]); else $title.=' - '.$langs->trans($commandestatic->statuts[$status]);
} }
if ($billed) $title.=' - '.$langs->trans("Billed"); if ($billed > 0) $title.=' - '.$langs->trans("Billed");
//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes"; //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
$help_url=''; $help_url='';