Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
6f7f4b6b
Commit
6f7f4b6b
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Doxygen
parent
38ca31cf
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/class/html.form.class.php
+21
-18
21 additions, 18 deletions
htdocs/core/class/html.form.class.php
with
21 additions
and
18 deletions
htdocs/core/class/html.form.class.php
+
21
−
18
View file @
6f7f4b6b
...
@@ -796,7 +796,7 @@ class Form
...
@@ -796,7 +796,7 @@ class Form
* @param int $socid Id ot third party or 0 for all
* @param int $socid Id ot third party or 0 for all
* @param string $selected Id contact pre-selectionne
* @param string $selected Id contact pre-selectionne
* @param string $htmlname Name of HTML field ('none' for a not editable field)
* @param string $htmlname Name of HTML field ('none' for a not editable field)
* @param int $show
_
empty 0=no empty value, 1=add an empty value
* @param int $showempty
0=no empty value, 1=add an empty value
* @param string $exclude List of contacts id to exclude
* @param string $exclude List of contacts id to exclude
* @param string $limitto Disable answers that are not id in this array list
* @param string $limitto Disable answers that are not id in this array list
* @param string $showfunction Add function into label
* @param string $showfunction Add function into label
...
@@ -1059,7 +1059,7 @@ class Form
...
@@ -1059,7 +1059,7 @@ class Form
* @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell
* @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell
* @param int $finished 2=all, 1=finished, 0=raw material
* @param int $finished 2=all, 1=finished, 0=raw material
* @param string $selected_input_value Value of preselected input text (with ajax)
* @param string $selected_input_value Value of preselected input text (with ajax)
* @param int $hide
_
label Hide label
* @param int $hidelabel Hide label
* @return void
* @return void
*/
*/
function
select_produits
(
$selected
=
''
,
$htmlname
=
'productid'
,
$filtertype
=
''
,
$limit
=
20
,
$price_level
=
0
,
$status
=
1
,
$finished
=
2
,
$selected_input_value
=
''
,
$hidelabel
=
0
)
function
select_produits
(
$selected
=
''
,
$htmlname
=
'productid'
,
$filtertype
=
''
,
$limit
=
20
,
$price_level
=
0
,
$status
=
1
,
$finished
=
2
,
$selected_input_value
=
''
,
$hidelabel
=
0
)
...
@@ -1338,14 +1338,14 @@ class Form
...
@@ -1338,14 +1338,14 @@ class Form
/**
/**
* Return list of suppliers products
* Return list of suppliers products
*
*
* @param
socid Id societe fournisseur (0 pour aucun filtre)
* @param
int $
socid Id societe fournisseur (0 pour aucun filtre)
* @param
selected
Produit pre-selectionne
* @param
int $
selected Produit pre-selectionne
* @param
htmlname
Nom de la zone select
* @param
string $
htmlname Nom de la zone select
* @param
filtertype
Filter on product type (''=nofilter, 0=product, 1=service)
* @param
string $
filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* @param
filtre
Pour filtre sql
* @param
string $
filtre Pour filtre sql
* @param
filterkey
Filtre des produits
* @param
string $
filterkey Filtre des produits
* @param
statu
s
-1=Return all products, 0=Products not on sell, 1=Products on sell
* @param
int $
statu
t
-1=Return all products, 0=Products not on sell, 1=Products on sell
* @param
disableout
Disable print output
* @param
int $
disableout Disable print output
* @return array Array of keys for json
* @return array Array of keys for json
*/
*/
function
select_produits_fournisseurs_do
(
$socid
,
$selected
=
''
,
$htmlname
=
'productid'
,
$filtertype
=
''
,
$filtre
=
''
,
$filterkey
=
''
,
$statut
=-
1
,
$disableout
=
0
)
function
select_produits_fournisseurs_do
(
$socid
,
$selected
=
''
,
$htmlname
=
'productid'
,
$filtertype
=
''
,
$filtre
=
''
,
$filterkey
=
''
,
$statut
=-
1
,
$disableout
=
0
)
...
@@ -1769,7 +1769,7 @@ class Form
...
@@ -1769,7 +1769,7 @@ class Form
$tmparray
[
$obj
->
rowid
][
'label'
]
=
$label
;
$tmparray
[
$obj
->
rowid
][
'label'
]
=
$label
;
$i
++
;
$i
++
;
}
}
$this
->
cache_demand_reason
=
dol_sort_array
(
$tmparray
,
'label'
,
$order
=
'asc'
);
$this
->
cache_demand_reason
=
dol_sort_array
(
$tmparray
,
'label'
,
'asc'
);
unset
(
$tmparray
);
unset
(
$tmparray
);
return
1
;
return
1
;
...
@@ -2118,6 +2118,7 @@ class Form
...
@@ -2118,6 +2118,7 @@ class Form
* @param string $selectedchoice "" or "no" or "yes"
* @param string $selectedchoice "" or "no" or "yes"
* @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No
* @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No
* @param int $height Force height of box
* @param int $height Force height of box
* @param int $width Force width of box
* @return void
* @return void
*/
*/
function
form_confirm
(
$page
,
$title
,
$question
,
$action
,
$formquestion
=
''
,
$selectedchoice
=
""
,
$useajax
=
0
,
$height
=
170
,
$width
=
500
)
function
form_confirm
(
$page
,
$title
,
$question
,
$action
,
$formquestion
=
''
,
$selectedchoice
=
""
,
$useajax
=
0
,
$height
=
170
,
$width
=
500
)
...
@@ -2136,6 +2137,7 @@ class Form
...
@@ -2136,6 +2137,7 @@ class Form
* @param string $selectedchoice "" or "no" or "yes"
* @param string $selectedchoice "" or "no" or "yes"
* @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx
* @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx
* @param int $height Force height of box
* @param int $height Force height of box
* @param int $width Force width of bow
* @return string 'ajax' if a confirm ajax popup is shown, 'html' if it's an html form
* @return string 'ajax' if a confirm ajax popup is shown, 'html' if it's an html form
*/
*/
function
formconfirm
(
$page
,
$title
,
$question
,
$action
,
$formquestion
=
''
,
$selectedchoice
=
""
,
$useajax
=
0
,
$height
=
170
,
$width
=
500
)
function
formconfirm
(
$page
,
$title
,
$question
,
$action
,
$formquestion
=
''
,
$selectedchoice
=
""
,
$useajax
=
0
,
$height
=
170
,
$width
=
500
)
...
@@ -2499,7 +2501,7 @@ class Form
...
@@ -2499,7 +2501,7 @@ class Form
* @param string $htmlname Name of input html field
* @param string $htmlname Name of input html field
* @return void
* @return void
*/
*/
function
form_date
(
$page
,
$selected
=
''
,
$htmlname
)
function
form_date
(
$page
,
$selected
,
$htmlname
)
{
{
global
$langs
;
global
$langs
;
...
@@ -2673,6 +2675,7 @@ class Form
...
@@ -2673,6 +2675,7 @@ class Form
* Affiche formulaire de selection des contacts
* Affiche formulaire de selection des contacts
*
*
* @param string $page Page
* @param string $page Page
* @param Societe $societe Third party
* @param int $selected Id contact pre-selectionne
* @param int $selected Id contact pre-selectionne
* @param string $htmlname Nom du formulaire select
* @param string $htmlname Nom du formulaire select
* @return void
* @return void
...
@@ -2878,7 +2881,7 @@ class Form
...
@@ -2878,7 +2881,7 @@ class Form
/**
/**
* Load into the cache vat rates of a country
* Load into the cache vat rates of a country
*
*
* @param
string Country code
* @param string
$country_code
Country code
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO
*/
*/
function
load_cache_vatrates
(
$country_code
)
function
load_cache_vatrates
(
$country_code
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment