Merge branch 'develop' into membertype_update_single_array_option_element

This commit is contained in:
Jon Bendtsen 2024-04-04 17:39:02 +02:00 committed by GitHub
commit 20e620d968
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
211 changed files with 543 additions and 950 deletions

View file

@ -1,204 +1,5 @@
# File with duplicate translation keys that are ignored for
# reporting duplicates.
# FYI: Headers generated on https://manytools.org/hacker-tools/ascii-banner/ - DOS Rebel or ANSI Shadow
# Can also use 'figlet' tool (installable with `apt-get install figlet`)
#
# ██████████
# ░░███░░░░░█
# ░███ █ ░ █████ █████ ████████ ██████ ████████ █████ ██████ █████
# ░██████ ░░███ ░░███ ░░███░░███ ███░░███░░███░░███ ███░░ ███░░███ ███░░
# ░███░░█ ░░░█████░ ░███ ░███░███████ ░███ ░███ ░░█████ ░███████ ░░█████
# ░███ ░ █ ███░░░███ ░███ ░███░███░░░ ░███ ░███ ░░░░███░███░░░ ░░░░███
# ██████████ █████ █████ ░███████ ░░██████ ████ █████ ██████ ░░██████ ██████
# ░░░░░░░░░░ ░░░░░ ░░░░░ ░███░░░ ░░░░░░ ░░░░ ░░░░░ ░░░░░░ ░░░░░░ ░░░░░░
# ░███
# █████
# ░░░░░
# Expenses and trips overlap quite a bit, which is by design
#
AUTHOR
AUTHORPAIEMENT
AddTrip
AllExpenseReport
AllExpenseReports
AnyOtherInThisListCanValidate
AttachTheNewLineToTheDocument
AucuneLigne
BrouillonnerTrip
CANCEL_USER
CarCategory
ClassifyRefunded
CompanyVisited
ConfirmBrouillonnerTrip
ConfirmCancelTrip
ConfirmCloneExpenseReport
ConfirmDeleteTrip
ConfirmPaidTrip
ConfirmRefuseTrip
ConfirmSaveTrip
ConfirmValideTrip
DATE_CANCEL
DATE_PAIEMENT
DATE_REFUS
DATE_SAVE
DefaultCategoryCar
DefaultRangeNumber
DeleteTrip
EX_BRE
EX_CAM
EX_CAM_VP
EX_CAR
EX_CUR
EX_DOC
EX_EMM
EX_FUE
EX_FUE_VP
EX_GUM
EX_HOT
EX_IND
EX_KME
EX_OTR
EX_PAR
EX_PAR_VP
EX_POS
EX_SUM
EX_SUO
EX_TAX
EX_TOL
EX_TOL_VP
ErrorBadValueForParameter
ErrorDoubleDeclaration
ErrorRecordNotFound
Error_EXPENSEREPORT_ADDON_NotDefined
ExpenseRangeOffset
ExpenseReportApplyTo
ExpenseReportApproved
ExpenseReportApprovedMessage
ExpenseReportCanceled
ExpenseReportCanceledMessage
ExpenseReportConstraintViolationError
ExpenseReportConstraintViolationWarning
ExpenseReportDateEnd
ExpenseReportDateStart
ExpenseReportDomain
ExpenseReportIkDesc
ExpenseReportLimitAmount
ExpenseReportLimitOn
ExpenseReportLine
ExpenseReportPaid
ExpenseReportPaidMessage
ExpenseReportPayment
ExpenseReportRef
ExpenseReportRefused
ExpenseReportRefusedMessage
ExpenseReportRestrictive
ExpenseReportRuleErrorOnSave
ExpenseReportRuleSave
ExpenseReportRulesDesc
ExpenseReportWaitingForApproval
ExpenseReportWaitingForApprovalMessage
ExpenseReportWaitingForReApproval
ExpenseReportWaitingForReApprovalMessage
ExpenseReportsIk
ExpenseReportsRules
ExpenseReportsToApprove
ExpenseReportsToPay
ExpensesArea
FeesKilometersOrAmout
LastExpenseReports
ListOfFees
ListOfTrips
ListToApprove
ListTripsAndExpenses
MOTIF_CANCEL
MOTIF_REFUS
ModePaiement
NOT_AUTHOR
NewTrip
NoTripsToExportCSV
OnExpense
PDFStandardExpenseReports
PaidTrip
REFUSEUR
RangeIk
RangeNum
SaveTrip
ShowExpenseReport
ShowTrip
TF_BUS
TF_CAR
TF_ESSENCE
TF_HOTEL
TF_LUNCH
TF_METRO
TF_OTHER
TF_PEAGE
TF_TAXI
TF_TRAIN
TF_TRIP
TripCard
TripId
TripNDF
TripSociete
Trips
TripsAndExpenses
TripsAndExpensesStatistics
TypeFees
UploadANewFileNow
VALIDATOR
VALIDOR
ValidateAndSubmit
ValidatedWaitingApproval
ValideTrip
byEX_DAY
byEX_EXP
byEX_MON
byEX_YEA
expenseReportCatDisabled
expenseReportCoef
expenseReportCoefUndefined
expenseReportOffset
expenseReportPrintExample
expenseReportRangeDisabled
expenseReportRangeFromTo
expenseReportRangeMoreThan
expenseReportTotalForFive
nolimitbyEX_DAY
nolimitbyEX_EXP
nolimitbyEX_MON
nolimitbyEX_YEA
#
# █████████ █████ ███
# ███░░░░░███ ░░███ ░░░
# ░███ ░░░ ███████ ████████ ████ ████████ ██████
# ░░█████████ ░░░███░ ░░███░░███░░███ ░░███░░███ ███░░███
# ░░░░░░░░███ ░███ ░███ ░░░ ░███ ░███ ░███░███████
# ███ ░███ ░███ ███ ░███ ░███ ░███ ░███░███░░░
# ░░█████████ ░░█████ █████ █████ ░███████ ░░██████
# ░░░░░░░░░ ░░░░░ ░░░░░ ░░░░░ ░███░░░ ░░░░░░
# ░███
# █████
# ░░░░░
# Stripe is similar to Paybox and has some keys in common
#
AccountParameter
CSSUrlForPaymentForm
Continue
Creditor
FollowingUrlAreAvailableToMakePayments
InformationToFindParameters
PaymentCode
PaymentForm
ThisIsInformationOnPayment
ThisScreenAllowsYouToPay
ToComplete
UsageParameter
WelcomeOnPaymentPage
YourEMail
#############################################################
#############################################################
AccountancyCode
AffectedTo

View file

@ -1020,6 +1020,8 @@ ErrorFeatureNeedJavascript
ErrorFicheinterCompanyDoesNotExist
ErrorFieldMustHaveXChar
ErrorFileAlreadyExists
ErrorInAddAttachmentsImageBaseIsSrcData
ErrorInAddAttachmentsImageBaseOnMedia
ErrorInvalidSubtype
ErrorInvoiceLoadThirdParty
ErrorInvoiceLoadThirdPartyKey
@ -3254,7 +3256,10 @@ TypeContact_facture_external_BILLING
TypeContact_facture_external_SERVICE
TypeContact_facture_external_SHIPPING
TypeContact_facture_internal_SALESREPFOLL
TypeContact_fichinter_external_BILLING
TypeContact_fichinter_external_CUSTOMER
TypeContact_fichinter_internal_INTERREPFOLL
TypeContact_fichinter_internal_INTERVENING
TypeContact_invoice_supplier_external_BILLING
TypeContact_invoice_supplier_external_SERVICE
TypeContact_invoice_supplier_external_SHIPPING

View file

@ -436,9 +436,7 @@ FileDidAlreadyExist
FileIsNotCorrect
Filename
FilteredFrom
FiscalYear
Flashy
ForceEmailFrom
ForcedByGlobalSetup
Form for public lead registration has not been enabled
Free
@ -1143,8 +1141,6 @@ XSubsriptionError
centimes
email
id
leftmenu
message
multicurrency_buyPriceInCurrency
multicurrency_modifyRateApplication
ref

View file

@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
// Load translation files required by the page
$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "expensereports", "loan"));
$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "trips", "loan"));
// Security check
if (!$user->hasRight('accounting', 'chartofaccount')) {

View file

@ -1322,7 +1322,7 @@ while ($i < min($num, $limit)) {
}
if (!empty($arrayfields['t.import_key']['checked'])) {
print '<td class="tdoverflowmax100">'.$obj->import_key."</td>\n";
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->import_key).'">'.dol_escape_htmltag($obj->import_key)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}

View file

