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 2023-03-10 19:25:25 +01:00
commit b1472b2e31
8 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -441,7 +441,7 @@ class Adherent extends CommonObject
* @param string $errors_to erros to * @param string $errors_to erros to
* @param string $moreinheader Add more html headers * @param string $moreinheader Add more html headers
* @deprecated since V18 * @deprecated since V18
* @see sendEmail * @see sendEmail()
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '') public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')

2
htdocs/comm/propal/list.php
View File

@ -196,7 +196,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
// List of fields to search into when doing a "search in all" // List of fields to search into when doing a "search in all"
$fieldstosearchall = array( $fieldstosearchall = array(
'p.ref'=>'Ref', 'p.ref'=>'Ref',
'p.ref_client'=>'CustomerRef', 'p.ref_client'=>'RefCustomer',
'pd.description'=>'Description', 'pd.description'=>'Description',
's.nom'=>"ThirdParty", 's.nom'=>"ThirdParty",
's.name_alias'=>"AliasNameShort", 's.name_alias'=>"AliasNameShort",

2
htdocs/core/modules/member/mod_member_advanced.php
View File

@ -122,7 +122,7 @@ class mod_member_advanced extends ModeleNumRefMembers
* Return next value * Return next value
* *
* @param Societe $objsoc Object third party * @param Societe $objsoc Object third party
* @param Member $object Object we need next value for * @param Adherent $object Object we need next value for
* @return string Value if OK, 0 if KO * @return string Value if OK, 0 if KO
*/ */
public function getNextValue($objsoc, $object) public function getNextValue($objsoc, $object)

2
htdocs/core/modules/member/mod_member_simple.php
View File

@ -120,7 +120,7 @@ class mod_member_simple extends ModeleNumRefMembers
* Return next value * Return next value
* *
* @param Societe $objsoc Object third party * @param Societe $objsoc Object third party
* @param Member $object Object we need next value for * @param Adherent $object Object we need next value for
* @return string Value if OK, 0 if KO * @return string Value if OK, 0 if KO
*/ */
public function getNextValue($objsoc, $object) public function getNextValue($objsoc, $object)

2
htdocs/core/modules/modFacture.class.php
View File

@ -239,7 +239,7 @@ class modFacture extends DolibarrModules
$this->import_fields_array[$r] = array( $this->import_fields_array[$r] = array(
'f.ref' => 'InvoiceRef*', 'f.ref' => 'InvoiceRef*',
'f.ref_ext' => 'ExternalRef', 'f.ref_ext' => 'ExternalRef',
'f.ref_client' => 'CustomerRef', 'f.ref_client' => 'RefCustomer',
'f.type' => 'Type*', 'f.type' => 'Type*',
'f.fk_soc' => 'Customer*', 'f.fk_soc' => 'Customer*',
'f.datec' => 'InvoiceDateCreation', 'f.datec' => 'InvoiceDateCreation',

7
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -386,6 +386,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
} }
} }
} }
// Extrafields in note
$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
if (!empty($extranote)) {
$notetoshow = dol_concatdesc($notetoshow, $extranote);
}
if ($notetoshow) { if ($notetoshow) {
$tab_top -= 2; $tab_top -= 2;

4
htdocs/expensereport/class/expensereport_ik.class.php
View File

@ -197,9 +197,9 @@ class ExpenseReportIk extends CommonObject
$default_range = (int) $userauthor->default_range; // if not defined, then 0 $default_range = (int) $userauthor->default_range; // if not defined, then 0
$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat); $ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
// prevent out of range -1 indice // prevent out of range -1 indice
$indice = $default_range > 0 ? $default_range - 1 : 0; $indice = $default_range - 1;
// substract 1 because array start from 0 // substract 1 because array start from 0
if (empty($ranges) || !isset($ranges[$indice])) { if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
return false; return false;
} else { } else {
return $ranges[$indice]; return $ranges[$indice];

2
htdocs/langs/fr_FR/boxes.lang
View File

@ -52,7 +52,7 @@ BoxTitleOldestActionsToDo=Événements %s les plus anciens à faire, non termin
BoxTitleLastContracts=Les %s derniers contrats modifiés BoxTitleLastContracts=Les %s derniers contrats modifiés
BoxTitleLastModifiedDonations=Les %s derniers dons modifiés BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
BoxTitleLatestModifiedBoms=Les %s derières BOMS modifiées BoxTitleLatestModifiedBoms=Les %s dernières BOMS modifiées
BoxTitleLatestModifiedMos=Les %s derniers ordres de fabrication modifiés BoxTitleLatestModifiedMos=Les %s derniers ordres de fabrication modifiés
BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
BoxGlobalActivity=Activité globale (factures, propositions, commandes) BoxGlobalActivity=Activité globale (factures, propositions, commandes)