Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
bfcc8449c8
16 changed files with 52 additions and 54 deletions
|
|
@ -3,7 +3,7 @@ exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.(?!github/workflows)[^/]*/.*))$
|
|||
repos:
|
||||
# Several miscellaneous checks and fix (on yaml files, end of files fix)
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.6.0
|
||||
rev: v5.0.0
|
||||
hooks:
|
||||
# This hook tests the name of the branch and return an error if the name is
|
||||
# 'develop' or an official version 'x.y'
|
||||
|
|
@ -60,13 +60,13 @@ repos:
|
|||
|
||||
# Gitleaks is a SAST tool for detecting and preventing hardcoded secrets like passwords, api keys, and tokens in git repos
|
||||
- repo: https://github.com/gitleaks/gitleaks.git
|
||||
rev: v8.16.1
|
||||
rev: v8.24.0
|
||||
hooks:
|
||||
- id: gitleaks
|
||||
|
||||
# Check github actions
|
||||
- repo: https://github.com/rhysd/actionlint
|
||||
rev: v1.7.3
|
||||
rev: v1.7.7
|
||||
hooks:
|
||||
- id: actionlint
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ repos:
|
|||
|
||||
# Prettier (format code, only for non common files)
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: v3.0.3
|
||||
rev: v3.1.0
|
||||
hooks:
|
||||
- id: prettier
|
||||
stages: [manual]
|
||||
|
|
@ -191,7 +191,7 @@ repos:
|
|||
|
||||
# Check format of yaml files
|
||||
- repo: https://github.com/adrienverge/yamllint.git
|
||||
rev: v1.35.1
|
||||
rev: v1.36.2
|
||||
hooks:
|
||||
- id: yamllint
|
||||
args:
|
||||
|
|
@ -201,7 +201,7 @@ repos:
|
|||
|
||||
# Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
|
||||
- repo: https://github.com/codespell-project/codespell
|
||||
rev: v2.3.0
|
||||
rev: v2.4.1
|
||||
hooks:
|
||||
- id: codespell
|
||||
# Due to a current limitation of configuration files,
|
||||
|
|
@ -251,7 +251,7 @@ repos:
|
|||
|
||||
# Check sql file syntax
|
||||
- repo: https://github.com/sqlfluff/sqlfluff
|
||||
rev: 3.1.0
|
||||
rev: 3.3.1
|
||||
hooks:
|
||||
- id: sqlfluff-lint
|
||||
stages: [pre-commit, manual] # manual needed for ci
|
||||
|
|
|
|||
|
|
@ -1005,7 +1005,6 @@ INVOICE_USE_RETAINED_WARRANTY
|
|||
INVOICE_USE_SITUATION
|
||||
INVOICE_USE_SITUATION_CREDIT_NOTE
|
||||
ImpossibleToContactAuthority
|
||||
InputValueIsNotAnNumber
|
||||
InterDate
|
||||
Inventory Code
|
||||
InvoiceReplace
|
||||
|
|
@ -1067,7 +1066,6 @@ ReceptionValidated
|
|||
Recruited
|
||||
Ref. Product
|
||||
RefNewContract
|
||||
Societe
|
||||
Stable
|
||||
Suggested
|
||||
TicketMessageMailSignatureText
|
||||
|
|
@ -1087,14 +1085,9 @@ Vat
|
|||
VirtualHost
|
||||
WEBPORTAL_ROOT_URL
|
||||
WEBPORTAL_USER_LOGGED2
|
||||
XSubsriptionError
|
||||
email
|
||||
id
|
||||
multicurrency_buyPriceInCurrency
|
||||
multicurrency_modifyRateApplication
|
||||
ref
|
||||
smsing
|
||||
societe
|
||||
target
|
||||
titre
|
||||
type
|
||||
|
|
|
|||
|
|
@ -361,22 +361,20 @@ print load_fiche_titre($title, $linkback, 'accountancy');
|
|||
|
||||
|
||||
// Show message if accountancy hidden options are activated to help to resolve some problems
|
||||
if (!$user->admin) {
|
||||
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_COMPANY_PERENTITY_SHARED") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_PRODUCT_PERENTITY_SHARED") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_COMPANY_PERENTITY_SHARED") . '</div>';
|
||||
}
|
||||
if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
|
||||
print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_PRODUCT_PERENTITY_SHARED") . '</div>';
|
||||
}
|
||||
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright (C) 2009-2017 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2014-2018 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2015-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2015-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2018-2019 Thibault FOUCART <support@ptibogxiv.net>
|
||||
|
|
@ -546,8 +546,8 @@ class Adherent extends CommonObject
|
|||
if ($this->civility_id) {
|
||||
$infos .= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
|
||||
}
|
||||
$infos .= $langs->transnoentities("id").": ".$this->id."\n";
|
||||
$infos .= $langs->transnoentities("ref").": ".$this->ref."\n";
|
||||
$infos .= $langs->transnoentities("Id").": ".$this->id."\n";
|
||||
$infos .= $langs->transnoentities("Ref").": ".$this->ref."\n";
|
||||
$infos .= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
|
||||
$infos .= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
|
||||
$infos .= $langs->transnoentities("Company").": ".$this->company."\n";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2013-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2014-2016 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2018-2024 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2021-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2021-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
|
||||
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
|
|
@ -381,7 +381,7 @@ if (empty($reshook)) {
|
|||
setEventMessages($langs->trans("XSubsriptionCreated", $nbcreated), null, 'mesgs');
|
||||
$db->commit();
|
||||
} else {
|
||||
setEventMessages($langs->trans("XSubsriptionError", $error), null, 'mesgs');
|
||||
setEventMessages($langs->trans("XSubsriptionErrors", $error), null, 'mesgs');
|
||||
$db->rollback();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,6 +201,12 @@ if (!empty($hashp)) {
|
|||
$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
|
||||
}
|
||||
$entity = $ecmfile->entity;
|
||||
if (isModEnabled('multicompany') && !empty($ecmfile->src_object_type) && $ecmfile->src_object_id > 0) {
|
||||
$object = fetchObjectByElement($ecmfile->src_object_id, $ecmfile->src_object_type);
|
||||
if (is_object($object) && $object->id > 0) {
|
||||
$entity = $object->entity;
|
||||
}
|
||||
}
|
||||
if ($entity != $conf->entity) {
|
||||
$conf->entity = $entity;
|
||||
$conf->setValues($db);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
-- Copyright (C) 2024 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
-- Copyright (C) 2024 Udo Tamm <dev@dolibit.de>
|
||||
-- Copyright (C) 2024 Regis Houssin <regis.houssin@inodbox.com>
|
||||
-- Copyright (C) 2024 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
-- Copyright (C) 2024 Udo Tamm <dev@dolibit.de>
|
||||
-- Copyright (C) 2024 Regis Houssin <regis.houssin@inodbox.com>
|
||||
--
|
||||
|
||||
-- License
|
||||
|
|
@ -38,7 +38,7 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
|
|||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'instagram', 'Instagram', 'https://www.instagram.com/{socialid}', 'fa-instagram', 1);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'linkedin', 'LinkedIn', 'https://www.linkedin.com/in/{socialid}', 'fa-linkedin', 1);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'mastodon', 'Mastodon', '{socialid}', '', 0);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'mastodon', 'Mastodon', '{socialid}', 'fa-mastodon', 0);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'meetup', 'Meetup', '{socialid}', 'fa-meetup', 0);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'periscope', 'Periscope', '{socialid}', '', 0);
|
||||
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES (__ENTITY__, 'pinterest', 'Pinterest', '{socialid}', 'fa-pinterest', 0);
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ ChangeBinding=Change the binding
|
|||
Accounted=Accounted in ledger
|
||||
NotYetAccounted=Not yet transferred to accounting
|
||||
ShowTutorial=Show Tutorial
|
||||
ClickOnUseTutorialForHelp=Welcome on the section to generate your accountancy. Click on the link "%s" to get advices on how to use it.
|
||||
ClickOnUseTutorialForHelp=Welcome on the section to generate your accountancy. Click on the link "%s" to get advice on how to use it.
|
||||
NotReconciled=Not reconciled
|
||||
WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
|
||||
AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
|
||||
|
|
|
|||
|
|
@ -2641,7 +2641,7 @@ communityRepo=Community repository
|
|||
online=Online
|
||||
NotConnected=Not connected
|
||||
HTTPHeaderEditor=This page allows you to edit security related HTTP headers
|
||||
ReservedToAdvancedUsers=It is reserverd for advanced users
|
||||
ReservedToAdvancedUsers=It is reserved for advanced users
|
||||
HTTPHeader=HTTP Header
|
||||
itemFound=%s Items found
|
||||
SearchStringMinLength=Search string must be at least 2 characters
|
||||
|
|
|
|||
|
|
@ -682,4 +682,5 @@ PaymentMadeForSeveralInvoices=Payment made for several invoices
|
|||
SituationInvoiceProgressCurrent=Invoice progress
|
||||
CumulativeProgression=Cumulative progress
|
||||
INVOICE_ADD_EPC_QR_CODEPay=Scan this QR code to pay with a smartphone supporting payment with EPC QR code.
|
||||
InputValueIsNotAnNumber=Input value is not a number
|
||||
LimitDepositInvoicePossibilityForConsistency=Limit deposit invoice type to keep consistencies between lines (from proposals or orders)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
BackToDolibarr=Go back to Dolibarr
|
||||
WelcomeToDocumentation=Welcome to UI Documentation. This section is under developpement,
|
||||
WelcomeToDocumentation=Welcome to UI Documentation. This section is under development,
|
||||
DocumentationHome=UI Documentation
|
||||
DocBasicUsage=Basic usage
|
||||
|
||||
# Components
|
||||
DocComponentsTitle=Components
|
||||
DocComponentsMainDescription=Components section description is under developpment
|
||||
DocComponentsMainDescription=Components section description is under development
|
||||
|
||||
# Badges
|
||||
DocBadgeTitle=Badges
|
||||
|
|
@ -97,5 +97,5 @@ DocSelectInputsDescription = Select input to enter one value
|
|||
DocMultiSelectInputsDescription = Multiselect input to enter several values
|
||||
DocEditorInputsDescription = Editor input to enter text with HTML
|
||||
DocDateSelectInputsDescription = Date input to enter a date with or without hours
|
||||
DocInputsMainDescription = Documentation and exemples for inputs
|
||||
DocInputsMainDescription = Documentation and examples for inputs
|
||||
DocInputsTitle = Inputs
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2006-2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2012 J. Fernando Lagrange <fernando@demo-tic.org>
|
||||
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2021 Waël Almoman <info@almoman.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
|
|
@ -204,7 +204,7 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
|
|||
}
|
||||
if (!GETPOST('societe')) {
|
||||
$error++;
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("societe"))."<br>\n";
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"))."<br>\n";
|
||||
}
|
||||
if (!GETPOST('lastname')) {
|
||||
$error++;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2021 Dorian Vabre <dorian.vabre@gmail.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.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
|
||||
|
|
@ -232,7 +232,7 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
|
|||
}
|
||||
if (!GETPOST("societe")) {
|
||||
$error++;
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"))."<br>\n";
|
||||
}
|
||||
if (!GETPOST("label")) {
|
||||
$error++;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2021 Dorian Vabre <dorian.vabre@gmail.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.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
|
||||
|
|
@ -233,7 +233,7 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
|
|||
}
|
||||
if (!GETPOST("societe")) {
|
||||
$error++;
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
|
||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"))."<br>\n";
|
||||
}
|
||||
if (!GETPOST("label")) {
|
||||
$error++;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr>
|
||||
* Copyright (C) 2023 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.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
|
||||
|
|
@ -237,7 +237,7 @@ if (empty($reshook)) {
|
|||
// Check email address
|
||||
if (!empty($origin_email) && !isValidEmail($origin_email)) {
|
||||
$error++;
|
||||
array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
|
||||
array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("Email")));
|
||||
$action = '';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ processes = -1
|
|||
#verbose = 1
|
||||
#exclude_rules = "LT01,CP01,RF04"
|
||||
# RF04 | Keywords should not be used as identifiers. (rowid, login, position, ...)
|
||||
exclude_rules = "LT01,LT02,LT05,LT12,LT13,CP01,CP02,CP04,CP05,RF04"
|
||||
exclude_rules = "LT01,LT02,LT05,LT12,LT13,LT14,CP01,CP02,CP04,CP05,RF04"
|
||||
dialect = "mysql"
|
||||
# Default byte limit is 20000, must set limit - some files are too big.
|
||||
large_file_skip_byte_limit = 100000
|
||||
|
|
|
|||
Loading…
Reference in a new issue