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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
5d1572a1
Commit
5d1572a1
authored
14 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Doxygen
parent
5fd1a87a
Branches
Branches containing commit
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/commonobject.class.php
+28
-19
28 additions, 19 deletions
htdocs/core/class/commonobject.class.php
with
28 additions
and
19 deletions
htdocs/core/class/commonobject.class.php
+
28
−
19
View file @
5d1572a1
...
@@ -1281,7 +1281,9 @@ class CommonObject
...
@@ -1281,7 +1281,9 @@ class CommonObject
/**
/**
* Show add predefined products/services form
* Show add predefined products/services form
* FIXME This must be moved into a html.class file instead of a business class.
* TODO This should be moved into a html.class file instead of a business class.
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
* @param $dateSelector 1=Show also date range input fields
*/
*/
function
showAddPredefinedProductForm
(
$dateSelector
=
0
)
function
showAddPredefinedProductForm
(
$dateSelector
=
0
)
{
{
...
@@ -1293,7 +1295,9 @@ class CommonObject
...
@@ -1293,7 +1295,9 @@ class CommonObject
/**
/**
* Show add free products/services form
* Show add free products/services form
* FIXME This must be moved into a html.class file instead of a business class.
* TODO This should be moved into a html.class file instead of a business class. But for
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
* @param $dateSelector 1=Show also date range input fields
*/
*/
function
showAddFreeProductForm
(
$dateSelector
=
0
)
function
showAddFreeProductForm
(
$dateSelector
=
0
)
{
{
...
@@ -1308,7 +1312,8 @@ class CommonObject
...
@@ -1308,7 +1312,8 @@ class CommonObject
* @param $object
* @param $object
* @param $objectid
* @param $objectid
* @param $somethingshown
* @param $somethingshown
* FIXME This must be moved into a html.class file instead of a business class.
* TODO This must be moved into a html.class file instead of a business class.
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
*/
*/
function
showLinkedObjectBlock
(
$object
,
$objectid
,
$somethingshown
=
0
)
function
showLinkedObjectBlock
(
$object
,
$objectid
,
$somethingshown
=
0
)
{
{
...
@@ -1319,9 +1324,8 @@ class CommonObject
...
@@ -1319,9 +1324,8 @@ class CommonObject
{
{
$classpath
=
$object
.
'/class'
;
$classpath
=
$object
.
'/class'
;
$tplpath
=
$object
;
$tplpath
=
$object
;
// TODO uniformiser emplacement classe
if
(
$object
==
'facture'
)
$tplpath
=
'compta/'
.
$object
;
$classpath
=
$tplpath
.
'/class'
;
// To work with non standard path
if
(
$object
==
'facture'
)
$tplpath
=
'compta/'
.
$object
;
$classpath
=
$tplpath
.
'/class'
;
if
(
$object
==
'propal'
)
$tplpath
=
'comm/'
.
$object
;
$classpath
=
$tplpath
.
'/class'
;
// To work with non standard path
if
(
$object
==
'propal'
)
$tplpath
=
'comm/'
.
$object
;
$classpath
=
$tplpath
.
'/class'
;
$classname
=
ucfirst
(
$object
);
$classname
=
ucfirst
(
$object
);
if
(
!
class_exists
(
$classname
))
require
(
DOL_DOCUMENT_ROOT
.
"/"
.
$classpath
.
"/"
.
$object
.
".class.php"
);
if
(
!
class_exists
(
$classname
))
require
(
DOL_DOCUMENT_ROOT
.
"/"
.
$classpath
.
"/"
.
$object
.
".class.php"
);
...
@@ -1333,7 +1337,8 @@ class CommonObject
...
@@ -1333,7 +1337,8 @@ class CommonObject
/**
/**
* Return HTML table with title list
* Return HTML table with title list
* FIXME This must be moved into a html.class file instead of a business class.
* TODO This must be moved into a html.class file instead of a business class.
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
*/
*/
function
print_title_list
()
function
print_title_list
()
{
{
...
@@ -1380,8 +1385,13 @@ class CommonObject
...
@@ -1380,8 +1385,13 @@ class CommonObject
/**
/**
* Return HTML with selected object line
* Return HTML with selected object line
* @param line Selected object line
* @param $line Selected object line to output
* FIXME This must be moved into a html.class file instead of a business class.
* @param $var Is it a an odd line
* @param $num Number of line
* @param $i
* @param $dateSelector 1=Show also date range input fields
* TODO This must be moved into a html.class file instead of a business class.
* But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
*/
*/
function
printLine
(
$line
,
$var
=
true
,
$num
=
0
,
$i
=
0
,
$dateSelector
=
0
)
function
printLine
(
$line
,
$var
=
true
,
$num
=
0
,
$i
=
0
,
$dateSelector
=
0
)
{
{
...
@@ -1389,8 +1399,7 @@ class CommonObject
...
@@ -1389,8 +1399,7 @@ class CommonObject
global
$html
,
$bc
;
global
$html
,
$bc
;
$element
=
$this
->
element
;
$element
=
$this
->
element
;
// TODO uniformiser
if
(
$element
==
'propal'
)
$element
=
'propale'
;
// To work with non standard path
if
(
$element
==
'propal'
)
$element
=
'propale'
;
// Show product and description
// Show product and description
$type
=
$line
->
product_type
?
$line
->
product_type
:
$line
->
fk_product_type
;
$type
=
$line
->
product_type
?
$line
->
product_type
:
$line
->
fk_product_type
;
...
...
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