lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests 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 2020-03-18 18:51:05 +01:00
commit 3b1c02ae46
10 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/images/README.md
View File

@ -10,7 +10,11 @@
https://github.com/Dolibarr/foundation
* Few icons are from http://led24.de/iconset/. This is original README file for this source:
* Few icons are / were from website led24.de
* Attention: This website is no longer available!
This is original README file for this source:
-------------------------------------------------------
You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
http://led24.de/iconset/ or http://led24.de/ would be appreciated.

36
htdocs/accountancy/class/accountancyexport.class.php
View File

@ -1088,9 +1088,23 @@ class AccountancyExport
{
$soc = $this->db->fetch_object($resql);
$address = str_replace(array("\t", "\n", "\r"), " ", $soc->address);
$address=array('','','');
if (strpos($soc->address, "\n")!==false) {
$address = explode("\n", $soc->address);
if (is_array($address) && count($address)>0) {
foreach($address as $key=>$data) {
$address[$key]=str_replace(array("\t", "\n", "\r"), "", $data);
$address[$key]=dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
}
}
} else {
$address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
$address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
$address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
}
$type_enregistrement = 'C';
//TYPE
print $type_enregistrement.$separator;
//NOCL
print $soc->code_client.$separator;
@ -1099,15 +1113,15 @@ class AccountancyExport
//LIBI
print $separator;
//TITR
print getFormeJuridiqueLabel($soc->fk_forme_juridique).$separator;
print $separator;
//RSSO
print $soc->nom.$separator;
//CAD1
print substr($address, 0, 40).$separator;
print $address[0].$separator;
//CAD2
print substr($address, 41, 40).$separator;
print $address[1].$separator;
//CAD3
print substr($address, 82, 40).$separator;
print $address[2].$separator;
//COPO
print $soc->zip.$separator;
//BUDI
@ -1129,7 +1143,7 @@ class AccountancyExport
//COMM
print $separator;
//SIRE
print $soc->siret.$separator;
print str_replace(" ", "", $soc->siret).$separator;
//RIBP
print $separator;
//DOBQ
@ -1267,8 +1281,6 @@ class AccountancyExport
} else {
print $separator;
}
// SECT
print $separator;
// CTRE
print $separator;
// NORL
@ -1286,13 +1298,13 @@ class AccountancyExport
// CDES
print $separator;
// QTUE
print '0'.$separator;
print $separator;
// MTDV
print $separator;
// CODV
print '0'.$separator;
// TXDV
// CODV
print $separator;
// TXDV
print '0'.$separator;
// MOPM
print $separator;
// BONP

10
htdocs/admin/system/about.php
View File

@ -86,31 +86,31 @@ print '</li>';
if (preg_match('/^fr_/i', $langs->getDefaultLang()))
{
print '<li>';
print '<a target="_blank" href="http://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
print '<a target="_blank" href="https://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
print '</li>';
}
if (preg_match('/^el_/i', $langs->getDefaultLang()))
{
print '<li>';
print '<a target="_blank" href="http://www.dolibarr.gr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
print '<a target="_blank" href="https://www.dolibarr.gr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
print '</li>';
}
if (preg_match('/^es_/i', $langs->getDefaultLang()))
{
print '<li>';
print '<a target="_blank" href="http://www.dolibarr.es/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
print '<a target="_blank" href="https://www.dolibarr.es/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
print '</li>';
}
if (preg_match('/^it_/i', $langs->getDefaultLang()))
{
print '<li>';
print '<a target="_blank" href="http://www.dolibarr.it/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
print '<a target="_blank" href="https://www.dolibarr.it/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
print '</li>';
}
if (preg_match('/^de_/i', $langs->getDefaultLang()))
{
print '<li>';
print '<a target="_blank" href="http://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
print '<a target="_blank" href="https://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
print '</li>';
}
print '<li>';

26
htdocs/core/class/fiscalyear.class.php
View File

@ -1,5 +1,7 @@
<?php
/* Copyright (C) 2014-2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
/* Copyright (C) 2014-2020 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2020 OScss-Shop <support@oscss-shop.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
@ -381,13 +383,19 @@ class Fiscalyear extends CommonObject
* @param int $dateend Date end to scan
* @return string Number of entries
*/
public function getAccountancyEntriesByFiscalYear($datestart, $dateend)
public function getAccountancyEntriesByFiscalYear($datestart = '', $dateend = '')
{
global $conf;
if(empty($datestart) )
$datestart = $this->date_start;
if(empty($dateend) )
$dateend = $this->date_end;
$sql = "SELECT count(DISTINCT piece_num) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
$resql=$this->db->query($sql);
if ($resql)
@ -407,13 +415,19 @@ class Fiscalyear extends CommonObject
* @param int $dateend Date end to scan
* @return string Number of movements
*/
public function getAccountancyMovementsByFiscalYear($datestart, $dateend)
public function getAccountancyMovementsByFiscalYear($datestart = '', $dateend = '')
{
global $conf;
if(empty($datestart) )
$datestart = $this->date_start;
if(empty($dateend) )
$dateend = $this->date_end;
$sql = "SELECT count(rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
$resql=$this->db->query($sql);
if ($resql)

7
htdocs/includes/adodbtime/README.txt Normal file
View File

@ -0,0 +1,7 @@
README
======
ADOdb Date Library, part of the ADOdb abstraction library
See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index
Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php

5
htdocs/includes/adodbtime/adodb-time.inc.php
View File

@ -1,7 +1,8 @@
<?php
/**
ADOdb Date Library, part of the ADOdb abstraction library
Download: http://phplens.com/phpeverywhere/
ADOdb Date Library, part of the ADOdb abstraction library
See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index
Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php
PHP native date functions use integer timestamps for computations.
Because of this, dates are restricted to the years 1901-2038 on Unix

5
htdocs/includes/geoip2/README.txt Normal file
View File

@ -0,0 +1,5 @@
README
https://dev.maxmind.com/geoip/geoip2/geolite2/
License: https://creativecommons.org/licenses/by-sa/4.0/

5
htdocs/includes/jquery/README.txt Normal file
View File

@ -0,0 +1,5 @@
README:
jQuery is a JavaScript library
https://jquery.com/
https://jquery.com/download/

2
htdocs/includes/tcpdi/tcpdi.php
View File

@ -9,7 +9,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

8
htdocs/user/admin/user_extrafields.php
View File

@ -60,7 +60,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject=$langs->transnoentitiesnoconv("Users");
$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
llxHeader('', $langs->trans("UsersSetup"), $help_url);
@ -88,8 +88,8 @@ if ($action != 'create' && $action != 'edit')
/* ************************************************************************** */
/* */
/* Creation d'un champ optionnel
/* */
/* Creation of an optional field */
/* */
/* ************************************************************************** */
if ($action == 'create')
@ -102,7 +102,7 @@ if ($action == 'create')
/* ************************************************************************** */
/* */
/* Edition d'un champ optionnel */
/* Editing an optional field */
/* */
/* ************************************************************************** */
if ($action == 'edit' && ! empty($attrname))