Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2021-11-11 15:13:39 +01:00
parent 66f1dd8545 e46e622049
commit c5f3f42867
38 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SECURITY.md
View File

@@ -12,8 +12,7 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
## Reporting a Vulnerability ## Reporting a Vulnerability
To report a vulnerability, please use GitHub security advisory at https://github.com/Dolibarr/dolibarr/security/advisories/new (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody) To report a vulnerability, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
## Hunting vulnerabilities on Dolibarr ## Hunting vulnerabilities on Dolibarr
@@ -23,7 +22,7 @@ If you believe you've found a security bug in our service, we are happy to work
Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure. Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application. We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
### User Agent ### User Agent
@@ -31,8 +30,7 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
### Account access ### Account access
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
## Eligibility and Responsible Disclosure ## Eligibility and Responsible Disclosure
@@ -46,7 +44,6 @@ You must avoid tests that could cause degradation or interruption of our service
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability. You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
## Scope for qualified vulnerabilities ## Scope for qualified vulnerabilities
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid": ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
@@ -64,7 +61,6 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
Scope is the web application (back office) and the APIs. Scope is the web application (back office) and the APIs.
## Qualifying vulnerabilities for reporting ## Qualifying vulnerabilities for reporting
* Remote code execution (RCE) * Remote code execution (RCE)
@@ -81,7 +77,6 @@ Scope is the web application (back office) and the APIs.
* Software version disclosure (for non admin users only) * Software version disclosure (for non admin users only)
* Stack traces or path disclosure (for non admin users only) * Stack traces or path disclosure (for non admin users only)
## Non-qualifying vulnerabilities for reporting ## Non-qualifying vulnerabilities for reporting
* "Self" XSS * "Self" XSS
@@ -99,4 +94,3 @@ Scope is the web application (back office) and the APIs.
* Software version or private IP disclosure when logged user is admin * Software version or private IP disclosure when logged user is admin
* Stack traces or path disclosure when logged user is admin * Stack traces or path disclosure when logged user is admin
* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities". * Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".

2
dev/initdemo/sftpget_and_loaddump.php
View File

@@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
dev/initdemo/updatedemo.php
View File

@@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
dev/translation/sanity_check_en_langfiles.php
View File

@@ -6,7 +6,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
dev/translation/strip_language_file.php
View File

@@ -5,7 +5,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/accountancy/class/lettering.class.php
View File

@@ -6,7 +6,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/admin/expensereport_ik.php
View File

@@ -5,7 +5,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/admin/expensereport_rules.php
View File

@@ -6,7 +6,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/compta/bank/account_statement_document.php
View File

@@ -8,7 +8,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/compta/bank/document.php
View File

@@ -7,7 +7,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

6
htdocs/compta/cashcontrol/cashcontrol_card.php
View File

@@ -128,7 +128,7 @@ if (GETPOST('cancel', 'alpha')) {
if ($action == "reopen") { if ($action == "reopen") {
$result = $object->setStatut($object::STATUS_DRAFT, null, '', 'CASHFENCE_REOPEN'); $result = $object->setStatut($object::STATUS_DRAFT, null, '', 'CASHFENCE_REOPEN');
if ($result < 0) { if ($result < 0) {
dol_print_error($db, $object->error, $object->error); setEventMessages($object->error, $object->error, 'errors');
} }
$action = 'view'; $action = 'view';
@@ -312,7 +312,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
} elseif ($syear && $smonth && $sday) { } elseif ($syear && $smonth && $sday) {
$sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'"; $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
} else { } else {
dol_print_error('', 'Year not defined'); setEventMessages($langs->trans('YearNotDefined'), null, 'errors');
} }
$resql = $db->query($sql); $resql = $db->query($sql);
@@ -356,7 +356,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
} elseif ($syear && $smonth && $sday) { } elseif ($syear && $smonth && $sday) {
$sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'"; $sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
} else { } else {
dol_print_error('', 'Year not defined'); setEventMessages($langs->trans('YearNotDefined'), null, 'errors');
} }
$resql = $db->query($sql); $resql = $db->query($sql);

