Fix: permission execute on perl script
Fix: Checkstyle
This commit is contained in:
Laurent Destailleur
parent
1451f8c0b4
commit
377b1716ef
0
build/makepack-dolibarr.pl
Normal file → Executable file
0
build/makepack-dolibarr.pl
Normal file → Executable file
0
build/makepack-dolibarrlang.pl
Normal file → Executable file
0
build/makepack-dolibarrlang.pl
Normal file → Executable file
0
build/makepack-dolibarrmodule.pl
Normal file → Executable file
0
build/makepack-dolibarrmodule.pl
Normal file → Executable file
0
build/makepack-dolibarrtheme.pl
Normal file → Executable file
0
build/makepack-dolibarrtheme.pl
Normal file → Executable file
@ -288,27 +288,27 @@ else if ($action == 'add' && $user->rights->commande->creer)
|
|||||||
}
|
}
|
||||||
|
|
||||||
$result = $object->addline(
|
$result = $object->addline(
|
||||||
$object_id,
|
$object_id,
|
||||||
$desc,
|
$desc,
|
||||||
$lines[$i]->subprice,
|
$lines[$i]->subprice,
|
||||||
$lines[$i]->qty,
|
$lines[$i]->qty,
|
||||||
$lines[$i]->tva_tx,
|
$lines[$i]->tva_tx,
|
||||||
$lines[$i]->localtax1_tx,
|
$lines[$i]->localtax1_tx,
|
||||||
$lines[$i]->localtax2_tx,
|
$lines[$i]->localtax2_tx,
|
||||||
$lines[$i]->fk_product,
|
$lines[$i]->fk_product,
|
||||||
$lines[$i]->remise_percent,
|
$lines[$i]->remise_percent,
|
||||||
$lines[$i]->info_bits,
|
$lines[$i]->info_bits,
|
||||||
$lines[$i]->fk_remise_except,
|
$lines[$i]->fk_remise_except,
|
||||||
'HT',
|
'HT',
|
||||||
0,
|
0,
|
||||||
$datestart,
|
$datestart,
|
||||||
$dateend,
|
$dateend,
|
||||||
$product_type,
|
$product_type,
|
||||||
$lines[$i]->rang,
|
$lines[$i]->rang,
|
||||||
$lines[$i]->special_code,
|
$lines[$i]->special_code,
|
||||||
$fk_parent_line,
|
$fk_parent_line,
|
||||||
$lines[$i]->fk_fournprice,
|
$lines[$i]->fk_fournprice,
|
||||||
$lines[$i]->pa_ht
|
$lines[$i]->pa_ht
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($result < 0)
|
if ($result < 0)
|
||||||
@ -632,27 +632,27 @@ else if ($action == 'addline' && $user->rights->commande->creer)
|
|||||||
{
|
{
|
||||||
// Insert line
|
// Insert line
|
||||||
$result = $object->addline(
|
$result = $object->addline(
|
||||||
$object->id,
|
$object->id,
|
||||||
$desc,
|
$desc,
|
||||||
$pu_ht,
|
$pu_ht,
|
||||||
GETPOST('qty'),
|
GETPOST('qty'),
|
||||||
$tva_tx,
|
$tva_tx,
|
||||||
$localtax1_tx,
|
$localtax1_tx,
|
||||||
$localtax2_tx,
|
$localtax2_tx,
|
||||||
GETPOST('idprod'),
|
GETPOST('idprod'),
|
||||||
GETPOST('remise_percent'),
|
GETPOST('remise_percent'),
|
||||||
$info_bits,
|
$info_bits,
|
||||||
0,
|
0,
|
||||||
$price_base_type,
|
$price_base_type,
|
||||||
$pu_ttc,
|
$pu_ttc,
|
||||||
$date_start,
|
$date_start,
|
||||||
$date_end,
|
$date_end,
|
||||||
$type,
|
$type,
|
||||||
-1,
|
-1,
|
||||||
'',
|
'',
|
||||||
GETPOST('fk_parent_line'),
|
GETPOST('fk_parent_line'),
|
||||||
GETPOST('np_fournprice'),
|
GETPOST('np_fournprice'),
|
||||||
GETPOST('np_buying_price')
|
GETPOST('np_buying_price')
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($result > 0)
|
if ($result > 0)
|
||||||
@ -753,23 +753,23 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('
|
|||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
$result = $object->updateline(
|
$result = $object->updateline(
|
||||||
GETPOST('lineid'),
|
GETPOST('lineid'),
|
||||||
$description,
|
$description,
|
||||||
$up_ht,
|
$up_ht,
|
||||||
GETPOST('qty'),
|
GETPOST('qty'),
|
||||||
GETPOST('remise_percent'),
|
GETPOST('remise_percent'),
|
||||||
$vat_rate,
|
$vat_rate,
|
||||||
$localtax1_rate,
|
$localtax1_rate,
|
||||||
$localtax2_rate,
|
$localtax2_rate,
|
||||||
'HT',
|
'HT',
|
||||||
$info_bits,
|
$info_bits,
|
||||||
$date_start,
|
$date_start,
|
||||||
$date_end,
|
$date_end,
|
||||||
$type,
|
$type,
|
||||||
GETPOST('fk_parent_line'),
|
GETPOST('fk_parent_line'),
|
||||||
0,
|
0,
|
||||||
$fk_fournprice,
|
$fk_fournprice,
|
||||||
$pa_ht
|
$pa_ht
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($result >= 0)
|
if ($result >= 0)
|
||||||
|
|||||||
@ -94,7 +94,7 @@ if ($resql)
|
|||||||
if ($resql)
|
if ($resql)
|
||||||
{
|
{
|
||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
|
|
||||||
if ($num)
|
if ($num)
|
||||||
{
|
{
|
||||||
dol_syslog("nb of targets = ".$num, LOG_DEBUG);
|
dol_syslog("nb of targets = ".$num, LOG_DEBUG);
|
||||||
@ -116,12 +116,12 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
$res=1;
|
$res=1;
|
||||||
$now=dol_now();
|
$now=dol_now();
|
||||||
|
|
||||||
$obj2 = $db->fetch_object($resql);
|
$obj2 = $db->fetch_object($resql);
|
||||||
|
|
||||||
// sendto en RFC2822
|
// sendto en RFC2822
|
||||||
$sendto = str_replace(',',' ',$obj2->firstname." ".$obj2->lastname) ." <".$obj2->email.">";
|
$sendto = str_replace(',',' ',$obj2->firstname." ".$obj2->lastname) ." <".$obj2->email.">";
|
||||||
|
|
||||||
// Make subtsitutions on topic and body
|
// Make subtsitutions on topic and body
|
||||||
$other=explode(';',$obj2->other);
|
$other=explode(';',$obj2->other);
|
||||||
$other1=$other[0];
|
$other1=$other[0];
|
||||||
@ -143,29 +143,29 @@ if ($resql)
|
|||||||
'__OTHER4__' => $other4,
|
'__OTHER4__' => $other4,
|
||||||
'__OTHER5__' => $other5
|
'__OTHER5__' => $other5
|
||||||
);
|
);
|
||||||
|
|
||||||
complete_substitutions_array($substitutionarray,$langs);
|
complete_substitutions_array($substitutionarray,$langs);
|
||||||
$newsubject=make_substitutions($subject,$substitutionarray);
|
$newsubject=make_substitutions($subject,$substitutionarray);
|
||||||
$newmessage=make_substitutions($message,$substitutionarray);
|
$newmessage=make_substitutions($message,$substitutionarray);
|
||||||
|
|
||||||
$substitutionisok=true;
|
$substitutionisok=true;
|
||||||
|
|
||||||
// Fabrication du mail
|
// Fabrication du mail
|
||||||
$mail = new CMailFile(
|
$mail = new CMailFile(
|
||||||
$newsubject,
|
$newsubject,
|
||||||
$sendto,
|
$sendto,
|
||||||
$from,
|
$from,
|
||||||
$newmessage,
|
$newmessage,
|
||||||
array(),
|
array(),
|
||||||
array(),
|
array(),
|
||||||
array(),
|
array(),
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
0,
|
0,
|
||||||
$msgishtml,
|
$msgishtml,
|
||||||
$errorsto
|
$errorsto
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($mail->error)
|
if ($mail->error)
|
||||||
{
|
{
|
||||||
$res=0;
|
$res=0;
|
||||||
@ -175,13 +175,13 @@ if ($resql)
|
|||||||
$mail->error='Some substitution failed';
|
$mail->error='Some substitution failed';
|
||||||
$res=0;
|
$res=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send Email
|
// Send Email
|
||||||
if ($res)
|
if ($res)
|
||||||
{
|
{
|
||||||
$res=$mail->sendfile();
|
$res=$mail->sendfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($res)
|
if ($res)
|
||||||
{
|
{
|
||||||
// Mail successful
|
// Mail successful
|
||||||
@ -237,15 +237,15 @@ if ($resql)
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Loop finished, set global statut of mail
|
// Loop finished, set global statut of mail
|
||||||
$statut=2;
|
$statut=2;
|
||||||
if (! $nbko) $statut=3;
|
if (! $nbko) $statut=3;
|
||||||
|
|
||||||
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
|
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
|
||||||
dol_syslog("update global status sql=".$sql, LOG_DEBUG);
|
dol_syslog("update global status sql=".$sql, LOG_DEBUG);
|
||||||
$resql2=$db->query($sql);
|
$resql2=$db->query($sql);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user