diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl old mode 100644 new mode 100755 diff --git a/build/makepack-dolibarrlang.pl b/build/makepack-dolibarrlang.pl old mode 100644 new mode 100755 diff --git a/build/makepack-dolibarrmodule.pl b/build/makepack-dolibarrmodule.pl old mode 100644 new mode 100755 diff --git a/build/makepack-dolibarrtheme.pl b/build/makepack-dolibarrtheme.pl old mode 100644 new mode 100755 diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 9a0ec025a95..f37cb5c78ac 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -288,27 +288,27 @@ else if ($action == 'add' && $user->rights->commande->creer) } $result = $object->addline( - $object_id, - $desc, - $lines[$i]->subprice, - $lines[$i]->qty, - $lines[$i]->tva_tx, - $lines[$i]->localtax1_tx, - $lines[$i]->localtax2_tx, - $lines[$i]->fk_product, - $lines[$i]->remise_percent, - $lines[$i]->info_bits, - $lines[$i]->fk_remise_except, - 'HT', - 0, - $datestart, - $dateend, - $product_type, - $lines[$i]->rang, - $lines[$i]->special_code, - $fk_parent_line, - $lines[$i]->fk_fournprice, - $lines[$i]->pa_ht + $object_id, + $desc, + $lines[$i]->subprice, + $lines[$i]->qty, + $lines[$i]->tva_tx, + $lines[$i]->localtax1_tx, + $lines[$i]->localtax2_tx, + $lines[$i]->fk_product, + $lines[$i]->remise_percent, + $lines[$i]->info_bits, + $lines[$i]->fk_remise_except, + 'HT', + 0, + $datestart, + $dateend, + $product_type, + $lines[$i]->rang, + $lines[$i]->special_code, + $fk_parent_line, + $lines[$i]->fk_fournprice, + $lines[$i]->pa_ht ); if ($result < 0) @@ -632,27 +632,27 @@ else if ($action == 'addline' && $user->rights->commande->creer) { // Insert line $result = $object->addline( - $object->id, - $desc, - $pu_ht, - GETPOST('qty'), - $tva_tx, - $localtax1_tx, - $localtax2_tx, - GETPOST('idprod'), - GETPOST('remise_percent'), - $info_bits, - 0, - $price_base_type, - $pu_ttc, - $date_start, - $date_end, - $type, - -1, - '', - GETPOST('fk_parent_line'), - GETPOST('np_fournprice'), - GETPOST('np_buying_price') + $object->id, + $desc, + $pu_ht, + GETPOST('qty'), + $tva_tx, + $localtax1_tx, + $localtax2_tx, + GETPOST('idprod'), + GETPOST('remise_percent'), + $info_bits, + 0, + $price_base_type, + $pu_ttc, + $date_start, + $date_end, + $type, + -1, + '', + GETPOST('fk_parent_line'), + GETPOST('np_fournprice'), + GETPOST('np_buying_price') ); if ($result > 0) @@ -753,23 +753,23 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST(' if (! $error) { $result = $object->updateline( - GETPOST('lineid'), - $description, - $up_ht, - GETPOST('qty'), - GETPOST('remise_percent'), - $vat_rate, - $localtax1_rate, - $localtax2_rate, - 'HT', - $info_bits, - $date_start, - $date_end, - $type, - GETPOST('fk_parent_line'), - 0, - $fk_fournprice, - $pa_ht + GETPOST('lineid'), + $description, + $up_ht, + GETPOST('qty'), + GETPOST('remise_percent'), + $vat_rate, + $localtax1_rate, + $localtax2_rate, + 'HT', + $info_bits, + $date_start, + $date_end, + $type, + GETPOST('fk_parent_line'), + 0, + $fk_fournprice, + $pa_ht ); if ($result >= 0) diff --git a/scripts/emailings/cron-mailing-send.php b/scripts/emailings/cron-mailing-send.php index 61ba222e2ef..20bc33a334c 100644 --- a/scripts/emailings/cron-mailing-send.php +++ b/scripts/emailings/cron-mailing-send.php @@ -94,7 +94,7 @@ if ($resql) if ($resql) { $num = $db->num_rows($resql); - + if ($num) { dol_syslog("nb of targets = ".$num, LOG_DEBUG); @@ -116,12 +116,12 @@ if ($resql) { $res=1; $now=dol_now(); - + $obj2 = $db->fetch_object($resql); - + // sendto en RFC2822 $sendto = str_replace(',',' ',$obj2->firstname." ".$obj2->lastname) ." <".$obj2->email.">"; - + // Make subtsitutions on topic and body $other=explode(';',$obj2->other); $other1=$other[0]; @@ -143,29 +143,29 @@ if ($resql) '__OTHER4__' => $other4, '__OTHER5__' => $other5 ); - + complete_substitutions_array($substitutionarray,$langs); $newsubject=make_substitutions($subject,$substitutionarray); $newmessage=make_substitutions($message,$substitutionarray); - + $substitutionisok=true; - + // Fabrication du mail $mail = new CMailFile( - $newsubject, - $sendto, - $from, - $newmessage, - array(), - array(), - array(), - '', - '', - 0, - $msgishtml, - $errorsto + $newsubject, + $sendto, + $from, + $newmessage, + array(), + array(), + array(), + '', + '', + 0, + $msgishtml, + $errorsto ); - + if ($mail->error) { $res=0; @@ -175,13 +175,13 @@ if ($resql) $mail->error='Some substitution failed'; $res=0; } - + // Send Email if ($res) { $res=$mail->sendfile(); } - + if ($res) { // Mail successful @@ -237,15 +237,15 @@ if ($resql) dol_print_error($db); } } - + $i++; } } - + // Loop finished, set global statut of mail $statut=2; if (! $nbko) $statut=3; - + $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id; dol_syslog("update global status sql=".$sql, LOG_DEBUG); $resql2=$db->query($sql);