Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into socialnetworks
Browse files Browse the repository at this point in the history
  • Loading branch information
@frederic34
frederic34 committed Oct 1, 2019
2 parents 26c3419 + 68055e5 commit aca9d92
Show file tree
Hide file tree
Showing 2,726 changed files with 3,446 additions and 3,381 deletions.
6 changes: 3 additions & 3 deletions COPYING
View file
Expand Up @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/philosophy/why-not-lgpl.html>.
4 changes: 2 additions & 2 deletions COPYRIGHT
View file
Expand Up @@ -5,7 +5,7 @@ License
Dolibarr is released under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 3 of the License,
or (at your option) any later version (GPL-3+).
More information: http://www.gnu.org/licenses/gpl-3.0.txt
More information: https://www.gnu.org/licenses/gpl-3.0.txt

Dolibarr uses some external libraries released under different licenses. This is compatibility summary:

Expand Down Expand Up @@ -64,7 +64,7 @@ Fontawesome 5.7.2 Font Awesome Free licence Yes


For licenses compatibility informations:
http://www.gnu.org/licenses/licenses.en.html
https://www.gnu.org/licenses/licenses.en.html


Copyright / Authors
Expand Down
2 changes: 1 addition & 1 deletion build/debian/copyright
View file
Expand Up @@ -338,7 +338,7 @@ License: GPL-2+
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
Expand Down
6 changes: 3 additions & 3 deletions build/doxygen/dolibarr-doxygen.doxyfile
View file
Expand Up @@ -18,7 +18,7 @@
# that follow. The default is UTF-8 which is also the encoding used for all
# text before the first occurrence of this tag. Doxygen uses libiconv (or the
# iconv built into libc) for the transcoding. See
# http://www.gnu.org/software/libiconv for the list of possible encodings.
# https://www.gnu.org/software/libiconv for the list of possible encodings.

DOXYFILE_ENCODING = UTF-8

Expand Down Expand Up @@ -587,7 +587,7 @@ INPUT = ../../htdocs ../../scripts
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
# also the default input encoding. Doxygen uses libiconv (or the iconv built
# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
# the list of possible encodings.

INPUT_ENCODING = UTF-8
Expand Down Expand Up @@ -737,7 +737,7 @@ REFERENCES_LINK_SOURCE = YES
# If the USE_HTAGS tag is set to YES then the references to source code
# will point to the HTML generated by the htags(1) tool instead of doxygen
# built-in source browser. The htags tool is part of GNU's global source
# tagging system (see http://www.gnu.org/software/global/global.html). You
# tagging system (see https://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.

USE_HTAGS = NO
Expand Down
2 changes: 1 addition & 1 deletion build/exe/doliwamp/config.inc.php.install
View file
Expand Up @@ -402,7 +402,7 @@ $cfg['RecodingEngine'] = 'auto';

// Specify some parameters for iconv used in charset conversion. See iconv
// documentation for details:
// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
// https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
$cfg['IconvExtraParams'] = '//TRANSLIT';

// Available charsets for MySQL conversion. currently contains all which could
Expand Down
2 changes: 1 addition & 1 deletion dev/initdemo/sftpget_and_loaddump.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
* or see https://www.gnu.org/
*
* Get a distant dump file and load it into a mysql database
*/
Expand Down
2 changes: 1 addition & 1 deletion dev/initdemo/updatedemo.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
* or see https://www.gnu.org/
*
* Get a distant dump file and load it into a mysql database
*/
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/test/testutf.php
View file
Expand Up @@ -43,7 +43,7 @@
* @author Nicola Asuni
* @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
* @license https://www.gnu.org/copyleft/lesser.html LGPL
* @since 2008-09-15
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/account.php
View file
Expand Up @@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/accountmodel.php
View file
Expand Up @@ -23,7 +23,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/card.php
View file
Expand Up @@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/categories.php
View file
Expand Up @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/categories_list.php
View file
Expand Up @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/closure.php
View file
Expand Up @@ -12,7 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/defaultaccounts.php
View file
Expand Up @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/export.php
View file
Expand Up @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/fiscalyear.php
View file
Expand Up @@ -12,7 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/fiscalyear_card.php
View file
Expand Up @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/fiscalyear_info.php
View file
Expand Up @@ -12,7 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/index.php
View file
Expand Up @@ -19,7 +19,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions htdocs/accountancy/admin/journals_list.php
View file
Expand Up @@ -12,7 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down Expand Up @@ -529,7 +529,7 @@
print '</td>';
print '</tr>';
*/

// Title of lines
print '<tr class="liste_titre liste_titre_add">';
foreach ($fieldlist as $field => $value)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/admin/productaccount.php
View file
Expand Up @@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/balance.php
View file
Expand Up @@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/balancebymonth.php
View file
Expand Up @@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/card.php
View file
Expand Up @@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/list.php
View file
Expand Up @@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/listbyaccount.php
View file
Expand Up @@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
View file
Expand Up @@ -17,7 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
View file
Expand Up @@ -17,7 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/accountancycategory.class.php
View file
Expand Up @@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/accountancyexport.class.php
View file
Expand Up @@ -22,7 +22,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/accountancysystem.class.php
View file
Expand Up @@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/accountingaccount.class.php
View file
Expand Up @@ -17,7 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/accountingjournal.class.php
View file
Expand Up @@ -12,7 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/bookkeeping.class.php
View file
Expand Up @@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/class/lettering.class.php
View file
Expand Up @@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/customer/card.php
View file
Expand Up @@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/customer/index.php
View file
Expand Up @@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

Expand Down

0 comments on commit aca9d92

Please sign in to comment.