4
htdocs/core/class/commondocgenerator.class.php
View File

@@ -492,7 +492,7 @@ abstract class CommonDocGenerator
$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT') $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT')
); );
if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) { if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs); $resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount()); $resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
} else { } else {
@@ -539,7 +539,7 @@ abstract class CommonDocGenerator
// Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object) // Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object)
$resarray['object_total_up'] = $totalUp; $resarray['object_total_up'] = $totalUp;
$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs); $resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) { if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
$totalDiscount = $object->getTotalDiscount(); $totalDiscount = $object->getTotalDiscount();
} else { } else {
$totalDiscount = 0; $totalDiscount = 0;

2
htdocs/core/class/html.form.class.php
View File

@@ -1926,7 +1926,7 @@ class Form
$sql .= " WHERE u.entity IS NOT NULL"; $sql .= " WHERE u.entity IS NOT NULL";
} }
} else { } else {
if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql .= " ON ug.fk_user = u.rowid"; $sql .= " ON ug.fk_user = u.rowid";
$sql .= " WHERE ug.entity = ".$conf->entity; $sql .= " WHERE ug.entity = ".$conf->entity;

3
htdocs/fourn/commande/dispatch.php
View File

@@ -12,7 +12,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@@ -22,7 +22,6 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
* or see https://www.gnu.org/
*/ */
/** /**

2
htdocs/holiday/month_report.php
View File

@@ -6,7 +6,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/data/llx_c_units.sql
View File

@@ -6,7 +6,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
View File

@@ -5,7 +5,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_exp_tax_range.sql
View File

@@ -5,7 +5,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_category.sql
View File

@@ -3,7 +3,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_severity.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_ticket_type.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_units.key.sql
View File

@@ -4,7 +4,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_c_units.sql
View File

@@ -5,7 +5,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_expensereport_ik.sql
View File

@@ -5,7 +5,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_expensereport_rules.sql
View File

@@ -4,7 +4,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
View File

@@ -5,7 +5,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

2
htdocs/install/mysql/tables/llx_ticket_extrafields.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or -- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version. -- (at your option) any later version.
-- --
-- This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,

1
htdocs/langs/en_US/cashdesk.lang
View File

@@ -133,3 +133,4 @@ SplitSale=Split sale
PrintWithoutDetailsButton=Add "Print without details" button PrintWithoutDetailsButton=Add "Print without details" button
PrintWithoutDetailsLabelDefault=Line label by default on printing without details PrintWithoutDetailsLabelDefault=Line label by default on printing without details
PrintWithoutDetails=Print without details PrintWithoutDetails=Print without details
YearNotDefined=Year is not defined

5
htdocs/loan/calcmens.php
View File

@@ -5,7 +5,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program. If not, see <https://www.gnu.org/licenses/>.
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**

2
htdocs/modulebuilder/template/core/boxes/README.md
View File

@@ -1 +1 @@
Directory where widgets files are stored. # Directory where widgets files are stored

8
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
View File

@@ -55,9 +55,9 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
/** /**
* Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings * Displays the filter form that appears in the mailing recipient selection page
* *
* @return string Retourne zone select * @return string Return select zone
*/ */
public function formFilter() public function formFilter()
{ {
@@ -83,7 +83,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
/** /**
* Renvoie url lien vers fiche de la source du destinataire du mailing * Returns url link to file of the source of the recipient of the mailing
* *
* @param int $id ID * @param int $id ID
* @return string Url lien * @return string Url lien
@@ -115,7 +115,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
} }
$sql .= " ORDER BY email"; $sql .= " ORDER BY email";
// Stocke destinataires dans target // Store recipients in target
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);

2
htdocs/public/ticket/create_ticket.php
View File

@@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
htdocs/supplier_proposal/document.php
View File

@@ -75,7 +75,7 @@ if ($object->id > 0) {
$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
} }
$permissiontoadd = $user->rights->supplier_proposal->creer;
/* /*
* Actions * Actions