@ -1295,7 +1295,7 @@ while ($i < min($num, $limit)) {
}
if (!empty($arrayfields['t.import_key']['checked'])) {
print '<td class="tdoverflowmax100">'.dol_escape_htmltag($line->import_key)."</td>\n";
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($line->import_key).'">'.dol_escape_htmltag($line->import_key)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}

View file

@ -123,6 +123,13 @@ if ($max_time && $max_time < $max_execution_time_for_deploy) {
@ini_set("max_execution_time", $max_execution_time_for_deploy); // This work only if safe mode is off. also web servers has timeout of 300
}
$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
$allowonlineinstall = true;
$allowfromweb = 1;
if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
$allowonlineinstall = false;
}
/*
* Actions
@ -143,7 +150,7 @@ if (GETPOST('buttonreset', 'alpha')) {
$search_version = '';
}
if ($action == 'install') {
if ($action == 'install' && $allowonlineinstall) {
$error = 0;
// $original_file should match format module_modulename-x.y[.z].zip
@ -264,6 +271,8 @@ if ($action == 'install') {
if (!$error) {
setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');
}
} elseif ($action == 'install' && !$allowonlineinstall) {
httponly_accessforbidden("You try to bypass the protection to disallow deployment of an external module. Hack attempt ?");
}
if ($action == 'set' && $user->admin) {
@ -1191,13 +1200,6 @@ if ($mode == 'marketplace') {
if ($mode == 'deploy') {
print dol_get_fiche_head($head, $mode, '', -1);
$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
$allowonlineinstall = true;
$allowfromweb = 1;
if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
$allowonlineinstall = false;
}
$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank" rel="noopener noreferrer">'.$urldolibarrmodules.'</a>';
$message = '';
if ($allowonlineinstall) {

View file

@ -710,7 +710,7 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
* Last modified proposals
*/
if (isModEnabled('proposal')) {
if (isModEnabled('propal')) {
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, date_cloture as datec, c.tms as datem,";
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";

View file

@ -272,7 +272,7 @@ class Proposals extends DolibarrApi
throw new RestException(500, "Error creating order", array_merge(array($this->propal->error), $this->propal->errors));
}
return $this->propal->id;
return ((int) $this->propal->id);
}
/**

View file

@ -291,7 +291,7 @@ class Orders extends DolibarrApi
throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
}
return $this->commande->id;
return ((int) $this->commande->id);
}
/**

View file

@ -321,7 +321,7 @@ class Invoices extends DolibarrApi
if ($this->invoice->create(DolibarrApiAccess::$user, 0, (empty($request_data["date_lim_reglement"]) ? 0 : $request_data["date_lim_reglement"])) < 0) {
throw new RestException(500, "Error creating invoice", array_merge(array($this->invoice->error), $this->invoice->errors));
}
return $this->invoice->id;
return ((int) $this->invoice->id);
}
/**

View file

@ -2057,7 +2057,7 @@ if ($num > 0) {
if (strpos($obj->ref, 'PROV') !== false) {
//If is a draft invoice, load var to be able to add products
$place = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
print 'parent.place=\''.$place.'\'';
print 'parent.place=\''.dol_escape_js($place).'\'';
}
print '});"';
}

View file

@ -4,6 +4,7 @@
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2017 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2024 Benjamin B. <b.crozon@trebisol.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -264,8 +265,8 @@ $sql .= " ORDER BY dm";
$minyearmonth = $maxyearmonth = 0;
$cum = array();
$cum_ht = array();
$cumulative = array();
$cumulative_ht = array();
$total_ht = array();
$total = array();
@ -275,8 +276,8 @@ if ($result) {
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object($result);
$cum_ht[$obj->dm] = empty($obj->amount) ? 0 : $obj->amount;
$cum[$obj->dm] = empty($obj->amount_ttc) ? 0 : $obj->amount_ttc;
$cumulative_ht[$obj->dm] = empty($obj->amount) ? 0 : $obj->amount;
$cumulative[$obj->dm] = empty($obj->amount_ttc) ? 0 : $obj->amount_ttc;
if ($obj->amount_ttc) {
$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
$maxyearmonth = max($maxyearmonth, $obj->dm);
@ -308,10 +309,10 @@ if ($modecompta == 'RECETTES-DEPENSES') {
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object($result);
if (empty($cum[$obj->dm])) {
$cum[$obj->dm] = $obj->amount_ttc;
if (empty($cumulative[$obj->dm])) {
$cumulative[$obj->dm] = $obj->amount_ttc;
} else {
$cum[$obj->dm] += $obj->amount_ttc;
$cumulative[$obj->dm] += $obj->amount_ttc;
}
if ($obj->amount_ttc) {
$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
@ -420,9 +421,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Value turnover of month w/o VAT
print '<td class="right">';
if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
if (!empty($cum_ht[$case])) {
if (!empty($cumulative_ht[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cumulative_ht[$case], 1).'</a>';
} else {
if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
print '0';
@ -437,12 +438,12 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Value turnover of month
print '<td class="right">';
if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
if (!empty($cum[$case])) {
if (!empty($cumulative[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
if ($modecompta != 'BOOKKEEPING') {
print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
}
print price($cum[$case], 1);
print price($cumulative[$case], 1);
if ($modecompta != 'BOOKKEEPING') {
print '</a>';
}
@ -461,22 +462,22 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
//var_dump($annee.' '.$year_end.' '.$mois.' '.$month_end);
if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
if ($annee_decalage > $minyear && $case <= $casenow) {
if (!empty($cum[$caseprev]) && !empty($cum[$case])) {
$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
if (!empty($cumulative_ht[$caseprev]) && !empty($cumulative_ht[$case])) {
$percent = (round(($cumulative_ht[$case] - $cumulative_ht[$caseprev]) / $cumulative_ht[$caseprev], 4) * 100);
//print "X $cumulative_ht[$case] - $cumulative_ht[$caseprev] - $cumulative_ht[$caseprev] - $percent X";
print($percent >= 0 ? "+$percent" : "$percent").'%';
}
if (!empty($cum[$caseprev]) && empty($cum[$case])) {
if (!empty($cumulative_ht[$caseprev]) && empty($cumulative_ht[$case])) {
print '-100%';
}
if (empty($cum[$caseprev]) && !empty($cum[$case])) {
if (empty($cumulative_ht[$caseprev]) && !empty($cumulative_ht[$case])) {
//print '<td class="right">+Inf%</td>';
print '-';
}
if (isset($cum[$caseprev]) && empty($cum[$caseprev]) && empty($cum[$case])) {
if (isset($cumulative_ht[$caseprev]) && empty($cumulative_ht[$caseprev]) && empty($cumulative_ht[$case])) {
print '+0%';
}
if (!isset($cum[$caseprev]) && empty($cum[$case])) {
if (!isset($cumulative_ht[$caseprev]) && empty($cumulative_ht[$case])) {
print '-';
}
} else {
@ -496,14 +497,14 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
if (empty($total_ht[$annee])) {
$total_ht[$annee] = (empty($cum_ht[$case]) ? 0 : $cum_ht[$case]);
$total_ht[$annee] = (empty($cumulative_ht[$case]) ? 0 : $cumulative_ht[$case]);
} else {
$total_ht[$annee] += (empty($cum_ht[$case]) ? 0 : $cum_ht[$case]);
$total_ht[$annee] += (empty($cumulative_ht[$case]) ? 0 : $cumulative_ht[$case]);
}
if (empty($total[$annee])) {
$total[$annee] = empty($cum[$case]) ? 0 : $cum[$case];
$total[$annee] = empty($cumulative_ht[$case]) ? 0 : $cumulative_ht[$case];
} else {
$total[$annee] += empty($cum[$case]) ? 0 : $cum[$case];
$total[$annee] += empty($cumulative_ht[$case]) ? 0 : $cumulative_ht[$case];
}
}
}
@ -526,10 +527,10 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Valeur CA du mois
print '<td class="right">';
if ($cum[$case])
if ($cumulative[$case])
{
$now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre.
print '<a href="casoc.php?year='.$annee.'&month='.$mois.'">'.price($cum[$case],1).'</a>';
print '<a href="casoc.php?year='.$annee.'&month='.$mois.'">'.price($cumulative[$case],1).'</a>';
}
else
{
@ -540,22 +541,22 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Pourcentage du mois
if ($annee > $minyear && $case <= $casenow) {
if ($cum[$caseprev] && $cum[$case])
if ($cumulative[$caseprev] && $cumulative[$case])
{
$percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100);
//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
$percent=(round(($cumulative[$case]-$cumulative[$caseprev])/$cumulative[$caseprev],4)*100);
//print "X $cumulative[$case] - $cumulative[$caseprev] - $cumulative[$caseprev] - $percent X";
print '<td class="right">'.($percent>=0?"+$percent":"$percent").'%</td>';
}
if ($cum[$caseprev] && ! $cum[$case])
if ($cumulative[$caseprev] && ! $cumulative[$case])
{
print '<td class="right">-100%</td>';
}
if (! $cum[$caseprev] && $cum[$case])
if (! $cumulative[$caseprev] && $cumulative[$case])
{
print '<td class="right">+Inf%</td>';
}
if (! $cum[$caseprev] && ! $cum[$case])
if (! $cumulative[$caseprev] && ! $cumulative[$case])
{
print '<td class="right">+0%</td>';
}
@ -568,7 +569,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
print '</td>';
}
$total[$annee]+=$cum[$case];
$total[$annee]+=$cumulative[$case];
if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
}
@ -601,24 +602,24 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
// Pourcentage total
if ($annee > $minyear && $annee <= max($nowyear, $maxyear)) {
if (!empty($total[$annee - 1]) && !empty($total[$annee])) {
$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
if (!empty($total_ht[$annee - 1]) && !empty($total_ht[$annee])) {
$percent = (round(($total_ht[$annee] - $total_ht[$annee - 1]) / $total_ht[$annee - 1], 4) * 100);
print '<td class="nowrap borderrightlight right">';
print($percent >= 0 ? "+$percent" : "$percent").'%';
print '</td>';
}
if (!empty($total[$annee - 1]) && empty($total[$annee])) {
if (!empty($total_ht[$annee - 1]) && empty($total_ht[$annee])) {
print '<td class="borderrightlight right">-100%</td>';
}
if (empty($total[$annee - 1]) && !empty($total[$annee])) {
if (empty($total_ht[$annee - 1]) && !empty($total_ht[$annee])) {
print '<td class="borderrightlight right">+'.$langs->trans('Inf').'%</td>';
}
if (empty($total[$annee - 1]) && empty($total[$annee])) {
if (empty($total_ht[$annee - 1]) && empty($total_ht[$annee])) {
print '<td class="borderrightlight right">+0%</td>';
}
} else {
print '<td class="borderrightlight right">';
if (!empty($total[$annee]) || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) {
if (!empty($total_ht[$annee]) || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) {
print '-';
} else {
print '&nbsp;';

View file

@ -251,8 +251,8 @@ $sql .= " ORDER BY dm";
$minyearmonth = $maxyearmonth = 0;
$cum = array();
$cum_ht = array();
$cumulative = array();
$cumulative_ht = array();
$total_ht = array();
$total = array();
@ -262,8 +262,8 @@ if ($result) {
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object($result);
$cum_ht[$obj->dm] = empty($obj->amount) ? 0 : $obj->amount;
$cum[$obj->dm] = empty($obj->amount_ttc) ? 0 : $obj->amount_ttc;
$cumulative_ht[$obj->dm] = empty($obj->amount) ? 0 : $obj->amount;
$cumulative[$obj->dm] = empty($obj->amount_ttc) ? 0 : $obj->amount_ttc;
if ($obj->amount_ttc) {
$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
$maxyearmonth = max($maxyearmonth, $obj->dm);
@ -365,9 +365,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
if ($modecompta == 'CREANCES-DETTES') {
// Value turnover of month w/o VAT
print '<td class="right">';
if (!empty($cum_ht[$case])) {
if (!empty($cumulative_ht[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cumulative_ht[$case], 1).'</a>';
} else {
if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
print '0';
@ -380,12 +380,12 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Value turnover of month
print '<td class="right">';
if (!empty($cum[$case])) {
if (!empty($cumulative[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
if ($modecompta != 'BOOKKEEPING') {
print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
}
print price($cum[$case], 1);
print price($cumulative[$case], 1);
if ($modecompta != 'BOOKKEEPING') {
print '</a>';
}
@ -400,22 +400,22 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Percentage of month
if ($annee_decalage > $minyear && $case <= $casenow) {
if (!empty($cum[$caseprev]) && !empty($cum[$case])) {
$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
if (!empty($cumulative[$caseprev]) && !empty($cumulative[$case])) {
$percent = (round(($cumulative[$case] - $cumulative[$caseprev]) / $cumulative[$caseprev], 4) * 100);
//print "X $cumulative[$case] - $cumulative[$caseprev] - $cumulative[$caseprev] - $percent X";
print '<td class="borderrightlight right">'.($percent >= 0 ? "+$percent" : "$percent").'%</td>';
}
if (!empty($cum[$caseprev]) && empty($cum[$case])) {
if (!empty($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '<td class="borderrightlight right">-100%</td>';
}
if (empty($cum[$caseprev]) && !empty($cum[$case])) {
if (empty($cumulative[$caseprev]) && !empty($cumulative[$case])) {
//print '<td class="right">+Inf%</td>';
print '<td class="borderrightlight right">-</td>';
}
if (isset($cum[$caseprev]) && empty($cum[$caseprev]) && empty($cum[$case])) {
if (isset($cumulative[$caseprev]) && empty($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '<td class="borderrightlight right">+0%</td>';
}
if (!isset($cum[$caseprev]) && empty($cum[$case])) {
if (!isset($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '<td class="borderrightlight right">-</td>';
}
} else {
@ -434,14 +434,14 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
}
if (empty($total_ht[$annee])) {
$total_ht[$annee] = ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
$total_ht[$annee] = ((!empty($cumulative_ht[$case])) ? $cumulative_ht[$case] : 0);
} else {
$total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
$total_ht[$annee] += ((!empty($cumulative_ht[$case])) ? $cumulative_ht[$case] : 0);
}
if (empty($total[$annee])) {
$total[$annee] = (empty($cum[$case]) ? 0 : $cum[$case]);
$total[$annee] = (empty($cumulative[$case]) ? 0 : $cumulative[$case]);
} else {
$total[$annee] += (empty($cum[$case]) ? 0 : $cum[$case]);
$total[$annee] += (empty($cumulative[$case]) ? 0 : $cumulative[$case]);
}
}

View file

@ -2,11 +2,11 @@
/**
* Copyright (C) Dan Potter
* Copyright (C) Eric Seigne
* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -297,7 +297,7 @@ class CMailFile
$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
if ($findimg < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
$this->error = 'ErrorInAddAttachmentsImageBaseOnMedia';
return;
}
}
@ -308,7 +308,7 @@ class CMailFile
$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
if ($resultImageData < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
$this->error = 'ErrorInAddAttachmentsImageBaseIsSrcData';
return;
}
$findimg += $resultImageData;

View file

@ -1369,7 +1369,7 @@ abstract class CommonDocGenerator
$extrafieldOutputContent = '';
if (isset($object->array_options[$extrafieldOptionsKey])) {
$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element, $outputlangs);
}
// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...

View file

@ -4,7 +4,6 @@
* Copyright (C) 2004-2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,7 +19,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/doldeprecationhandler.class.php';
/**
* \file htdocs/core/class/conf.class.php
@ -31,17 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doldeprecationhandler.class.php';
/**
* Class to stock current configuration
*
*/
class Conf extends stdClass
{
use DolDeprecationHandler;
/**
* When true, indicates to the DeprecationHandler that this
* class supports dynamic properties.
*/
protected $enableDynamicProperties = true;
/**
* @var Object Associative array with properties found in conf file
*/
@ -95,6 +85,7 @@ class Conf extends stdClass
//! Used to store current menu handler
public $standard_menu;
/**
* @var array<string,string> List of activated modules
*/
@ -163,173 +154,53 @@ class Conf extends stdClass
public $fournisseur;
/**
* @var stdClass
* @var stdClass Product
*/
public $product;
/**
* @var stdClass
* @deprecated Use $product
* @see $product
*/
private $produit;
/**
* @var stdClass
* @deprecated Use product
*/
public $produit;
public $service;
/**
* @var stdClass
* @deprecated Use $contract
* @see $contract
*/
private $contrat;
/**
* @var stdClass
* @deprecated Use contract
*/
public $contrat;
public $contract;
/**
* @var stdClass
*/
public $actions;
/**
* @var stdClass
*/
public $agenda;
/**
* @var stdClass
* @deprecated Use $order
* @see $order
*/
private $commande;
/**
* @var stdClass
*/
public $propal;
/**
* @var stdClass
* @deprecated Use order
*/
public $commande;
public $order;
/**
* @var stdClass
* @deprecated Use $invoice
* @see $invoice
*/
private $facture;
/**
* @var stdClass
* @deprecated Use invoice
*/
public $facture;
public $invoice;
/**
* @var stdClass
*/
public $user;
/**
* @var stdClass
* @deprecated Use $member
* @see $member
*/
private $adherent;
/**
* @var stdClass
* @deprecated Use member
*/
public $adherent;
public $member;
/**
* @var stdClass
*/
public $bank;
/**
* @var stdClass
*/
public $notification;
/**
* @var stdClass
*/
public $expensereport;
/**
* @var stdClass
*/
public $productbatch;
/**
* @var stdClass
* @deprecated Use $project
* @see $project
*/
private $projet;
/**
* @var stdClass
* @deprecated Use project
*/
public $projet;
public $project;
/**
* @var stdClass
*/
public $supplier_proposal;
/**
* @var stdClass
*/
public $supplier_order;
/**
* @var stdClass
*/
public $supplier_invoice;
/**
* @var stdClass
*/
public $category;
/**
* @var stdClass
* @deprecated Use $category
* @see $category
*/
private $categorie;
/**
* @var stdClass
* @deprecated Use $supplier_proposal
* @see $supplier_proposal
*/
private $supplierproposal;
/**
* @var stdClass
* @deprecated Use $delivery_note
* @see $delivery_note
*/
private $expedition;
/**
* @var stdClass
* @deprecated Use $bank
* @see $bank
*/
private $banque;
/**
* Constructor
@ -381,45 +252,20 @@ class Conf extends stdClass
$this->fournisseur = new stdClass();
$this->product = new stdClass();
$this->service = new stdClass();
$this->contract = new stdClass();
$this->contrat = new stdClass();
$this->actions = new stdClass();
$this->agenda = new stdClass();
$this->order = new stdClass();
$this->commande = new stdClass();
$this->propal = new stdClass();
$this->invoice = new stdClass();
$this->facture = new stdClass();
$this->user = new stdClass();
$this->member = new stdClass();
$this->adherent = new stdClass();
$this->bank = new stdClass();
$this->notification = new stdClass();
$this->expensereport = new stdClass();
$this->productbatch = new stdClass();
}
/**
* Provide list of deprecated properties and replacements
*
* @return array<string,string>
*/
protected function deprecatedProperties()
{
return MODULE_MAPPING
+ array(
// Previously detected module names, already in mapping
//'adherent' => 'member',
//'banque' => 'bank',
//'categorie' => 'category',
//'commande' => 'order',
//'contrat' => 'contract',
//'expedition' => 'delivery_note',
//'facture' => 'invoice',
//'projet' => 'project',
// Other, not deprecated module names
'produit' => 'product',
'supplierproposal' => 'supplier_proposal',
);
}
/**
* Load setup values into conf object (read llx_const) for a specified entity
@ -474,14 +320,14 @@ class Conf extends stdClass
$this->fournisseur = new stdClass();
$this->product = new stdClass();
$this->service = new stdClass();
$this->contract = new stdClass();
$this->contrat = new stdClass();
$this->actions = new stdClass();
$this->agenda = new stdClass();
$this->order = new stdClass();
$this->commande = new stdClass();
$this->propal = new stdClass();
$this->invoice = new stdClass();
$this->facture = new stdClass();
$this->user = new stdClass();
$this->member = new stdClass();
$this->adherent = new stdClass();
$this->bank = new stdClass();
$this->notification = new stdClass();
$this->expensereport = new stdClass();
@ -582,6 +428,12 @@ class Conf extends stdClass
} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
// If this is a module constant (must be at end)
$modulename = strtolower($reg[1]);
if ($modulename == 'propale') {
$modulename = 'propal';
}
if ($modulename == 'supplierproposal') {
$modulename = 'supplier_proposal';
}
$this->modules[$modulename] = $modulename; // Add this module in list of enabled modules
// deprecated in php 8.2
@ -592,6 +444,7 @@ class Conf extends stdClass
$this->$modulename->enabled = true; // TODO Remove this
// Duplicate entry with the new name
/*
$mapping = $this->deprecatedProperties();
if (array_key_exists($modulename, $mapping)) {
$newmodulename = $mapping[$modulename];
@ -602,6 +455,7 @@ class Conf extends stdClass
}
$this->$newmodulename->enabled = true; // TODO Remove this
}
*/
}
}
}
@ -821,12 +675,12 @@ class Conf extends stdClass
$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");
$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");
// Module contract
$this->contract->multidir_output = array($this->entity => $rootfordata."/contract");
$this->contract->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
// Module contrat
$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
$this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
// For backward compatibility
$this->contract->dir_output = $rootfordata."/contract";
$this->contract->dir_temp = $rootfortemp."/contract/temp";
$this->contrat->dir_output = $rootfordata."/contract";
$this->contrat->dir_temp = $rootfortemp."/contract/temp";
// Module bank
$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");
@ -1109,23 +963,23 @@ class Conf extends stdClass
// Delay before warnings
// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
if (isset($this->agenda)) {
$this->member->subscription = new stdClass();
$this->member->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
$this->adherent->subscription = new stdClass();
$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
}
if (isset($this->agenda)) {
$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? (int) $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
}
if (isset($this->project)) {
$this->project->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);
$this->project->task = new StdClass();
$this->project->task->warning_delay = (getDolGlobalInt('MAIN_DELAY_TASKS_TODO', 7) * 86400);
if (isset($this->projet)) {
$this->projet->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);
$this->projet->task = new StdClass();
$this->projet->task->warning_delay = (getDolGlobalInt('MAIN_DELAY_TASKS_TODO', 7) * 86400);
}
if (isset($this->order)) {
$this->order->client = new stdClass();
$this->order->fournisseur = new stdClass();
$this->order->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
$this->order->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
if (isset($this->commande)) {
$this->commande->client = new stdClass();
$this->commande->fournisseur = new stdClass();
$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
}
if (isset($this->propal)) {
$this->propal->cloture = new stdClass();
@ -1133,20 +987,20 @@ class Conf extends stdClass
$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
}
if (isset($this->invoice)) {
$this->invoice->client = new stdClass();
$this->invoice->fournisseur = new stdClass();
$this->invoice->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? (int) $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
$this->invoice->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? (int) $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
if (isset($this->facture)) {
$this->facture->client = new stdClass();
$this->facture->fournisseur = new stdClass();
$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? (int) $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? (int) $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
}
if (isset($this->contract)) {
$this->contract->services = new stdClass();
$this->contract->services->inactifs = new stdClass();
$this->contract->services->expires = new stdClass();
$this->contract->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? (int) $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
$this->contract->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? (int) $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
if (isset($this->contrat)) {
$this->contrat->services = new stdClass();
$this->contrat->services->inactifs = new stdClass();
$this->contrat->services->expires = new stdClass();
$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? (int) $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? (int) $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
}
if (isset($this->order)) {
if (isset($this->commande)) {
$this->bank->rappro = new stdClass();
$this->bank->cheque = new stdClass();
$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? (int) $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
@ -1248,6 +1102,37 @@ class Conf extends stdClass
unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
}
// Simple deprecation management. We do not use DolDeprecationHandlet for $conf.
// product is new use
if (isset($this->product)) {
// For backward compatibility
$this->produit = $this->product;
}
// invoice is new use, facture is old use still initialised
if (isset($this->facture)) {
$this->invoice = $this->facture;
}
// order is new use, commande is old use still initialised
if (isset($this->commande)) {
$this->order = $this->commande;
}
// contract is new use, contrat is old use still initialised
if (isset($this->contrat)) {
$this->contract = $this->contrat;
}
// category is new use, categorie is old use still initialised
if (isset($this->categorie)) {
$this->category = $this->categorie;
}
// project is new use, projet is old use still initialised
if (isset($this->projet) && !isset($this->project)) {
$this->project = $this->projet;
}
// member is new use, adherent is old use still initialised
if (isset($this->adherent) && !isset($this->member)) {
$this->member = $this->adherent;
}
// Object $mc
if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {

View file

@ -1629,12 +1629,17 @@ class ExtraFields
* @param string $value Value to show
* @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering)
* @param string $extrafieldsobjectkey Required (for example $object->table_element).
* @param Translate $outputlangs Output language
* @return string Formatted value
*/
public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null)
{
global $conf, $langs;
if (is_null($outputlangs) || !is_object($outputlangs)) {
$outputlangs = $langs;
}
if (empty($extrafieldsobjectkey)) {
dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_ERR);
return 'BadValueForParamExtraFieldsObjectKey';
@ -1683,7 +1688,7 @@ class ExtraFields
//$value=price($value);
$sizeparts = explode(",", $size);
$number_decimals = array_key_exists(1, $sizeparts) ? $sizeparts[1] : 0;
$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
$value = price($value, 0, $outputlangs, 0, 0, $number_decimals, '');
}
} elseif ($type == 'boolean') {
$checked = '';
@ -1708,7 +1713,7 @@ class ExtraFields
} elseif ($type == 'price') {
//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
if ($value || $value == '0') {
$value = price($value, 0, $langs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$langs->getCurrencySymbol($conf->currency);
$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
}
} elseif ($type == 'pricecy') {
$currency = $conf->currency;
@ -1719,7 +1724,7 @@ class ExtraFields
$value = $pricetmp[0];
}
if ($value || $value == '0') {
$value = price($value, 0, $langs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
}
} elseif ($type == 'select') {
$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
@ -1727,7 +1732,7 @@ class ExtraFields
$valstr = substr($valstr, 0, $pos);
}
if ($langfile && $valstr) {
$value = $langs->trans($valstr);
$value = $outputlangs->trans($valstr);
} else {
$value = $valstr;
}
@ -1786,12 +1791,12 @@ class ExtraFields
foreach ($fields_label as $field_toshow) {
$translabel = '';
if (!empty($obj->$field_toshow)) {
$translabel = $langs->trans($obj->$field_toshow);
$translabel = $outputlangs->trans($obj->$field_toshow);
if ($translabel != $obj->$field_toshow) {
$value .= dol_trunc($translabel, 24).' ';
$value .= dol_trunc($translabel, 24) . ' ';
} else {
$value .= $obj->$field_toshow.' ';
$value .= $obj->$field_toshow . ' ';
}
}
}
@ -1800,7 +1805,7 @@ class ExtraFields
$tmppropname = $InfoFieldList[1];
//$obj->$tmppropname = '';
if (!empty(isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
$translabel = $langs->trans($obj->$tmppropname);
$translabel = $outputlangs->trans($obj->$tmppropname);
}
if ($translabel != (isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
$value = dol_trunc($translabel, 18);
@ -1829,10 +1834,10 @@ class ExtraFields
}
} elseif ($type == 'radio') {
if (!isset($param['options'][$value])) {
$langs->load('errors');
$value = $langs->trans('ErrorNoValueForRadioType');
$outputlangs->load('errors');
$value = $outputlangs->trans('ErrorNoValueForRadioType');
} else {
$value = $langs->trans($param['options'][$value]);
$value = $outputlangs->trans($param['options'][$value]);
}
} elseif ($type == 'checkbox') {
$value_arr = explode(',', $value);
@ -1896,7 +1901,7 @@ class ExtraFields
foreach ($fields_label as $field_toshow) {
$translabel = '';
if (!empty($obj->$field_toshow)) {
$translabel = $langs->trans($obj->$field_toshow);
$translabel = $outputlangs->trans($obj->$field_toshow);
}
if ($translabel != $field_toshow) {
$label .= ' '.dol_trunc($translabel, 18);
@ -1909,7 +1914,7 @@ class ExtraFields
} else {
$translabel = '';
if (!empty($obj->{$InfoFieldList[1]})) {
$translabel = $langs->trans($obj->{$InfoFieldList[1]});
$translabel = $outputlangs->trans($obj->{$InfoFieldList[1]});
}
if ($translabel != $obj->{$InfoFieldList[1]}) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';

View file

@ -360,7 +360,7 @@ class Fiscalyear extends CommonObject
$linkclose = '';
if (empty($notooltip) && $user->hasRight('accounting', 'fiscalyear', 'write')) {
if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$label = $langs->trans("FiscalYear");
$label = $langs->trans("FiscalPeriod");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';

View file

@ -238,7 +238,7 @@ class FormAccounting extends Form
* @param int $maxlen Max length of text in combo box
* @param int $help Add or not the admin help picto
* @param int $allcountries All countries
* @return string HTML component with the select
* @return void|string HTML component with the select
*/
public function select_accounting_category($selected = 0, $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
{
@ -250,6 +250,8 @@ class FormAccounting extends Form
exit;
}
$out = '';
if (!empty($mysoc->country_id)) {
$sql = "SELECT c.rowid, c.label as type, c.range_account";
$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c";
@ -280,7 +282,7 @@ class FormAccounting extends Form
if ($num) {
$this->nbaccounts_category = $num;
$out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
$out .= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
$i = 0;
if ($useempty) {
@ -305,15 +307,15 @@ class FormAccounting extends Form
}
$out .= '</select>';
//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
$out .= ajax_combobox($htmlname, array());
} else {
$out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("AccountingCategories"));
$out .= '<span class="opacitymedium">'.$langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("AccountingCategories")).'</span>';
}
} else {
dol_print_error($this->db);
}
$out .= ajax_combobox($htmlname, array());
return $out;
}
@ -321,9 +323,9 @@ class FormAccounting extends Form
/**
* Return select filter with date of transaction
*
* @param string $htmlname Name of select field
* @param string $selectedkey Value
* @return string|int<-1,-1> HTML edit field, or -1 if error
* @param string $htmlname Name of select field
* @param string $selectedkey Value
* @return string|int<-1,-1> HTML edit field, or -1 if error
*/
public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
{

View file

@ -63,19 +63,14 @@ class FormCron extends Form
// phpcs:enable
global $langs;
$langs->load('cron@cron');
$langs->load('cron');
$out = '';
if (!empty($readonly)) {
if ($selected == 'command') {
$out = $langs->trans('CronType_command');
$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
$out .= '</SELECT>';
$out = img_picto('', 'terminal', 'class="pictofixedwidth marginrightonly"').'<span class="">'.$langs->trans('CronType_command').'</span>';
} elseif ($selected == 'method') {
$out = $langs->trans('CronType_method');
$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
$out .= '</SELECT>';
$out = img_picto('', 'code', 'class="pictofixedwidth marginrightonly"').'<span class="">'.$langs->trans('CronType_method').'</span>';
}
} else {
$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';

View file

@ -4,6 +4,7 @@
* Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -168,6 +169,9 @@ class FormProjets extends Form
if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {
$hideunselectables = true;
}
if (getDolGlobalInt('PROJECT_ALWAYS_DISCARD_CLOSED_PROJECTS_IN_SELECT')) {
$discard_closed = 1;
}
$projectsListId = false;
if (!$user->hasRight('projet', 'all', 'lire')) {

View file

@ -4717,7 +4717,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'error', 'warning',
'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',
'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'terminal', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
'conferenceorbooth', 'eventorganization',
'stamp', 'signature',

View file

@ -155,7 +155,7 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
$validpaymentmethod['paypal'] = 'valid';
}
if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) {
$langs->load("paybox");
$langs->loadLangs(array("paybox", "stripe"));
$validpaymentmethod['paybox'] = 'valid';
}
if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) {

View file

@ -27,10 +27,10 @@
*/
function showOnlineSignatureUrl($type, $ref, $obj = null)
{
global $conf, $langs;
global $langs;
// Load translation files required by the page
$langs->loadLangs(array("payment", "paybox"));
$langs->loadLangs(array("payment", "paybox", "stripe"));
$servicename = 'Online';
@ -61,7 +61,7 @@ function showOnlineSignatureUrl($type, $ref, $obj = null)
*/
function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1, $obj = null)
{
global $conf, $dolibarr_main_url_root;
global $dolibarr_main_url_root;
if (empty($obj)) {
// For compatibility with 15.0 -> 19.0

View file

@ -787,7 +787,7 @@ class pdf_standard_asset extends ModelePDFAsset
return 0;
}
} else {
$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
$this->error = $langs->transnoentities("ErrorConstantNotDefined", "ASSET_OUTPUTDIR");
return 0;
}
}

View file

@ -139,7 +139,7 @@ class pdf_espadon extends ModelePdfExpedition
}
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "other", "propal", "deliveries", "sendings", "productbatch"));
// Show Draft Watermark
if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('SHIPPING_DRAFT_WATERMARK'))) {
@ -998,12 +998,6 @@ class pdf_espadon extends ModelePdfExpedition
}
$pdf->SetDrawColor(128, 128, 128);
if (isModEnabled('barcode')) {
// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
//$pdf->Image($logo,10, 5, 0, 24);
}
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;
@ -1268,6 +1262,7 @@ class pdf_espadon extends ModelePdfExpedition
),
'content' => array(
'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
'align' => 'L',
),
);

