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

Fix #29640: (#29939)

Browse Source 
* FIX REPLENISH MANY FOURN WHEN ORDER ALREADY CREATE (#29710)

* fix restrictedArea on selectobject (#29882)

* Fix travis

* Fix : expense report reapproval email, wrong date format + missing parameter (#29874)

* delete_linked_contact is < 0 in case of error

---------

Co-authored-by: IC-Mathieu <95343351+IC-Mathieu@users.noreply.github.com>
Co-authored-by: Rémi Champlon <85104766+Kazimir42@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: Maxime Kohlhaas <maxime@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Eric 2024-06-09 01:11:03 +02:00 committed by GitHub
parent 3421352e7c
commit 000efd5221
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 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

@ -2859,7 +2859,7 @@ class Facture extends CommonInvoice
// Delete invoice line
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facturedet WHERE fk_facture = '.((int) $rowid);
if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact()) {
if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact() >= 0 ) {
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.((int) $rowid);
$resql = $this->db->query($sql);

6
htdocs/core/ajax/selectobject.php
View File

@ -137,7 +137,11 @@ if ($usesublevelpermission && !isset($user->rights->$module->$element)) { // The
$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : ''));
// Add a security test to avoid to get content of all tables
restrictedArea($user, $objecttmp->element, $id);
if (!empty($objecttmp->module)) {
restrictedArea($user, $objecttmp->module, $id, $objecttmp->table_element, $objecttmp->element);
} else {
restrictedArea($user, $objecttmp->element, $id);
}
/*

3
htdocs/expensereport/card.php
View File

@ -548,8 +548,7 @@ if (empty($reshook)) {
// CONTENT
$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
$link = '<a href="'.$link.'">'.$link.'</a>';
$dateRefusEx = explode(" ", $object->date_refuse);
$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", dol_print_date($object->date_refuse, 'day'), $object->detail_refuse, $expediteur->getFullName($langs), get_date_range($object->date_debut, $object->date_fin, '', $langs), $link);
// Rebuild pdf
/*

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

@ -275,6 +275,7 @@ if ($action == 'order' && GETPOST('valid')) {
} else {
$id = $result;
}
$i++;
} else {
$order->socid = $suppliersid[$i];
$order->fetch_thirdparty();