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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-09 18:35:36 +02:00
commit 09700a6aa7
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -5306,7 +5306,7 @@ class Facture extends CommonInvoice
/** /**
* @param int $rounding Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT) * @param int $rounding Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
* @return number or -1 if not available * @return float or -1 if not available
*/ */
public function getRetainedWarrantyAmount($rounding = -1) public function getRetainedWarrantyAmount($rounding = -1)
{ {

14
htdocs/product/inventory/inventory.php
View File

@ -951,18 +951,22 @@ if ($object->id > 0) {
print '</td>'; print '</td>';
} }
print '<td class="right"></td>'; print '<td class="right"></td>';
print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>';
if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) { if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">';
print '</td>';
} else {
print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>';
} }
// Actions // Actions
print '<td class="center">'; print '<td class="center">';
@ -1161,9 +1165,9 @@ if ($object->id > 0) {
} }
if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) { if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="5">'.$langs->trans("Total").'</td>'; print '<td colspan="4">'.$langs->trans("Total").'</td>';
print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>'; print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
print '<td class="right" id="totalRealValuation" colspan="2">'.price($totalRealValuation).'</td>'; print '<td class="right" id="totalRealValuation" colspan="3">'.price($totalRealValuation).'</td>';
print '<td></td>'; print '<td></td>';
print '</tr>'; print '</tr>';
} }

7
htdocs/supplier_proposal/card.php
View File

@ -696,6 +696,7 @@ if (empty($reshook)) {
$ref_supplier = $productsupplier->ref_supplier; $ref_supplier = $productsupplier->ref_supplier;
// Get vat rate // Get vat rate
$tva_npr = 0;
if (!GETPOSTISSET('tva_tx')) { // If vat rate not provided from the form (the form has the priority) if (!GETPOSTISSET('tva_tx')) { // If vat rate not provided from the form (the form has the priority)
$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha')); $tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha')); $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
@ -1295,7 +1296,7 @@ if ($action == 'create') {
// Shipping Method // Shipping Method
if (isModEnabled("expedition")) { if (isModEnabled("expedition")) {
print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
print $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : $shipping_method_id, 'shipping_method_id', '', 1); print $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);
print '</td></tr>'; print '</td></tr>';
} }
@ -1303,7 +1304,7 @@ if ($action == 'create') {
print '<tr><td>'.$langs->trans("DeliveryDate").'</td>'; print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
$datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year')); $datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") { if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60); $tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
$syear = date("Y", $tmpdte); $syear = date("Y", $tmpdte);
$smonth = date("m", $tmpdte); $smonth = date("m", $tmpdte);
@ -1320,7 +1321,7 @@ if ($action == 'create') {
print '<td>'.$langs->trans("DefaultModel").'</td>'; print '<td>'.$langs->trans("DefaultModel").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
$list = ModelePDFSupplierProposal::liste_modeles($db); $list = ModelePDFSupplierProposal::liste_modeles($db);
$preselected = ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF); $preselected = (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT) ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1); print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
print "</td></tr>"; print "</td></tr>";

13
htdocs/ticket/class/ticket.class.php
View File

@ -1059,6 +1059,19 @@ class Ticket extends CommonObject
} }
} }
// Delete all child tables
if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_ticket";
$sql .= " WHERE fk_ticket = ".(int) $this->id;
$result = $this->db->query($sql);
if (!$result) {
$error++;
$this->errors[] = $this->db->lasterror();
}
}
if (!$error) { if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."ticket"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."ticket";
$sql .= " WHERE rowid=".((int) $this->id); $sql .= " WHERE rowid=".((int) $this->id);