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

Merge pull request #23306 from frederic34/assetnumbering

Browse Source 
fix asset numbering modules
This commit is contained in:
Laurent Destailleur 2022-12-21 21:16:05 +01:00 committed by GitHub
commit e5229f655c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/eventorganization.php
View File

@ -83,9 +83,7 @@ if ($cancel) {
$action ='';
}
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
$maskconstorder = GETPOST('maskconstorder', 'alpha');

4
htdocs/admin/hrm.php
View File

@ -70,9 +70,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
* Actions
*/
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'update') {
$max_rank = GETPOST('HRM_MAXRANK', 'int');

14
htdocs/asset/admin/setup.php
View File

@ -68,16 +68,14 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
* Actions
*/
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
$maskconstorder = GETPOST('maskconstorder', 'alpha');
$maskorder = GETPOST('maskorder', 'alpha');
$maskconst = GETPOST('maskconst', 'alpha');
$mask = GETPOST('mask', 'alpha');
if ($maskconstorder) {
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
if ($maskconst) {
$res = dolibarr_set_const($db, $maskconst, $mask, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
}
@ -206,7 +204,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
}
if ($myTmpObjectArray['includerefgeneration']) {
/*
* Orders Numbering model
* Assets Numbering model
*/
$setupnotempty++;

42
htdocs/core/modules/asset/mod_asset_advanced.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019-2022 Frédéric France <frederic.france@netlogic.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
@ -63,12 +63,12 @@ class mod_asset_advanced extends ModeleNumRefAsset
$form = new Form($db);
$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
$texte .= '<input type="hidden" name="action" value="updateMask">';
$texte .= '<input type="hidden" name="maskconstBom" value="ASSET_ASSET_ADVANCED_MASK">';
$texte .= '<table class="nobordernopadding" width="100%">';
$text = $langs->trans('GenericNumRefModelDesc')."<br>\n";
$text .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$text .= '<input type="hidden" name="token" value="'.newToken().'">';
$text .= '<input type="hidden" name="action" value="updateMask">';
$text .= '<input type="hidden" name="maskconst" value="ASSET_ADVANCED_MASK">';
$text .= '<table class="nobordernopadding" width="100%">';
$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Asset"), $langs->transnoentities("Asset"));
$tooltip .= $langs->trans("GenericMaskCodes2");
@ -77,17 +77,17 @@ class mod_asset_advanced extends ModeleNumRefAsset
$tooltip .= $langs->trans("GenericMaskCodes5");
// Parametrage du prefix
$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskAsset" value="'.getDolGlobalString('ASSET_ASSET_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
$text .= '<tr><td>'.$langs->trans("Mask").':</td>';
$text .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="mask" value="'.getDolGlobalString('ASSET_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
$text .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
$texte .= '</tr>';
$text .= '</tr>';
$texte .= '</table>';
$texte .= '</form>';
$text .= '</table>';
$text .= '</form>';
return $texte;
return $text;
}
/**
@ -102,16 +102,8 @@ class mod_asset_advanced extends ModeleNumRefAsset
$object = new Asset($db);
$object->initAsSpecimen();
/*$old_code_client = $mysoc->code_client;
$old_code_type = $mysoc->typent_code;
$mysoc->code_client = 'CCCCCCCCCC';
$mysoc->typent_code = 'TTTTTTTTTT';*/
$numExample = $this->getNextValue($object);
/*$mysoc->code_client = $old_code_client;
$mysoc->typent_code = $old_code_type;*/
if (!$numExample) {
$numExample = $langs->trans('NotConfigured');
}
@ -121,7 +113,7 @@ class mod_asset_advanced extends ModeleNumRefAsset
/**
* Return next free value
*
* @param Object $object Object we need next value for
* @param Asset $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
public function getNextValue($object)
@ -131,7 +123,7 @@ class mod_asset_advanced extends ModeleNumRefAsset
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
// We get cursor rule
$mask = getDolGlobalString('ASSET_ASSET_ADVANCED_MASK');
$mask = getDolGlobalString('ASSET_ADVANCED_MASK');
if (!$mask) {
$this->error = 'NotConfigured';
@ -140,7 +132,7 @@ class mod_asset_advanced extends ModeleNumRefAsset
$date = $object->date;
$numFinal = get_next_value($db, $mask, 'asset_asset', 'ref', '', null, $date);
$numFinal = get_next_value($db, $mask, 'asset', 'ref', '', null, $date);
return $numFinal;
}

10
htdocs/core/modules/asset/mod_asset_standard.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2022 Frédéric France <frederic.france@netlogic.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
@ -83,7 +84,8 @@ class mod_asset_standard extends ModeleNumRefAsset
{
global $conf, $langs, $db;
$coyymm = ''; $max = '';
$coyymm = '';
$max = '';
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@ -124,7 +126,7 @@ class mod_asset_standard extends ModeleNumRefAsset
// first we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."asset_asset";
$sql .= " FROM ".MAIN_DB_PREFIX."asset";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
if ($object->ismultientitymanaged == 1) {
$sql .= " AND entity = ".$conf->entity;

4
htdocs/recruitment/admin/setup.php
View File

@ -88,9 +88,7 @@ $setupnotempty = 0;
* Actions
*/
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
$maskconstjob = GETPOST('maskconstjob', 'alpha');

4
htdocs/recruitment/admin/setup_candidatures.php
View File

@ -88,9 +88,7 @@ $setupnotempty = 0;
* Actions
*/
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
$maskconstcand = GETPOST('maskconstcand', 'alpha');

5
htdocs/zapier/admin/setup.php
View File

@ -54,10 +54,7 @@ if (empty($user->admin)) accessforbidden();
* Actions
*/
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
/*
* View