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 2021-05-03 16:48:53 +02:00
commit c5449fdd66
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/societe/mod_codecompta_digitaria.php
View File

@ -207,7 +207,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) { if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type); $disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
while ($disponibility <> 0 && $i < 100) { while ($disponibility <> 0 && $i < 1000) {
$widthsupplier = $this->supplieraccountancycodecharacternumber; $widthsupplier = $this->supplieraccountancycodecharacternumber;
$widthcustomer = $this->customeraccountancycodecharacternumber; $widthcustomer = $this->customeraccountancycodecharacternumber;
@ -217,6 +217,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
if ($i >= 10 && $i <= 99) { if ($i >= 10 && $i <= 99) {
$a = 2; $a = 2;
} }
if ($i >= 100 && $i <= 999) {
$a = 3;
}
if ($type == 'supplier') { if ($type == 'supplier') {
$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i; $this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;

2
htdocs/knowledgemanagement/knowledgerecord_list.php
View File

@ -262,7 +262,7 @@ $sql .= $object->getFieldList('t');
// Add fields from extrafields // Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : ''); $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key.' as options_'.$key.', ' : '');
} }
} }
// Add fields from hooks // Add fields from hooks