View file

@ -908,12 +908,6 @@ class pdf_rouget extends ModelePdfExpedition
}
$pdf->SetDrawColor(128, 128, 128);
if (isModEnabled('barcode')) {
// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
//$pdf->Image($logo,10, 5, 0, 24);
}
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;

View file

@ -908,12 +908,6 @@ class pdf_squille extends ModelePdfReception
}
$pdf->SetDrawColor(128, 128, 128);
if (isModEnabled('barcode')) {
// TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
//$pdf->Image($logo,10, 5, 0, 24);
}
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;

View file

@ -1008,12 +1008,6 @@ class pdf_eagle extends ModelePDFStockTransfer
}
$pdf->SetDrawColor(128, 128, 128);
if (isModEnabled('barcode')) {
// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
//$pdf->Image($logo,10, 5, 0, 24);
}
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;

View file

@ -593,7 +593,7 @@ if (($action == "create") || ($action == "edit")) {
print "<td>".$langs->trans($object->label);
print "</td></tr>";*/
print '<tr><td class="titlefield">';
print '<tr><td class="titlefieldmiddle">';
print $langs->trans('CronType')."</td><td>";
print $formCron->select_typejob('jobtype', $object->jobtype, 1);
print "</td></tr>";
@ -631,7 +631,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr><td>';
print $langs->trans('CronNote')."</td><td>";
if (!is_null($object->note_private) && $object->note_private != '') {
print $langs->trans($object->note_private);
print '<span class="small">'.$langs->trans($object->note_private).'</small>';
}
print "</td></tr>";
@ -660,7 +660,7 @@ if (($action == "create") || ($action == "edit")) {
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent tableforfield">';
print '<tr><td class="titlefield">';
print '<tr><td class="titlefieldmiddle">';
print $langs->trans('CronEvery')."</td>";
print "<td>";
if ($object->unitfrequency == "60") {
@ -741,7 +741,7 @@ if (($action == "create") || ($action == "edit")) {
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent tableforfield">';
print '<tr><td class="titlefield">';
print '<tr><td class="titlefieldmiddle">';
print $langs->trans('CronDtLastLaunch')."</td><td>";
if (!empty($object->datelastrun)) {
print $form->textwithpicto(dol_print_date($object->datelastrun, 'dayhoursec'), $langs->trans("CurrentTimeZone"));

View file

@ -1313,11 +1313,10 @@ class Cronjob extends CommonObject
} else {
$result = call_user_func_array(array($object, $this->methodename), $params_arr);
}
$errmsg = '';
if ($result === false || (!is_bool($result) && $result != 0)) {
$langs->load("errors");
$errmsg = '';
if (!is_array($object->errors) || !in_array($object->error, $object->errors)) {
$errmsg .= $object->error;
}

View file

@ -457,9 +457,9 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
}
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">';
print '<input type="text" class="flat" name="search_label" value="'.$search_label.'">';
print '<input type="text" class="flat width75" name="search_label" value="'.$search_label.'">';
print '</td>';
print '<td class="liste_titre">&nbsp;</td>';
//print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre"><input type="text" class="width50" name="search_module_name" value="'.$search_module_name.'"></td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
@ -491,13 +491,13 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
}
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Priority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("Priority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronModule", $_SERVER["PHP_SELF"], "t.module_name", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100 ');
print_liste_field_titre("", '', '', "", $param, '', $sortfield, $sortorder, 'tdoverflowmax50 ');
print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("CronDtStart", $_SERVER["PHP_SELF"], "t.datestart", "", $param, 'align="center"', $sortfield, $sortorder);
//print_liste_field_titre("CronDtEnd", $_SERVER["PHP_SELF"], "t.dateend", "", $param, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, '', $sortfield, $sortorder, 'right tdoverflowmax50 ');
print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, '', $sortfield, $sortorder, 'right tdoverflowmax50 maxwidth50imp ');
print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, '', $sortfield, $sortorder, 'center tdoverflowmax100 ');
print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("CronLastResult", $_SERVER["PHP_SELF"], "t.lastresult", "", $param, '', $sortfield, $sortorder, 'center ');
@ -567,10 +567,12 @@ if ($num > 0) {
print '</td>';
// Label
print '<td class="tdoverflowmax300">';
print '<td class="minwidth125">';
if (!empty($object->label)) {
$object->ref = $langs->trans($object->label);
print '<span title="'.dol_escape_htmltag($langs->trans($object->label)).'">'.$object->getNomUrl(0, '', 1).'</span>';
print '<div class="small twolinesmax maxwidth200 classfortooltip" title="'.dol_escape_htmltag($langs->trans($object->label), 0, 0).'">';
print $object->getNomUrl(0, '', 1);
print '</div>';
$object->ref = $obj->rowid;
} else {
//print $langs->trans('CronNone');
@ -578,9 +580,9 @@ if ($num > 0) {
print '</td>';
// Priority
print '<td class="right">';
/*print '<td class="right">';
print dol_escape_htmltag($object->priority);
print '</td>';
print '</td>';*/
// Module
print '<td>';
@ -590,20 +592,22 @@ if ($num > 0) {
// Class/Method
print '<td class="nowraponall">';
if ($obj->jobtype == 'method') {
$text = $langs->trans("CronClass");
$texttoshow = $langs->trans('CronModule').': '.$obj->module_name.'<br>';
$text = img_picto('', 'code');
$texttoshow = '<b>'.$langs->trans("CronType_method").'</b><br><br>';
$texttoshow .= $langs->trans('CronModule').': '.$obj->module_name.'<br>';
$texttoshow .= $langs->trans('CronClass').': '.$obj->classesname.'<br>';
$texttoshow .= $langs->trans('CronObject').': '.$obj->objectname.'<br>';
$texttoshow .= $langs->trans('CronMethod').': '.$obj->methodename;
$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
} elseif ($obj->jobtype == 'command') {
$text = $langs->trans('CronCommand');
$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command);
$text = img_picto('', 'terminal');
$texttoshow = '<b>'.$langs->trans('CronType_command').'</b><br><br>';
$texttoshow .= $langs->trans('CronCommand').': '.dol_trunc($obj->command);
$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
}
print $form->textwithpicto($text, $texttoshow, 1);
print '<span class="classfortooltip" title="'.dol_escape_htmltag($texttoshow, 1, 1).'">'.$text.'</a>';
print '</td>';
// Frequency
@ -690,7 +694,7 @@ if ($num > 0) {
if (!empty($obj->datenextrun)) {
$datenextrun = $db->jdate($obj->datenextrun);
if (empty($obj->status)) {
print '<span class="opacitymedium">';
print '<span class="opacitymedium strikefordisabled">';
}
print dol_print_date($datenextrun, 'dayhoursec');
if ($obj->status == Cronjob::STATUS_ENABLED) {

View file

@ -748,7 +748,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
// Company type
if (!empty($arrayfields['typent.code']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone center">';
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, getDolGlobalString('SOCIETE_SORT_ON_TYPEENT', 'ASC'), 'maxwidth75', 1);
print '</td>';
}
// Weight
@ -1109,7 +1109,7 @@ while ($i < $imaxinloop) {
// Tracking number
if (!empty($arrayfields['e.tracking_number']['checked'])) {
$shipment->getUrlTrackingStatus($obj->tracking_number);
print '<td class="center">'.$shipment->tracking_url."</td>\n";
print '<td class="center" title="'.dol_escape_htmltag($shipment->tracking_url).'">'.dol_escape_htmltag($shipment->tracking_url)."</td>\n";
//print $form->editfieldval("TrackingNumber", 'tracking_number', $obj->tracking_url, $obj, $user->rights->expedition->creer, 'string', $obj->tracking_number);
if (!$i) {
$totalarray['nbfield']++;
@ -1125,7 +1125,7 @@ while ($i < $imaxinloop) {
if (!empty($arrayfields['l.ref']['checked'])) {
// Ref
print '<td>';
print '<td class="nowraponall">';
print !empty($receiving) ? $receiving->getNomUrl($db) : '';
print '</td>';
}

View file

@ -1765,7 +1765,7 @@ class ExpenseReport extends CommonObject
{
global $conf, $langs;
$langs->load('expensereport');
$langs->load('trips');
$nofetch = !empty($params['nofetch']);
$moretitle = $params['moretitle'] ?? '';

View file

@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
$langs->loadLangs(array('expensereports', 'bills', 'banks', 'compta'));
$langs->loadLangs(array('trips', 'bills', 'banks', 'compta'));
$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');

View file

@ -408,7 +408,7 @@ class Skill extends CommonObject
$this->lines = array();
require_once __DIR__ . '/skilldet.class.php';
$skilldet = new Skilldet($this->db);
$this->lines = $skilldet->fetchAll('ASC', '', '', '', 'fk_skill:=:'.$this->id, '');
$this->lines = $skilldet->fetchAll('ASC', '', 0, 0, '(fk_skill:=:'.$this->id.')');
if (is_array($this->lines)) {
return (count($this->lines) > 0) ? $this->lines : array();

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - companies
AllocateCommercial=Assigned to sales representative
LastModifiedThirdParties=Latest %s Third Parties which were modified

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -54,7 +54,6 @@ January=Jänner
Month01=Jänner
ReportName=Berichtname
RefCustomer=Kunden Nr.
MailSentBy=E-Mail-Absender
TextUsedInTheMessageBody=E-Mail-Text
Offered=Angeboten
Receive=Erhalte

View file

@ -1,3 +1,2 @@
# Dolibarr language file - Source file is en_US - paybox
YourPaymentHasBeenRecorded=Diese Seite wird bestätigt, dass Ihre Zahlung aufgezeichnet wurde. Danke.
AccountParameter=Konto-Parameter

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -46,15 +46,12 @@ SupplierCodeModel=Lieferanten - Code Format
ProfId1AR=Prof Id 1 (CUIT)
ProfId2AR=Prof Id 2 (Revenu Bestien)
ProfId1AT=Prof Id 1
ProfId4AT=Prof Id 4
ProfId1BE=Prof Id 1 (Anzahl Professionnel)
ProfId1BR=CNPJ
ProfId2BR=IE (Staatliche Behörde)
ProfId3BR=IM (kommunale Behörde)
ProfId3CH=Prof Id 1 (Bundes-Nummer)
ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
ProfId1DE=Umsatzsteuer-Identifikationsnummer
ProfId4DE=Steuernummer
ProfId1ES=Prof Id 1 (CIF / NIF)
ProfId2ES=Prof Id 2 (Social Security Number)
ProfId4ES=Prof Id 4 (Collegiate Anzahl)
@ -66,9 +63,6 @@ ProfId2IN=Prof Id 2
ProfId3IN=Prof Id 3
ProfId1LU=Id prof. 1 (R.C.S. Luxemburg)
ProfId2LU=Id. Prof. 2
ProfId3LU=Id. Prof. 3
ProfId4LU=Id. Prof. 4
ProfId6LU=Id. Prof. 6
ProfId4NL=-
ProfId2PT=Prof Id 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Commercial Record-Nummer)
@ -76,11 +70,6 @@ ProfId4PT=Prof Id 4 (Konservatorium)
ProfId2TN=Prof Id 2 (Geschäftsjahr matricule)
ProfId3TN=Prof Id 3 (Douane-Code)
ProfId1US=Employer Identification Number (FEIN)
ProfId2US=Id. Prof. 6
ProfId3US=Id. Prof. 6
ProfId4US=Id. Prof. 6
ProfId5US=Id. Prof. 6
ProfId6US=Id. Prof. 6
ProfId1RO=Firmennummer CUI
ProfId2RO=Firmennummer (Nr. Înmatriculare)
ProfId3RO=Firmennummer CAEN

View file

@ -224,7 +224,6 @@ UndoExpandAll=Ausklappen rückgängig machen
SeeAll=Zeige alles an
CloseWindow=Fenster schliessen
Priority=Wichtigkeit
MailSentBy=E-Mail Absender
NotSent=Nicht gesendet
SendAcknowledgementByMail=Bestätigungsemail senden
SendMail=sende E-Mail

View file

@ -1,6 +1,4 @@
# Dolibarr language file - Source file is en_US - paybox
WelcomeOnPaymentPage=Willkommen auf der Online - Bezahlseite
ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlunge
PayBoxDoPayment=Mit Paybox bezahlen
SetupPayBoxToHavePaymentCreatedAutomatically=Paybox mit der URL <b>%s</b> einrichten, um die Zahlung automatisch auszuführen, sobald von Paybox frei gegeben.
YourPaymentHasBeenRecorded=Diese Seite bestätigt, dass Ihre Zahlung erfasst wurde. Vielen Dank.

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - cashdesk
MainPrinterToUseMore=empty means the browser printer system

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - cashdesk
MainPrinterToUseMore=empty means the browser printer system

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - cashdesk
MainPrinterToUseMore=empty means the browser printer system

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -0,0 +1,12 @@
# Dolibarr language file - Source file is en_US - assets
AssetRecoveredVAT=Recovered GST
AssetDisposalSubjectToVat=Disposal subject to GST
AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. GST)
AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. GST)
AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. GST)
AssetAccountancyCodeVatCollected=Collected GST
AssetAccountancyCodeVatDeductible=Recovered GST on assets
AssetBaseDepreciationHT=Depreciation basis (excl. GST)
AssetDepreciationHT=Depreciation (excl. GST)
AssetCumulativeDepreciationHT=Cumulative depreciation (excl. GST)
AssetResidualHT=Residual value (excl. GST)

View file

@ -0,0 +1,4 @@
# Dolibarr language file - Source file is en_US - cashdesk
NoVAT=No GST for this sale
TicketVatGrouped=Group GST by rate in tickets|receipts
MainPrinterToUseMore=empty means the browser printer system

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - errors
ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null GST rate (Found a negative total for GST rate <b>%s</b>%%).
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - members
VATToUseForSubscriptions=GST rate to use for contributions
NoVatOnSubscription=No GST for contributions

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -343,7 +343,7 @@ MenuHandlers=Menu handlers
MenuAdmin=Menu editor
DoNotUseInProduction=Do not use in production
ThisIsProcessToFollow=Upgrade procedure:
ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
ThisIsAlternativeProcessToFollow=This is an alternative deployment process you can run manually:
StepNb=Step %s
FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
DownloadPackageFromWebSite=Download package (for example from the official web site %s).
@ -1992,6 +1992,7 @@ BackgroundColor=Background color
TopMenuBackgroundColor=Background color for Top menu
TopMenuDisableImages=Icon or Text in Top menu
LeftMenuBackgroundColor=Background color for Left menu
LeftmenuId=Left menu ID
BackgroundTableTitleColor=Background color for Table title line
BackgroundTableTitleTextColor=Text color for Table title line
BackgroundTableTitleTextlinkColor=Text color for Table title link line

View file

@ -55,6 +55,8 @@ ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (exam
ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
ErrorFieldsRequired=Some required fields have been left blank.
ErrorSubjectIsRequired=The email subject is required
ErrorInAddAttachmentsImageBaseOnMedia=Error in add attachments image base in on media
ErrorInAddAttachmentsImageBaseIsSrcData=Error in add attachments image base source is in data
ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
ErrorNoMailDefinedForThisUser=No mail defined for this user
ErrorSetupOfEmailsNotComplete=Setup of emails is not complete

View file

@ -1,169 +0,0 @@
# Dolibarr language file - Source file is en_US - expensereports.lang
# copied from trips.lang
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
AddTrip=Create expense report
AllExpenseReport=All type of expense report
AllExpenseReports=All expense reports
AnyOtherInThisListCanValidate=Person to be informed for validating the request.
AttachTheNewLineToTheDocument=Attach the line to an uploaded document
AucuneLigne=There is no expense report declared yet
BrouillonnerTrip=Move back expense report to status "Draft"
byEX_DAY=by day (limitation to %s)
byEX_EXP=by line (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
CANCEL_USER=Deleted by
ACCOUNTING_ACCOUNT_EXPENSEREPORT=Account (from the Chart of Account) used by default for "users" on expensereport
ACCOUNTING_ACCOUNT_EXPENSEREPORT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, and also as the default value of Subledger accounting if no dedicated accounting account is not defined on the user.
CarCategory=Vehicle category
ClassifyRefunded=Classify 'Refunded'
CompanyVisited=Company/organization visited
ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
ConfirmCancelTrip=Are you sure you want to cancel this expense report?
ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
ConfirmDeleteTrip=Are you sure you want to delete this expense report?
ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
ConfirmRefuseTrip=Are you sure you want to deny this expense report?
ConfirmSaveTrip=Are you sure you want to validate this expense report?
ConfirmValideTrip=Are you sure you want to approve this expense report?
DATE_CANCEL=Cancellation date
DATE_PAIEMENT=Payment date
DATE_REFUS=Deny date
DATE_SAVE=Validation date
DefaultCategoryCar=Default transportation mode
DefaultRangeNumber=Default range number
DeleteTrip=Delete expense report
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
ExpenseRangeOffset=Offset amount: %s
expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
expenseReportCoef=Coefficient
expenseReportCoefUndefined=(value not defined)
expenseReportOffset=Offset
expenseReportPrintExample=offset + (d x coef) = %s
expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
expenseReportRangeFromTo=from %d to %d
expenseReportRangeMoreThan=more than %d
expenseReportTotalForFive=Example with <u>d</u> = 5
ExpenseReportApplyTo=Apply to
ExpenseReportApproved=An expense report was approved
ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
ExpenseReportCanceled=An expense report was canceled
ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
ExpenseReportDateEnd=Date end
ExpenseReportDateStart=Date start
ExpenseReportDomain=Domain to apply
ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
ExpenseReportLimitAmount=Max amount
ExpenseReportLimitOn=Limit on
ExpenseReportLine=Expense report line
ExpenseReportPaid=An expense report was paid
ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
ExpenseReportPayment=Expense report payment
ExpenseReportRef=Ref. expense report
ExpenseReportRefused=An expense report was refused
ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
ExpenseReportRestrictive=Exceeding forbidden
ExpenseReportRuleErrorOnSave=Error: %s
ExpenseReportRuleSave=Expense report rule saved
ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportsIk=Configuration of mileage charges
ExpenseReportsRules=Expense report rules
ExpenseReportsToApprove=Expense reports to approve
ExpenseReportsToPay=Expense reports to pay
ExpensesArea=Expense reports area
FeesKilometersOrAmout=Amount or kilometers
LastExpenseReports=Latest %s expense reports
ListOfFees=List of fees
ListOfTrips=List of expense reports
ListToApprove=Waiting for approval
ListTripsAndExpenses=List of expense reports
MOTIF_CANCEL=Reason
MOTIF_REFUS=Reason
ModePaiement=Payment mode
NewTrip=New expense report
nolimitbyEX_DAY=by day (no limitation)
nolimitbyEX_EXP=by line (no limitation)
nolimitbyEX_MON=by month (no limitation)
nolimitbyEX_YEA=by year (no limitation)
NoTripsToExportCSV=No expense report to export for this period.
NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
OnExpense=Expense line
PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
PaidTrip=Pay an expense report
REFUSEUR=Denied by
RangeIk=Mileage range
RangeNum=Range %d
SaveTrip=Validate expense report
ShowExpenseReport=Show expense report
ShowTrip=Show expense report
TripCard=Expense report card
TripId=Id expense report
TripNDF=Information expense report
TripSociete=Information company
Trips=Expense reports
TripsAndExpenses=Expense reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now
VALIDATOR=User responsible for approval
VALIDOR=Approved by
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
ValideTrip=Approve expense report
## Dictionary
EX_BRE=Breakfast
EX_CAM=CV maintenance and repair
EX_CAM_VP=PV maintenance and repair
EX_CAR=Car rental
EX_CUR=Customers receiving
EX_DOC=Documentation
EX_EMM=Employees meal
EX_FUE=Fuel CV
EX_FUE_VP=Fuel PV
EX_GUM=Guests meal
EX_HOT=Hotel
EX_IND=Indemnity transportation subscription
EX_KME=Mileage costs
EX_OTR=Other receiving
EX_PAR=Parking CV
EX_PAR_VP=Parking PV
EX_POS=Postage
EX_SUM=Maintenance supply
EX_SUO=Office supplies
EX_TAX=Various Taxes
EX_TOL=Toll CV
EX_TOL_VP=Toll PV
TF_BUS=Bus
TF_CAR=Car
TF_ESSENCE=Fuel
TF_HOTEL=Hotel
TF_LUNCH=Lunch
TF_METRO=Metro
TF_OTHER=Other
TF_PEAGE=Toll
TF_TAXI=Taxi
TF_TRAIN=Train
TF_TRIP=Transportation
## add new (not from trips.lang)
ExpenseReportPayments=Expense report payments
#
# error
#
TaxUndefinedForThisCategory = Taxe undefined for this category
ErrorRecordNotFound=Record not found
errorComputeTtcOnMileageExpense=Error on computing mileage expense
ErrorBadValueForParameter=Error bad value for parameter %s
ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action

View file

@ -44,7 +44,6 @@ InterventionsArea=Interventions area
DraftFichinter=Draft interventions
LastModifiedInterventions=Latest %s modified interventions
FichinterToProcess=Interventions to process
TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
PrintProductsOnFichinterDetails=interventions generated from orders
UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@ -73,3 +72,7 @@ FichinterNoContractLinked=Intervention %s has been created without a linked cont
ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
NextDateToIntervention=Date for next intervention generation
NoIntervention=No intervention
TypeContact_fichinter_internal_INTERREPFOLL=Responsible for intervention follow-up
TypeContact_fichinter_internal_INTERVENING=Intervenant
TypeContact_fichinter_external_BILLING=Contact customer of intervention billing
TypeContact_fichinter_external_CUSTOMER=Customer contact of intervention follow-up

View file

@ -9,6 +9,7 @@ MailRecipients=Recipients
MailRecipient=Recipient
MailTitle=Label
MailFrom=From
ForceEmailFrom=Default email From
PhoneFrom=From
MailErrorsTo=Errors to
MailReply=Reply to

View file

@ -1,26 +1,12 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=PayBox module setup
PayBoxDesc=This module offer pages to allow payment on <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
PaymentForm=Payment form
WelcomeOnPaymentPage=Welcome to our online payment service
ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
ThisIsInformationOnPayment=This is information on payment to do
ToComplete=To complete
YourEMail=Email to receive payment confirmation
Creditor=Creditor
PaymentCode=Payment code
PayBoxDoPayment=Pay with Paybox
YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
Continue=Next
SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
AccountParameter=Account parameters
UsageParameter=Usage parameters
InformationToFindParameters=Help to find your %s account information
PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
CSSUrlForPaymentForm=CSS style sheet url for payment form
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)

View file

@ -1,4 +1,4 @@
# Dolibarr language file - Source file is en_US - trips
# Dolibarr language file - Source file is en_US - trips.lang
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
AddTrip=Create expense report
@ -13,6 +13,8 @@ byEX_EXP=by line (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
CANCEL_USER=Deleted by
ACCOUNTING_ACCOUNT_EXPENSEREPORT=Account (from the Chart of Account) used by default for "users" on expensereport
ACCOUNTING_ACCOUNT_EXPENSEREPORT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, and also as the default value of Subledger accounting if no dedicated accounting account is not defined on the user.
CarCategory=Vehicle category
ClassifyRefunded=Classify 'Refunded'
CompanyVisited=Company/organization visited
@ -106,7 +108,7 @@ TripId=Id expense report
TripNDF=Information expense report
TripSociete=Information company
Trips=Expense reports
TripsAndExpenses=Expenses reports
TripsAndExpenses=Expense reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now
@ -115,6 +117,10 @@ VALIDOR=Approved by
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
ValideTrip=Approve expense report
ExpenseReportPayments=Expense report payments
TaxUndefinedForThisCategory = Taxe undefined for this category
errorComputeTtcOnMileageExpense=Error on computing mileage expense
ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action
## Dictionary
EX_BRE=Breakfast

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - cashdesk
MainPrinterToUseMore=empty means the browser printer system

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
EmptyMessageNotAllowedError=Empty Message Not Allowed Error

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - help
AIProcessingPleaseWait=AI interrogation in progress, please wait...

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - salaries
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - stocks
QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - trips
TripsAndExpenses=Expenses reports

View file

@ -7,7 +7,6 @@ EventOnFullDay=Evento de todo(s) el(los) día(s)
MenuToDoActions=Todos los eventos incompletos
MenuDoneActions=Todos los eventos terminados
ActionsAskedBy=Eventos informados por
ActionsDoneBy=Eventos terminados por
ViewCal=Vista del mes
ViewDay=Vista del día
ViewWeek=Vista de la semana

View file

@ -36,7 +36,6 @@ TasksHistoryForThisContact=Eventos para este contacto
LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Contactar
LastProspectContactDone=Contacto realizado
ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar presupuesto por correo
ActionAC_EMAIL=Enviar correo

View file

@ -5,4 +5,3 @@ DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
DATAPOLICY_CONTACT_PROSPECT =Cliente Potencial
DATAPOLICY_CONTACT_PROSPECT_CLIENT =Cliente Potencial/Cliente
DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
DATAPOLICYMail =Configuración de correos electrónicos

View file

@ -19,7 +19,6 @@ NewMailing=Nuevo correo
EditMailing=Editar correo
ResetMailing=Reenviar correo
DeleteMailing=Eliminar correo
DeleteAMailing=Eliminar un correo
PreviewMailing=Previsualizar correo
CreateMailing=Crear correo
ValidMailing=Validar correo

Some files were not shown because too many files have changed in this diff Show more