Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source
This commit is contained in:
Laurent Destailleur 2024-10-14 20:18:46 +02:00
commit d819d88718
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/action/class/actioncomm.class.php
View File

@ -2517,6 +2517,7 @@ class ActionComm extends CommonObject
// Load event
$res = $this->fetch($actionCommReminder->fk_actioncomm);
if ($res > 0) $res = $this->fetch_thirdparty();
if ($res > 0) {
// PREPARE EMAIL
$errormesg = '';

15
htdocs/commande/list.php
View File

@ -2693,6 +2693,21 @@ while ($i < $imaxinloop) {
}
}
}
// Call Hook modifyTextInfo
$parameters = array('textinfo' => $text_info);
$reshook = $hookmanager->executeHooks('modifyTextInfo', $parameters, $object, $action);
if ($reshook == 1) {
// for add information
$text_info .= $hookmanager->resPrint;
} elseif ($reshook == 0) {
// for replace information
$text_info = $hookmanager->resPrint;
} elseif ($reshook == -1) {
// for errors
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
if ($notshippable == 0) {
$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
$text_info = $text_icon.' '.$langs->trans('Shippable').'<br>'.$text_info;

7
htdocs/holiday/class/holiday.class.php
View File

@ -1067,6 +1067,13 @@ class Holiday extends CommonObject
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error) {
$result = $this->insertExtraFields();
if ($result < 0) {
$error++;
}
}
if (!$error) {
if (!$notrigger) {
// Call trigger

15
htdocs/product/stock/replenish.php
View File

@ -196,17 +196,20 @@ if ($action == 'order' && GETPOST('valid')) {
// TODO Get desc in language of thirdparty
}
$line->tva_tx = $productsupplier->vatrate_supplier;
$tva = $line->tva_tx / 100;
// If we use multicurrency
if (isModEnabled('multicurrency') && !empty($productsupplier->fourn_multicurrency_code) && $productsupplier->fourn_multicurrency_code != $conf->currency) {
$line->multicurrency_code = $productsupplier->fourn_multicurrency_code;
$line->fk_multicurrency = $productsupplier->fourn_multicurrency_id;
$line->multicurrency_subprice = $productsupplier->fourn_multicurrency_unitprice;
$line->multicurrency_code = $productsupplier->fourn_multicurrency_code;
$line->fk_multicurrency = $productsupplier->fourn_multicurrency_id;
$line->multicurrency_subprice = $productsupplier->fourn_multicurrency_unitprice;
$line->multicurrency_total_ht = $line->multicurrency_subprice * $qty;
$line->multicurrency_total_tva = $line->multicurrency_total_ht * $tva;
$line->multicurrency_total_ttc = $line->multicurrency_total_ht + $line->multicurrency_total_tva;
}
$line->tva_tx = $productsupplier->vatrate_supplier;
$line->subprice = $productsupplier->fourn_pu;
$line->total_ht = $productsupplier->fourn_pu * $qty;
$tva = $line->tva_tx / 100;
$line->total_tva = $line->total_ht * $tva;
$line->total_ttc = $line->total_ht + $line->total_tva;
$line->remise_percent = $productsupplier->remise_percent;