lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur 2019-07-20 16:02:15 +02:00
commit f368ef377b
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/accounting-files.php
View File

@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$langs->loadLangs(array("accountancy", "bills", "companies", "salaries")); $langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta"));
$date_start =GETPOST('date_start', 'alpha'); $date_start =GETPOST('date_start', 'alpha');
$date_startDay= GETPOST('date_startday', 'int'); $date_startDay= GETPOST('date_startday', 'int');
@ -503,9 +503,9 @@ if (!empty($date_start) && !empty($date_stop))
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td align="right">'.price($totalET).'</td>'; print '<td align="right">'.price(price2num($totalET, 'MT')).'</td>';
print '<td align="right">'.price($totalIT).'</td>'; print '<td align="right">'.price(price2num($totalIT, 'MT')).'</td>';
print '<td align="right">'.price($totalVAT).'</td>'; print '<td align="right">'.price(price2num($totalVAT, 'MT')).'</td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';

2
htdocs/societe/card.php
View File

@ -2713,7 +2713,7 @@ else
$MAXEVENT = 10; $MAXEVENT = 10;
$morehtmlright.= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id); $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
// List of actions on element // List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';

13
htdocs/societe/class/societe.class.php
View File

@ -3024,7 +3024,7 @@ class Societe extends CommonObject
for ($index = 0; $index < 9; $index ++) for ($index = 0; $index < 9; $index ++)
{ {
$number = (int) $siren[$index]; $number = (int) $chaine[$index];
if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; } if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
$sum += $number; $sum += $number;
} }
@ -3066,13 +3066,16 @@ class Societe extends CommonObject
$string=preg_replace('/(\s)/', '', $string); $string=preg_replace('/(\s)/', '', $string);
$string = strtoupper($string); $string = strtoupper($string);
for ($i = 0; $i < 9; $i ++)
$num[$i] = substr($string, $i, 1);
//Check format //Check format
if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
return 0; return 0;
$num = array();
for ($i = 0; $i < 9; $i ++)
{
$num[$i] = substr($string, $i, 1);
}
//Check NIF //Check NIF
if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1)) if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
@ -4172,8 +4175,6 @@ class Societe extends CommonObject
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->error = $this->error;
$this->errors = $this->errors;
break; break;
} }
} }