Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
aa451769ce
50 changed files with 177 additions and 176 deletions
|
|
@ -11,7 +11,7 @@
|
|||
* Copyright (C) 2011-2024 Alexandre Spangaro <aspangaro@easya.solutions>
|
||||
* Copyright (C) 2015 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -196,7 +196,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
|
||||
}
|
||||
|
||||
// Si verif ok et action add, on ajoute la ligne
|
||||
// In case of 'actionadd' and with valid parameters, add the line
|
||||
if ($ok && GETPOST('actionadd', 'alpha')) {
|
||||
$newid = 0;
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Si verif ok et action modify, on modifie la ligne
|
||||
// In case of 'actionmodify' and with valid parameters, modify the line
|
||||
if ($ok && GETPOST('actionmodify', 'alpha')) {
|
||||
// Modify entry
|
||||
$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* Copyright (C) 2004-2023 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2011-2025 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -209,7 +209,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
|
||||
}
|
||||
|
||||
// Si verif ok et action add, on ajoute la ligne
|
||||
// In case of 'actionadd' and with valid parameters, add the line
|
||||
if ($ok && GETPOST('actionadd', 'alpha')) {
|
||||
$newid = 0;
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
|
||||
// Modify entry
|
||||
$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
|
||||
// Modifie valeur des champs
|
||||
// Modify field values
|
||||
if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
|
||||
$sql .= $db->sanitize($tabrowid[$id])." = ";
|
||||
$sql .= "'".$db->escape($rowid)."', ";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2017-2024 Alexandre Spangaro <aspangaro@easya.solutions>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -194,7 +194,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
$ok = 0;
|
||||
}
|
||||
|
||||
// Si verif ok et action add, on ajoute la ligne
|
||||
// In case of 'actionadd' and with valid parameters, add the line
|
||||
if ($ok && GETPOST('actionadd', 'alpha')) {
|
||||
$newid = 0; // Initialise before if for static analysis
|
||||
if ($tabrowid[$id]) {
|
||||
|
|
@ -251,7 +251,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Si verif ok et action modify, on modifie la ligne
|
||||
// If check ok and action modify, we modify the line
|
||||
if ($ok && GETPOST('actionmodify', 'alpha')) {
|
||||
if ($tabrowid[$id]) {
|
||||
$rowidcol = $tabrowid[$id];
|
||||
|
|
@ -261,7 +261,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
|
||||
// Modify entry
|
||||
$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
|
||||
// Modifie valeur des champs
|
||||
// Modify the field values
|
||||
if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
|
||||
$sql .= $db->sanitize($tabrowid[$id])." = ";
|
||||
$sql .= "'".$db->escape($rowid)."', ";
|
||||
|
|
@ -373,7 +373,7 @@ $titlepicto = 'title_accountancy';
|
|||
print load_fiche_titre($titre, $linkback, $titlepicto);
|
||||
|
||||
|
||||
// Confirmation de la suppression de la ligne
|
||||
// Generate a form to confirm the deletion of the row
|
||||
if ($action == 'delete') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
|
||||
}
|
||||
|
|
@ -382,7 +382,7 @@ if ($action == 'delete') {
|
|||
* Show a dictionary
|
||||
*/
|
||||
|
||||
// Complete requete recherche valeurs avec critere de tri
|
||||
// Complete the search query with sort criteria
|
||||
$sql = $tabsql[$id];
|
||||
$sql .= " WHERE a.entity = ".((int) $conf->entity);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2026 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
|
||||
|
|
@ -183,7 +184,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Si verif ok et action add, on ajoute la ligne
|
||||
// In case of 'actionadd' and with valid parameters, add the line
|
||||
if ($ok && GETPOST('actionadd', 'alpha')) {
|
||||
$newid = 0;
|
||||
|
||||
|
|
@ -254,7 +255,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
|
||||
// Modify entry
|
||||
$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
|
||||
// Modifie valeur des champs
|
||||
// Modify field values
|
||||
if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
|
||||
$sql .= $db->sanitize($tabrowid[$id])." = ";
|
||||
$sql .= "'".$db->escape($rowid)."', ";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* Copyright (C) 2020 Guillaume Alexandre <guillaume@tag-info.fr>
|
||||
* Copyright (C) 2022 Joachim Kueter <jkueter@gmx.de>
|
||||
* Copyright (C) 2022 Progiseize <a.bisotti@progiseize.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -1391,7 +1391,7 @@ class AccountancyExport
|
|||
$separator = ';';
|
||||
$end_line = "\n";
|
||||
|
||||
// parcours du tableau pour recuperation des numero de compte des tiers pour pouvoir les fournir dans la bonne ligne pour istea
|
||||
// Extract the Third party account numbers from the table to provide the correct line for ISTEA
|
||||
$tiers = [];
|
||||
foreach ($objectLines as $line) {
|
||||
if ($line->subledger_account && substr($line->subledger_account, 0, 1) == '4') {
|
||||
|
|
@ -2752,7 +2752,7 @@ class AccountancyExport
|
|||
$tab[] = substr($date, 3, 2);
|
||||
$tab[] = substr($date, 0, 2);
|
||||
$tab[] = $line->doc_ref;
|
||||
//Conversion de chaine UTF8 en Latin9
|
||||
// Convert the UTF-8 string in latin9
|
||||
$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire', '', $line->label_operation), "Windows-1252", 'UTF-8');
|
||||
|
||||
//Calcul de la longueur des numéros de comptes
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2017-2022 OpenDSI <support@open-dsi.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 Alexandre Janniaux <alexandre.janniaux@gmail.com>
|
||||
* Copyright (C) 2025 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
|
|
@ -1323,7 +1323,7 @@ class AccountingJournal extends CommonObject
|
|||
$element['blocks'][] = $lines_book;
|
||||
}
|
||||
} else {
|
||||
// si TVA = 0, pousser les 2 lignes view/bookkeeping déjà constituées
|
||||
// When VAT = 0, push the 2 lines view/bookkeeping already prepared
|
||||
if ($type == 'view') {
|
||||
$element['blocks'][] = $lines_view;
|
||||
} elseif ($type == 'bookkeeping') {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* Copyright (C) 2018-2019 Thibault Foucart <support@ptibogxiv.net>
|
||||
* Copyright (C) 2021 Waël Almoman <info@almoman.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -273,7 +273,7 @@ class AdherentType extends CommonObject
|
|||
if ($result) {
|
||||
while ($obj = $this->db->fetch_object($result)) {
|
||||
//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
|
||||
if ($obj->lang == $current_lang) { // si on a les traduct. dans la langue courante on les charge en infos principales.
|
||||
if ($obj->lang == $current_lang) { // if we have the translations in the current language, we load them as main information.
|
||||
$this->label = $obj->label;
|
||||
$this->description = $obj->description;
|
||||
$this->email = $obj->email;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -428,9 +428,9 @@ if (getDolGlobalString('BARCODE_USE_ON_PRODUCT') || getDolGlobalString('BARCODE_
|
|||
print dol_escape_htmltag($obj->label);
|
||||
print "</td><td>\n";
|
||||
print $langs->trans('BarcodeDesc'.$obj->encoding);
|
||||
//print "L'EAN se compose de 8 characters, 7 chiffres plus une cle de verification.<br>";
|
||||
//print "L'utilisation des symbologies EAN8 impose la souscription et l'abonnement aupres d'organismes comme GENCOD.<br>";
|
||||
//print "Codes numeriques utilises exclusivement a l'identification des produits susceptibles d'etre vendus au grand public.";
|
||||
// print "The EAN consists of 8 characters, 7 digits plus a control digit.";
|
||||
// print "The use of EAN8 symbols requires subscription to organizations such as GENCOD.";
|
||||
// print "Numeric codes are used exclusively for the identification of products that are likely to be sold to the general public.";
|
||||
print '</td>';
|
||||
|
||||
// Show example
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -390,17 +390,17 @@ print '<script type="text/javascript">
|
|||
$(document).ready(function() {
|
||||
function toggleOAuthServiceDisplay() {
|
||||
if ($("#radio_oauth").is(":checked")) {
|
||||
$("#oauth_service_div").show(); // Afficher le sélecteur OAuth
|
||||
$("#oauth_service_div").show(); // Show the OAuth selector
|
||||
} else {
|
||||
$("#oauth_service_div").hide(); // Cacher le sélecteur OAuth
|
||||
$("#oauth_service_div").hide(); // Hide the OAuth selector
|
||||
}
|
||||
}
|
||||
|
||||
function toggleAddParamRow() {
|
||||
if ($("#radio_oauth").is(":checked")) {
|
||||
$("#add_param_row").hide(); // Cacher toute la ligne
|
||||
$("#add_param_row").hide(); // Hide the entire line
|
||||
} else {
|
||||
$("#add_param_row").show(); // Afficher toute la ligne
|
||||
$("#add_param_row").show(); // Show the entire line
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -56,6 +56,7 @@ $id = 1;
|
|||
$acts = array();
|
||||
$acts[0] = "activate";
|
||||
$acts[1] = "disable";
|
||||
$actl = array();
|
||||
$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
|
||||
$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
|
||||
|
||||
|
|
@ -172,7 +173,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
|
||||
$newid = 0;
|
||||
|
||||
// Si verif ok et action add, on ajoute la ligne
|
||||
// In case of 'actionadd' and with valid parameters, add the line
|
||||
if ($ok && GETPOST('actionadd', 'alpha')) {
|
||||
if ($tabrowid[$id]) {
|
||||
// Get free id for insert
|
||||
|
|
@ -240,7 +241,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Si verif ok et action modify, on modifie la ligne
|
||||
// In case of 'actionmodify' and with valid parameters, modify the line
|
||||
if ($ok && GETPOST('actionmodify', 'alpha')) {
|
||||
if ($tabrowid[$id]) {
|
||||
$rowidcol = $tabrowid[$id];
|
||||
|
|
@ -256,7 +257,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
|
|||
|
||||
// Modify entry
|
||||
$sql = "UPDATE ".$tabname[$id]." SET ";
|
||||
// Modifie valeur des champs
|
||||
// Modify the field values
|
||||
if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
|
||||
$sql .= $tabrowid[$id]."=";
|
||||
$sql .= "'".$db->escape((string) $rowid)."', ";
|
||||
|
|
@ -441,7 +442,7 @@ print '<span class="opacitymedium">'.$langs->trans("WebsiteSetupDesc").'</span><
|
|||
print "<br>\n";
|
||||
|
||||
|
||||
// Confirmation de la suppression de la ligne
|
||||
// Generate form to confirm line deletion
|
||||
if ($action == 'delete') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
|
||||
}
|
||||
|
|
@ -451,7 +452,7 @@ if ($action == 'delete') {
|
|||
* Show website list
|
||||
*/
|
||||
if ($id) {
|
||||
// Complete requete recherche valeurs avec critere de tri
|
||||
// Complete the request - lookup values with sort condition
|
||||
$sql = $tabsql[$id];
|
||||
$sql .= $db->order($sortfield, $sortorder);
|
||||
$sql .= $db->plimit($limit + 1, $offset);
|
||||
|
|
@ -474,8 +475,7 @@ if ($id) {
|
|||
continue;
|
||||
}
|
||||
|
||||
// Determine le nom du champ par rapport aux noms possibles
|
||||
// dans les dictionnaires de donnees
|
||||
// Get the field name based on the names available in the data dictionaries
|
||||
$valuetoshow = ucfirst($fieldlist[$field]); // By default
|
||||
$valuetoshow = $langs->trans($valuetoshow); // try to translate
|
||||
$css = '';
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* Copyright (C) 2012-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2017 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -245,7 +245,7 @@ if ($this->status == 0 && $user->hasRight('bom', 'write') && $action != 'selectl
|
|||
print '<td class="linecoldelete center">';
|
||||
$coldisplay++;
|
||||
if (empty($disableremove)) {
|
||||
//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
|
||||
// Deletion is authorised only when there is no line in a previous situation
|
||||
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=deleteline&token='.newToken().'&lineid='.$line->id.'">';
|
||||
print img_delete();
|
||||
print '</a>';
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* Copyright (C) 2014 Jean-François Ferry <jfefe@aternatik.fr>
|
||||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
/**
|
||||
* \file htdocs/categories/photos.php
|
||||
* \ingroup category
|
||||
* \brief Gestion des photos d'une categorie
|
||||
* \brief Management of photos for a category
|
||||
*/
|
||||
|
||||
// Load Dolibarr environment
|
||||
|
|
@ -235,7 +235,7 @@ if ($object->id) {
|
|||
|
||||
print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Original size" target="_blank" rel="noopener noreferrer">';
|
||||
|
||||
// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
|
||||
// Use the file's miniature if it is available, otherwise use the original image
|
||||
if ($obj['photo_vignette']) {
|
||||
$filename = $obj['photo_vignette'];
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* Copyright (C) 2022 ATM Consulting <contact@atm-consulting.fr>
|
||||
* Copyright (C) 2022 OpenDSI <support@open-dsi.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 William Mead <william@m34d.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -836,7 +836,7 @@ class Propal extends CommonObject
|
|||
$this->line->multicurrency_total_tva = (float) $multicurrency_total_tva;
|
||||
$this->line->multicurrency_total_ttc = (float) $multicurrency_total_ttc;
|
||||
|
||||
// Mise en option de la ligne
|
||||
// Set the line as optional
|
||||
if (empty($qty) && empty($special_code)) {
|
||||
$this->line->special_code = 3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2004-2019 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
|
||||
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Anthony Damhet <a.damhet@progiseize.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -826,7 +826,7 @@ if ($socid > 0) {
|
|||
}
|
||||
|
||||
/*
|
||||
* Liste remises fixes fournisseur restant en cours (= liees a aucune facture ni ligne de facture)
|
||||
* List of fixed supplier discounts still available (=not linked to any invoice nor invoice line)
|
||||
*/
|
||||
$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
|
||||
$sql .= " rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
|
||||
|
|
@ -1119,7 +1119,7 @@ if ($socid > 0) {
|
|||
print '<div class="clearboth"></div><br><br>';
|
||||
|
||||
/*
|
||||
* List discount consumed (=liees a une ligne de facture ou facture)
|
||||
* List discount consumed (=linked to an invoice line or invoice)
|
||||
*/
|
||||
|
||||
print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2023-2024 Benjamin Falière <benjamin.faliere@altairis.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Lenin Rivas <lenin.rivas777@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -2340,7 +2340,7 @@ if ($action == 'create' && $usercancreate) {
|
|||
print $form->select_contact($soc->id, $contactid, 'contactid', 1, empty($srccontactslist) ? "" : $srccontactslist, '', 1, 'maxwidth300 widthcentpercentminusx', true);
|
||||
print '</td></tr>';
|
||||
|
||||
// Ligne info remises tiers
|
||||
// Line with information on Third Party Discounts
|
||||
print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
|
||||
|
||||
$absolute_discount = $soc->getAvailableDiscounts();
|
||||
|
|
@ -2879,7 +2879,7 @@ if ($action == 'create' && $usercancreate) {
|
|||
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
|
||||
}
|
||||
|
||||
// Confirmation de la suppression d'une ligne subtotal
|
||||
// Generate form to delete a subtotal line
|
||||
if ($action == 'ask_subtotal_deleteline') {
|
||||
$langs->load("subtotals");
|
||||
$title = "DeleteSubtotalLine";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* Copyright (C) 2016-2022 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2021-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -2151,7 +2151,7 @@ class Commande extends CommonOrder
|
|||
$result = $remise->fetch($idremise);
|
||||
|
||||
if ($result > 0) {
|
||||
if ($remise->fk_facture) { // Protection against multiple submission
|
||||
if ($remise->fk_facture) { // Protection against multiple submissions
|
||||
$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
|
||||
$this->db->rollback();
|
||||
return -5;
|
||||
|
|
@ -2161,7 +2161,7 @@ class Commande extends CommonOrder
|
|||
|
||||
$line->fk_commande = $this->id;
|
||||
$line->fk_remise_except = $remise->id;
|
||||
$line->desc = $remise->description; // Description ligne
|
||||
$line->desc = $remise->description; // Description for the order line
|
||||
$line->vat_src_code = $remise->vat_src_code;
|
||||
$line->tva_tx = $remise->tva_tx;
|
||||
$line->subprice = -(float) $remise->amount_ht;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2017-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023 Nick Fragoulis
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -949,7 +949,7 @@ class FactureRec extends CommonInvoice
|
|||
/**
|
||||
* Add a line to invoice
|
||||
*
|
||||
* @param string $desc Description de la ligne
|
||||
* @param string $desc Description of the invoice line
|
||||
* @param float $pu_ht Prix unitaire HT (> 0 even for credit note)
|
||||
* @param float $qty Quantite
|
||||
* @param float|string $txtva VAT rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
|
||||
|
|
@ -1154,7 +1154,7 @@ class FactureRec extends CommonInvoice
|
|||
* Update a line to invoice
|
||||
*
|
||||
* @param int $rowid Id of line to update
|
||||
* @param string $desc Description de la ligne
|
||||
* @param string $desc Description of the invoice line
|
||||
* @param float $pu_ht Prix unitaire HT (> 0 even for credit note)
|
||||
* @param float $qty Quantite
|
||||
* @param float|string $txtva VAT Rate (Can be '1.23' or '1.23 (ABC)')
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* Copyright (C) 2022-2023 Solution Libre SAS <contact@solution-libre.fr>
|
||||
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2023 Nick Fragoulis
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Lenin Rivas <lenin.rivas777@gmail.com>
|
||||
*
|
||||
|
|
@ -2891,7 +2891,7 @@ class Facture extends CommonInvoice
|
|||
$facligne = new FactureLigne($this->db);
|
||||
$facligne->fk_facture = $this->id;
|
||||
$facligne->fk_remise_except = $remise->id;
|
||||
$facligne->desc = $remise->description; // Description ligne
|
||||
$facligne->desc = $remise->description; // Description of the invoice line
|
||||
$facligne->vat_src_code = $remise->vat_src_code;
|
||||
$facligne->tva_tx = $remise->tva_tx;
|
||||
$facligne->subprice = -(float) $remise->amount_ht;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
* Copyright (C) 2022 Sylvain Legrand <contact@infras.fr>
|
||||
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2023 Nick Fragoulis
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -80,7 +80,7 @@ class FactureLigne extends CommonInvoiceLine
|
|||
public $fk_parent_line;
|
||||
|
||||
/**
|
||||
* @var string Description ligne
|
||||
* @var string Description of the invoice line
|
||||
*/
|
||||
public $desc;
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -224,7 +224,7 @@ if ($result) {
|
|||
$situation_ratio = 1;
|
||||
}
|
||||
|
||||
//la ligne facture
|
||||
// Invoice line
|
||||
$tabfac[$obj->rowid]["date"] = $obj->datef;
|
||||
$tabfac[$obj->rowid]["ref"] = $obj->ref;
|
||||
$tabfac[$obj->rowid]["type"] = $obj->type;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -228,7 +228,7 @@ abstract class CommonObjectLine extends CommonObject
|
|||
/**
|
||||
* List of cumulative options:
|
||||
* Bit 0: 0 for common VAT - 1 if VAT french NPR
|
||||
* Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
|
||||
* Bit 1: 0 if standard line - 1 if discount (link to line into llx_remise_except)
|
||||
* @var ?int
|
||||
*/
|
||||
public $info_bits;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -247,7 +247,7 @@ abstract class CommonOrderLine extends CommonObjectLine
|
|||
/**
|
||||
* Liste d'options cumulables:
|
||||
* Bit 0: 0 si TVA normal - 1 si TVA NPR
|
||||
* Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
|
||||
* Bit 1: 0 si standard line - 1 if with discount (link to line into llx_remise_except)
|
||||
* @var int
|
||||
*/
|
||||
public $info_bits = 0;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2005-2021 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2006-2021 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -1142,7 +1142,7 @@ class Ldap
|
|||
// We need to search for this user in order to get their entry.
|
||||
$this->result = @ldap_search($this->connection, $this->people, $filterrecord, $attributes);
|
||||
|
||||
// Pourquoi cette ligne ?
|
||||
// What is this line for ?
|
||||
//$info = ldap_get_entries($this->connection, $this->result);
|
||||
|
||||
// Only one entry should ever be returned (no user will have the same uid)
|
||||
|
|
@ -1239,7 +1239,7 @@ class Ldap
|
|||
$keyattributelower = strtolower($attributeArray[$j]);
|
||||
//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."<br>\n";
|
||||
|
||||
//permet de recuperer le SID avec Active Directory
|
||||
// Enables getting the SID using Active Directory
|
||||
if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid") {
|
||||
$objectsid = $this->getObjectSid($recordid);
|
||||
$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
|
||||
|
|
@ -1577,15 +1577,15 @@ class Ldap
|
|||
*/
|
||||
public function convertTime($value)
|
||||
{
|
||||
$dateLargeInt = $value; // nano secondes depuis 1601 !!!!
|
||||
$dateLargeInt = $value; // nano secondes since the year 1601 !!!!
|
||||
if (PHP_INT_SIZE < 8) {
|
||||
// 32 bit platform
|
||||
$secsAfterADEpoch = (float) $dateLargeInt / (10000000.); // secondes depuis le 1 jan 1601
|
||||
$secsAfterADEpoch = (float) $dateLargeInt / (10000000.); // seconds since 1 jan 1601
|
||||
} else {
|
||||
// At least 64 bit platform
|
||||
$secsAfterADEpoch = (int) $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
|
||||
$secsAfterADEpoch = (int) $dateLargeInt / (10000000); // seconds since 1 jan 1601
|
||||
}
|
||||
$ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
|
||||
$ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * days * seconds
|
||||
$unixTimeStamp = intval($secsAfterADEpoch - $ADToUnixConvertor); // Unix time stamp
|
||||
return $unixTimeStamp;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2008 Chiptronik
|
||||
* Copyright (C) 2011-2021 Philippe Grand <philippe.grand@atoo-net.com>
|
||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 Nick Fragoulis
|
||||
*
|
||||
|
|
@ -421,14 +421,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||
$qtyRemaining = $object->lines[$i]->qty_asked - $object->commande->expeditions[$object->lines[$i]->fk_origin_line];
|
||||
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxremainingqty, 3, (string) $qtyRemaining, 0, 'R');
|
||||
/*
|
||||
// Remise sur ligne
|
||||
// Discount for line
|
||||
$pdf->SetXY($this->posxdiscount, $curY);
|
||||
if ($object->lines[$i]->remise_percent)
|
||||
{
|
||||
$pdf->MultiCell(14, 3, $object->lines[$i]->remise_percent."%", 0, 'R');
|
||||
}
|
||||
|
||||
// Total HT ligne
|
||||
// Total Excl. VAT for line
|
||||
$pdf->SetXY($this->postotalht, $curY);
|
||||
$total = price($object->lines[$i]->price * $object->lines[$i]->qty);
|
||||
$pdf->MultiCell(23, 3, $total, 0, 'R', 0);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2023 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -77,8 +77,8 @@ class TraceableDB extends DoliDB
|
|||
* Format a SQL IF
|
||||
*
|
||||
* @param string $test Test string (example: 'cd.statut=0', 'field IS NULL')
|
||||
* @param string $resok resultat si test equal
|
||||
* @param string $resko resultat si test non equal
|
||||
* @param string $resok result if test equal
|
||||
* @param string $resko result if test non equal
|
||||
* @return string SQL string
|
||||
*/
|
||||
public function ifsql($test, $resok, $resko)
|
||||
|
|
@ -186,7 +186,7 @@ class TraceableDB extends DoliDB
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Return the number o flines into the result of a request INSERT, DELETE or UPDATE
|
||||
* Return the number of lines into the result of a request INSERT, DELETE or UPDATE
|
||||
*
|
||||
* @param resource $resultset Curseur de la requete voulue
|
||||
* @return int Number of lines
|
||||
|
|
@ -314,7 +314,7 @@ class TraceableDB extends DoliDB
|
|||
/**
|
||||
* Get last ID after an insert INSERT
|
||||
*
|
||||
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
||||
* @param string $tab Table name concerned by insert. Needed for Postgresql compatibility (not useful for MySql)
|
||||
* @param string $fieldid Field name
|
||||
* @return int Id of row
|
||||
*/
|
||||
|
|
@ -628,8 +628,8 @@ class TraceableDB extends DoliDB
|
|||
* Create a user and privileges to connect to database (even if database does not exists yet)
|
||||
*
|
||||
* @param string $dolibarr_main_db_host Ip serveur
|
||||
* @param string $dolibarr_main_db_user Nom user a creer
|
||||
* @param string $dolibarr_main_db_pass Password user a creer
|
||||
* @param string $dolibarr_main_db_user Name of user to create
|
||||
* @param string $dolibarr_main_db_pass Password of user to create
|
||||
* @param string $dolibarr_main_db_name Database name where user must be granted
|
||||
* @return int Return integer <0 if KO, >=0 if OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2015-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025-2026 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
|
||||
|
|
@ -128,7 +128,7 @@ if (!$permissiontoadd) {
|
|||
* Actions
|
||||
*/
|
||||
|
||||
// Action ajout d'un produit ou service
|
||||
// Action - add product or service
|
||||
if ($action == 'add' && $permissiontoadd) {
|
||||
if ($cancel) {
|
||||
if (!empty($backtopage)) {
|
||||
|
|
@ -290,7 +290,7 @@ if (empty($action) || $action == 'delete_section') {
|
|||
print "<br><br>";
|
||||
*/
|
||||
|
||||
// Confirmation de la suppression d'une ligne categorie
|
||||
// Generate form to confirm deletion of a category line
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2008-2010 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Joachim Kueter <git-jk@bloxera.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -458,7 +458,7 @@ print '</div>';
|
|||
// Start left area
|
||||
|
||||
|
||||
// Confirmation de la suppression d'une ligne categorie
|
||||
// Generate form to confirm the deletion of a category line
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2020 Lenin Rivas <lenin@leninrivas.com>
|
||||
* Copyright (C) 2022 Josep Lluís Amador <joseplluis@lliuretic.cat>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Nick Fragoulis
|
||||
* Copyright (C) 2025 Charlene Benke <charlene@patas-monkey.com>
|
||||
*
|
||||
|
|
@ -1970,7 +1970,7 @@ if ($action == 'create' && $usercancreate) {
|
|||
//var_dump($product->stock_warehouse[1]);
|
||||
|
||||
print '<td>';
|
||||
print '<a name="' . $line->id . '"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="' . $line->id . '"></a>'; // Anchor to retor to the line
|
||||
|
||||
// Show product and description
|
||||
$product_static->type = $line->fk_product_type;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Copyright (C) 2017-2022 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2019-2020 Christophe Battarel <christophe@altairis.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -712,7 +712,7 @@ if ($object->id > 0 || !empty($object->ref)) {
|
|||
while ($i < $num) {
|
||||
$objp = $db->fetch_object($resql);
|
||||
|
||||
// On n'affiche pas les produits libres
|
||||
/// Do hot show the free products
|
||||
if (!$objp->fk_product > 0) {
|
||||
$nbfreeproduct++;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2012-2015 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018-2022 Philippe Grand <philippe.grand@atoo-net.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -711,7 +711,7 @@ if ($order_id > 0 || !empty($ref)) {
|
|||
}
|
||||
|
||||
print '<td>';
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // Anchor to return to the line
|
||||
|
||||
// Show product and description
|
||||
$product_static->type = $type;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* Copyright (C) 2016-2025 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -235,9 +235,9 @@ if ($action == 'add' && $permissiontoadd) {
|
|||
$newinter->addline($user, $newfichinterid, $line->desc, $line->datei, $line->duree, array());
|
||||
}
|
||||
|
||||
// on update le nombre d'inter crée à partir du modèle
|
||||
// Update the number of interventions created from the template (model)
|
||||
$object->updateNbGenDone();
|
||||
//on redirige vers la fiche d'intervention nouvellement crée
|
||||
// Redirect to the newly created interventions report
|
||||
header('Location: '.DOL_URL_ROOT.'/fichinter/card.php?id='.$newfichinterid);
|
||||
exit;
|
||||
} else {
|
||||
|
|
@ -453,7 +453,7 @@ if ($action == 'create') {
|
|||
// Show product and description
|
||||
|
||||
print '<td>';
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // Anchor to return to the line
|
||||
|
||||
$text = img_object($langs->trans('Service'), 'service');
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* Copyright (C) 2020-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023 Benjamin Grembi <benjamin@oarces.fr>
|
||||
* Copyright (C) 2023-2024 William Mead <william.mead@manchenumerique.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2025 Pierre Ardoin <developpeur@lesmetiersdubatiment.fr>
|
||||
*
|
||||
|
|
@ -571,7 +571,7 @@ if (empty($reshook)) {
|
|||
dol_print_error($db, $object->error);
|
||||
}
|
||||
} elseif ($action == 'setref_client' && $permissiontoadd) {
|
||||
// Positionne ref client
|
||||
// Set customer reference
|
||||
$result = $object->setRefClient($user, GETPOST('ref_client', 'alpha'));
|
||||
if ($result < 0) {
|
||||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
|
|
@ -724,7 +724,7 @@ if (empty($reshook)) {
|
|||
$mesg = $object->error;
|
||||
}
|
||||
} elseif ($action == 'updateline' && $permissiontoadd && GETPOST('save', 'alpha')) {
|
||||
// Mise a jour d'une ligne d'intervention
|
||||
// Update an intervention line
|
||||
$objectline = new FichinterLigne($db);
|
||||
if ($objectline->fetch($lineid) <= 0) {
|
||||
dol_print_error($db);
|
||||
|
|
@ -778,7 +778,7 @@ if (empty($reshook)) {
|
|||
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
|
||||
exit;
|
||||
} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoadd) {
|
||||
// Supprime une ligne d'intervention AVEC confirmation
|
||||
// Delete an intervention line WITH confirmation
|
||||
$objectline = new FichinterLigne($db);
|
||||
if ($objectline->fetch($lineid) <= 0) {
|
||||
dol_print_error($db);
|
||||
|
|
@ -913,10 +913,10 @@ if (empty($reshook)) {
|
|||
}
|
||||
}
|
||||
} elseif ($action == 'swapstatut' && $permissiontoadd) {
|
||||
// bascule du statut d'un contact
|
||||
// Toggle the status of a contact
|
||||
$result = $object->swapContactStatus(GETPOSTINT('ligne'));
|
||||
} elseif ($action == 'deletecontact' && $permissiontoadd) {
|
||||
// Efface un contact
|
||||
// Delete a contact
|
||||
$result = $object->delete_contact(GETPOSTINT('lineid'));
|
||||
|
||||
if ($result >= 0) {
|
||||
|
|
@ -1580,7 +1580,7 @@ if ($action == 'create') {
|
|||
while ($i < $num) {
|
||||
$objp = $db->fetch_object($resql);
|
||||
|
||||
// Ligne en mode visu
|
||||
// Line in view mode
|
||||
if ($action != 'editline' || GETPOSTINT('line_id') != $objp->rowid) {
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
|
|
@ -1605,7 +1605,7 @@ if ($action == 'create') {
|
|||
print "</td>";
|
||||
} else {
|
||||
print '<td>';
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // Anchor to return to the line
|
||||
print dol_htmlentitiesbr($objp->description);
|
||||
|
||||
$objectline = new FichinterLigne($db);
|
||||
|
|
@ -1671,7 +1671,7 @@ if ($action == 'create') {
|
|||
}
|
||||
|
||||
print '<td>';
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="'.$objp->rowid.'"></a>'; // Anchor to return to the line
|
||||
|
||||
// Editeur wysiwyg
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023-2024 William Mead <william.mead@manchenumerique.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -1460,7 +1460,7 @@ class Fichinter extends CommonObject
|
|||
if ($this->status == self::STATUS_DRAFT) {
|
||||
$this->db->begin();
|
||||
|
||||
// Insertion ligne
|
||||
// Insert line
|
||||
$line = new FichinterLigne($this->db);
|
||||
|
||||
$line->fk_fichinter = $fichinterid;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2017-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2023-2024 Nick Fragoulis
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -960,7 +960,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
* @param int $fk_product Product/Service ID predefined
|
||||
* @param string $ref Ref
|
||||
* @param string $label Label
|
||||
* @param string $desc Description de la ligne
|
||||
* @param string $desc Description of the invoice line
|
||||
* @param float $pu_ht Unit price
|
||||
* @param float $pu_ttc Unit price with tax
|
||||
* @param float $qty Quantity
|
||||
|
|
@ -1148,7 +1148,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
* @param int $fk_product Product/Service ID predefined
|
||||
* @param string $ref Ref
|
||||
* @param string $label Label of the line
|
||||
* @param string $desc Description de la ligne
|
||||
* @param string $desc Description of the invoice line
|
||||
* @param float $pu_ht Unit price HT (> 0 even for credit note)
|
||||
* @param float $qty Quantity
|
||||
* @param int $remise_percent Percentage discount of the line
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2023 Nick Fragoulis
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -439,7 +439,7 @@ class SupplierInvoiceLine extends CommonObjectLine
|
|||
}
|
||||
|
||||
if (!$error) {
|
||||
// Supprime ligne
|
||||
// Delete line
|
||||
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
|
||||
$sql .= " WHERE rowid = ".((int) $this->id);
|
||||
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* Copyright (C) 2016-2023 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2020 Pierre Ardoin <mapiolca@me.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -57,7 +57,7 @@ class ProductFournisseur extends Product
|
|||
public $error = '';
|
||||
|
||||
/**
|
||||
* @var int ID of ligne product-supplier
|
||||
* @var int ID of line product-supplier
|
||||
*/
|
||||
public $product_fourn_price_id;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* Copyright (C) 2008-2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2008-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -390,7 +390,7 @@ if (!function_exists('ftp_connect')) {
|
|||
print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'§ion='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', GETPOST('file')), 'confirm_deletefile', '', '', 1);
|
||||
}
|
||||
|
||||
// Confirmation de la suppression d'une ligne categorie
|
||||
// Generate for to confirm deletion of a category line
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'§ion='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', GETPOST('file')), 'confirm_deletesection', '', '', 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2021-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Vincent de Grandpré <vincent@de-grandpre.quebec>
|
||||
* Copyright (C) 2025 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
*
|
||||
|
|
@ -1870,9 +1870,9 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
|
|||
$sql_line .= ' AND line.fk_product = '.((int) $obj_dispatch->fk_product);
|
||||
$resql_line = $db->query($sql_line);
|
||||
|
||||
// s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
|
||||
// on divise la ligne de dispatch en autant de lignes qu’on en a sur la commande pour le produit
|
||||
// et on met la quantité de la ligne dans la limit du "budget" indiqué par dispatch.qty
|
||||
// In case there are multiple line with the same product for this supplier order,
|
||||
// split the dispatch line in as many lines as there are on the order for the product,
|
||||
// and set the line quantity to a value within the limit the "budget" set in dispatch.qty
|
||||
|
||||
$remaining_qty = $obj_dispatch->qty;
|
||||
$first_iteration = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2015 Cedric GROSS <c.gross@kreiz-it.fr>
|
||||
* Copyright (C) 2015-2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -315,7 +315,7 @@ if ($action == "set") { // Test on permission not required. Already managed by
|
|||
while (!feof($fp)) {
|
||||
$buf = fgets($fp, 4096);
|
||||
|
||||
// Special case of lines allowed for some version only
|
||||
// Special case of lines allowed for some versions only
|
||||
// MySQL
|
||||
if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg)) {
|
||||
$versioncommande = explode('.', $reg[1]);
|
||||
|
|
@ -566,7 +566,7 @@ if ($action == "set") { // Test on permission not required. Already managed by
|
|||
//$db->free($resql); // Not required as request we launch here does not return memory needs.
|
||||
} else {
|
||||
if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
|
||||
//print "<tr><td>Insertion ligne : $buffer</td><td>";
|
||||
//print "<tr><td>Insert line : $buffer</td><td>";
|
||||
} else {
|
||||
$ok = 0;
|
||||
$okallfile = 0;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2015-2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -330,9 +330,9 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
|
|||
// Version to install is DOL_VERSION
|
||||
$dolibarrlastupgradeversionarray = preg_split('/[\.-]/', getDolGlobalString('MAIN_VERSION_LAST_UPGRADE', getDolGlobalString('MAIN_VERSION_LAST_INSTALL')));
|
||||
|
||||
// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
|
||||
// dans la 1ere colonne, la description de l'action a faire
|
||||
// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
|
||||
// Every migration action must return a 4 column line with:
|
||||
// - in the 1st column: the description of the action to do,
|
||||
// - in the 4th column: the text 'OK' if done, or 'AlreadyDone' si nothing is done, or 'Error'
|
||||
|
||||
$versiontoarray = explode('.', $versionto);
|
||||
$versionranarray = explode('.', DOL_VERSION);
|
||||
|
|
@ -1223,7 +1223,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
|
|||
|
||||
|
||||
/**
|
||||
* Mise a jour des contrats (gestion du contrat + detail de contrat)
|
||||
* Update the contracts (Contract Management + Contract Detail)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -1382,7 +1382,7 @@ function migrate_links_transfert($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Mise a jour des date de contrats non renseignees
|
||||
* Update missing Contract Dates
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -1522,7 +1522,7 @@ function migrate_contracts_date3($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Reouverture des contrats qui ont au moins une ligne non fermee
|
||||
* Reopen the contracts that have at least one line that is not closed (/completed).
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -1617,11 +1617,11 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
|
|||
$select_num = $db->num_rows($select_resql);
|
||||
$i = 0;
|
||||
|
||||
// Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
|
||||
// For every supplier payment, add a line to paiementfourn_facturefourn
|
||||
while (($i < $select_num) && (!$error)) {
|
||||
$select_obj = $db->fetch_object($select_resql);
|
||||
|
||||
// Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
|
||||
// Verify if the row is already in the new table - avoid adding duplicates
|
||||
$check_sql = 'SELECT fk_paiementfourn, fk_facturefourn';
|
||||
$check_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
|
||||
$check_sql .= ' WHERE fk_paiementfourn = '.((int) $select_obj->rowid).' AND fk_facturefourn = '.((int) $select_obj->fk_facture_fourn);
|
||||
|
|
@ -1829,7 +1829,7 @@ function migrate_price_propal($db, $langs, $conf)
|
|||
$remise_percent_global = $obj->remise_percent_global;
|
||||
$info_bits = $obj->info_bits;
|
||||
|
||||
// On met a jour les 3 nouveaux champs
|
||||
// Update the 3 new fields
|
||||
$propalligne = new PropaleLigne($db);
|
||||
$propalligne->fetch($rowid);
|
||||
|
||||
|
|
@ -2193,7 +2193,7 @@ function migrate_modeles($db, $langs, $conf)
|
|||
|
||||
|
||||
/**
|
||||
* Correspondence des expeditions et des commandes clients dans la table llx_co_exp
|
||||
* Relations between the Shipping and Client Order in the table llx_co_exp
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -2258,7 +2258,7 @@ function migrate_commande_expedition($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Correspondence des livraisons et des commandes clients dans la table llx_co_liv
|
||||
* Correspondence of the deliveries and the Customer Orders in the table llx_co_liv
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -2338,7 +2338,7 @@ function migrate_commande_livraison($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Migration des details commandes dans les details livraisons
|
||||
* Migrate the Order Details in the Delivery Details
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -4878,13 +4878,13 @@ function migrate_holiday_path()
|
|||
}
|
||||
|
||||
|
||||
/* A faire egalement: Modif statut paye et fk_facture des factures payes completement
|
||||
/* TODO: Modify the Paid status and `fk_facture` of the invoices paid in full
|
||||
|
||||
On recherche facture incorrecte:
|
||||
Lookup incorrect invoices:
|
||||
select f.rowid, f.total_ttc as t1, sum(pf.amount) as t2 from llx_facture as f, llx_paiement_facture as pf where pf.fk_facture=f.rowid and f.fk_statut in(2,3) and paye=0 and close_code is null group by f.rowid
|
||||
having f.total_ttc = sum(pf.amount)
|
||||
|
||||
On les corrige:
|
||||
Correct the incorrect invoices:
|
||||
update llx_facture set paye=1, fk_statut=2 where close_code is null
|
||||
and rowid in (...)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* Copyright (C) 2013-2020 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -1015,7 +1015,7 @@ while ($compteur < $num) {
|
|||
print '<td class="casevide"><input type="submit" class="button reposition" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
|
||||
}
|
||||
|
||||
//demande de confirmation pour modification de ligne
|
||||
// Ask confirmation to modify the line
|
||||
for ($i = 0; $i < $nblines; $i++) {
|
||||
if (GETPOSTISSET("modifierligne".$i)) {
|
||||
if ($compteur == $i) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -346,7 +346,7 @@ if (issetAndNoEmpty('anneeapres_x') || issetAndNoEmpty('anneeapres')) {
|
|||
}
|
||||
}
|
||||
|
||||
// valeurs du nombre de jour dans le mois et du premier jour du mois
|
||||
// Values for number of days in the month and first day of the month
|
||||
$nbrejourmois = idate("t", dol_get_first_day((int) $_SESSION["annee"], (int) $_SESSION["mois"]));
|
||||
$premierjourmois = (int) dol_print_date(dol_get_first_day((int) $_SESSION["annee"], (int) $_SESSION["mois"]), "%w") - 1;
|
||||
//var_dump(dol_get_first_day((int) $_SESSION["annee"], (int) $_SESSION["mois"]));
|
||||
|
|
@ -415,7 +415,7 @@ for ($i = 0; $i < 7; $i++) {
|
|||
|
||||
print '</tr>'."\n";
|
||||
|
||||
//ajout d'une entrée dans la variable de session qui contient toutes les dates
|
||||
// Add a field to the session variables that holds all the dates
|
||||
if (issetAndNoEmpty('choixjourajout')) {
|
||||
if (!isset($_SESSION["totalchoixjour"])) {
|
||||
$_SESSION["totalchoixjour"] = array();
|
||||
|
|
@ -433,7 +433,7 @@ if (issetAndNoEmpty('choixjourajout')) {
|
|||
}
|
||||
}
|
||||
|
||||
// Si le test est passé, alors on insere la valeur dans la variable de session qui contient les dates
|
||||
// If the validation is ok, add a field to the session variables that holds all the dates
|
||||
if ($journeuf && issetAndNoEmpty('choixjourajout') === true) {
|
||||
$choixjourajout = GETPOST("choixjourajout");
|
||||
array_push($_SESSION["totalchoixjour"], dol_mktime(0, 0, 0, $_SESSION["mois"], $choixjourajout[0], $_SESSION["annee"]));
|
||||
|
|
@ -514,12 +514,12 @@ print '<tr>'."\n";
|
|||
for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
|
||||
$numerojour = $i - $premierjourmois + 1;
|
||||
|
||||
// On saute a la ligne tous les 7 jours
|
||||
// Add new line every 7 days
|
||||
if (($i % 7) == 0 && $i != 0) {
|
||||
print '</tr><tr>'."\n";
|
||||
}
|
||||
|
||||
// On affiche les jours precedants en gris et incliquables
|
||||
// Show previous days in grey and non clickable
|
||||
if ($i < $premierjourmois) {
|
||||
print '<td class="avant"></td>'."\n";
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -500,7 +500,7 @@ while ($compteur < $num) {
|
|||
|
||||
$ensemblereponses = $obj->reponses;
|
||||
|
||||
// ligne d'un usager pré-authentifié
|
||||
// Set if line of pre-authentified user
|
||||
$mod_ok = (in_array($obj->name, $listofvoters));
|
||||
|
||||
if (!$mod_ok && !$object->allow_spy) {
|
||||
|
|
@ -513,7 +513,7 @@ while ($compteur < $num) {
|
|||
// Name
|
||||
print '<td class="nom">'.img_picto($obj->name, 'user', 'class="pictofixedwidth"').dol_htmlentities($obj->name).'</td>'."\n";
|
||||
|
||||
// si la ligne n'est pas a changer, on affiche les données
|
||||
// If the line does not need modification, show the data
|
||||
if (!$testligneamodifier) {
|
||||
for ($i = 0; $i < $nbcolonnes; $i++) {
|
||||
$car = substr($ensemblereponses, $i, 1);
|
||||
|
|
@ -672,7 +672,7 @@ while ($compteur < $num) {
|
|||
print '<td class="casevide"><input type="submit" class="button small" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
|
||||
}
|
||||
|
||||
//demande de confirmation pour modification de ligne
|
||||
// Ask for confirmation to modify the line
|
||||
for ($i = 0; $i < $nblines; $i++) {
|
||||
if (GETPOSTISSET("modifierligne".$i)) {
|
||||
if ($compteur == $i) {
|
||||
|
|
@ -843,7 +843,7 @@ if ($comments) {
|
|||
print '<br>'.img_picto('', 'note', 'class="pictofixedwidth"').'<span class="bold opacitymedium">'.$langs->trans("CommentsOfVoters").':</span><br>'."\n";
|
||||
|
||||
foreach ($comments as $obj) {
|
||||
// ligne d'un usager pré-authentifié
|
||||
// Set if line of pre-authentified user
|
||||
//$mod_ok = (in_array($obj->name, $listofvoters));
|
||||
|
||||
print '<div class="comment"><span class="usercomment">';
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2016 Yasser Carreón <yacasia@gmail.com>
|
||||
* Copyright (C) 2018 Quentin Vial-Gouteyron <quentin.vial-gouteyron@atm-consulting.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Nick Fragoulis
|
||||
*
|
||||
|
|
@ -1706,7 +1706,7 @@ if ($action == 'create' && $permissiontoadd) {
|
|||
//var_dump($dispatchLines[$indiceAsked]);
|
||||
|
||||
print '<td>';
|
||||
print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
|
||||
print '<a name="'.$line->id.'"></a>'; // Anchor to return to the line
|
||||
|
||||
print '<input type="hidden" name="productl'.$indiceAsked.'" value="'.$line->fk_product.'">';
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -91,7 +91,7 @@ $hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolG
|
|||
$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
|
||||
$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
|
||||
|
||||
// Nombre de ligne pour choix de produit/service predefinis
|
||||
// Number of line to choose predefined product/service from
|
||||
$NBLINES = 4;
|
||||
|
||||
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
|
||||
|
|
@ -1858,7 +1858,7 @@ if ($action == 'create') {
|
|||
// Confirmation delete product/service line
|
||||
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
|
||||
} elseif ($action == 'ask_subtotal_deleteline') {
|
||||
// Confirmation de la suppression d'une ligne subtotal
|
||||
// Generate form to ask confirmation to delete a subtotal line
|
||||
$langs->load("subtotals");
|
||||
$title = "DeleteSubtotalLine";
|
||||
$question = "ConfirmDeleteSubtotalLine";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
|
||||
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -386,7 +386,7 @@ class SupplierProposal extends CommonObject
|
|||
$supplier_proposalligne = new SupplierProposalLine($this->db);
|
||||
$supplier_proposalligne->fk_supplier_proposal = $this->id;
|
||||
$supplier_proposalligne->fk_remise_except = $remise->id;
|
||||
$supplier_proposalligne->desc = $remise->description; // Description ligne
|
||||
$supplier_proposalligne->desc = $remise->description; // Description of the proposal line
|
||||
$supplier_proposalligne->tva_tx = $remise->tva_tx;
|
||||
$supplier_proposalligne->subprice = -(float) $remise->amount_ht;
|
||||
$supplier_proposalligne->fk_product = 0; // Predefined Product ID
|
||||
|
|
@ -672,7 +672,7 @@ class SupplierProposal extends CommonObject
|
|||
$this->line->multicurrency_total_tva = (float) $multicurrency_total_tva;
|
||||
$this->line->multicurrency_total_ttc = (float) $multicurrency_total_ttc;
|
||||
|
||||
// Mise en option de la ligne
|
||||
// Set the proposal line as optional
|
||||
if (empty($qty) && empty($special_code)) {
|
||||
$this->line->special_code = 3;
|
||||
}
|
||||
|
|
@ -717,7 +717,7 @@ class SupplierProposal extends CommonObject
|
|||
/**
|
||||
* Update a proposal line
|
||||
*
|
||||
* @param int $rowid Id de la ligne
|
||||
* @param int $rowid Id of the row
|
||||
* @param float $pu Unit price (HT or TTC depending on price_base_type)
|
||||
* @param float $qty Quantity
|
||||
* @param float $remise_percent Discount on line
|
||||
|
|
@ -1401,7 +1401,7 @@ class SupplierProposal extends CommonObject
|
|||
$line->fk_parent_line = $objp->fk_parent_line;
|
||||
$line->product_type = $objp->product_type;
|
||||
$line->label = $objp->custom_label;
|
||||
$line->desc = $objp->description; // Description ligne
|
||||
$line->desc = $objp->description; // Description of the line
|
||||
$line->qty = $objp->qty;
|
||||
$line->tva_tx = $objp->tva_tx;
|
||||
$line->localtax1_tx = $objp->localtax1_tx;
|
||||
|
|
@ -2992,7 +2992,7 @@ class SupplierProposalLine extends CommonObjectLine
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
public $desc; // Description ligne
|
||||
public $desc; // Description of the line
|
||||
|
||||
/**
|
||||
* @var int ID
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2018-2023 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2021-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
|
|
@ -144,7 +144,7 @@ if ($object_statut != '') {
|
|||
$search_status = $object_statut;
|
||||
}
|
||||
|
||||
// Nombre de ligne pour choix de produit/service predefinis
|
||||
// Number of line to choose predefined product/service from
|
||||
$NBLINES = 4;
|
||||
|
||||
// Security check
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2004-2024 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Marc de Lima Lucio <marc-dll@user.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -3124,7 +3124,7 @@ img.photorefnoborder {
|
|||
}
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Menu top et 1ere ligne tableau */
|
||||
/* Top menu and first line of table */
|
||||
/* ============================================================================== */
|
||||
|
||||
#id-top {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2021-2023 Anthony Berton <anthony.berton@bb2a.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Marc de Lima Lucio <marc-dll@user.noreply.github.com>
|
||||
*
|
||||
|
|
@ -3184,7 +3184,7 @@ img.photorefnoborder {
|
|||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Menu top et 1ere ligne tableau */
|
||||
/* Top menu and first line of table */
|
||||
/* ============================================================================== */
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2026 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
|
||||
|
|
@ -2045,13 +2045,13 @@ class Website extends CommonObject
|
|||
}
|
||||
if ($lineContent1 !== $lineContent2) {
|
||||
if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
|
||||
// Ligne deleted de la source
|
||||
// Line deleted from the source
|
||||
$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
|
||||
} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
|
||||
// Nouvelle ligne added dans la destination
|
||||
// New line added to the target
|
||||
$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
|
||||
} else {
|
||||
// Différence found it
|
||||
// Found a difference
|
||||
$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue