Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 23:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

The entry function that manage counters accept the full objsoc instead of just objsoc->code_client. This allow more possibility to enhance it.

Browse Source
This commit is contained in:
Laurent Destailleur
2009-11-06 19:45:34 +00:00
parent 40b38892b5
commit 4a26a1248d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/lib/functions2.lib.php
View File

@@ -352,14 +352,17 @@ function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdopti
* @param unknown_type $table Table containing field with counter * @param unknown_type $table Table containing field with counter
* @param unknown_type $field Field containing already used values of counter * @param unknown_type $field Field containing already used values of counter
* @param unknown_type $where To add a filter on selection (for exemple to filter on invoice types) * @param unknown_type $where To add a filter on selection (for exemple to filter on invoice types)
* @param unknown_type $valueforccc * @param unknown_type $objsoc The company that own the object we need a counter for
* @param unknown_type $date * @param unknown_type $date Date to use for the {y},{m},{d} tags.
* @return string New value * @return string New value
*/ */
function get_next_value($db,$mask,$table,$field,$where='',$valueforccc='',$date='') function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='')
{ {
global $conf; global $conf;
if (! is_object($objsoc)) $valueforccc=$objsoc;
else $valueforccc=$objsoc->code_client;
// Clean parameters // Clean parameters
if ($date == '') $date=mktime(); // We use local year and month of PHP server to search numbers if ($date == '') $date=mktime(); // We use local year and month of PHP server to search numbers
// but we should use local year and month of user // but we should use local year and month of user
@@ -535,7 +538,6 @@ function get_next_value($db,$mask,$table,$field,$where='',$valueforccc='',$date=
$numFinal = str_replace('{y}' ,substr(date("y",$date),2,1),$numFinal); $numFinal = str_replace('{y}' ,substr(date("y",$date),2,1),$numFinal);
$numFinal = str_replace('{mm}',date("m",$date),$numFinal); $numFinal = str_replace('{mm}',date("m",$date),$numFinal);
$numFinal = str_replace('{dd}',date("d",$date),$numFinal); $numFinal = str_replace('{dd}',date("d",$date),$numFinal);
if ($maskclientcode) $numFinal = str_replace(('{'.$maskclientcode.'}'),$clientcode,$numFinal);
// Now we replace the counter // Now we replace the counter
$maskbefore='{'.$masktri.'}'; $maskbefore='{'.$masktri.'}';