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
eacb221f
Commit
eacb221f
authored
7 years ago
by
florian HENRY
Browse files
Options
Downloads
Patches
Plain Diff
fix : add missing column into service's contract lines
parent
cef7b9c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/contrat/services.php
+75
-1
75 additions, 1 deletion
htdocs/contrat/services.php
with
75 additions
and
1 deletion
htdocs/contrat/services.php
+
75
−
1
View file @
eacb221f
...
@@ -115,6 +115,11 @@ $companystatic=new Societe($db);
...
@@ -115,6 +115,11 @@ $companystatic=new Societe($db);
$arrayfields
=
array
(
$arrayfields
=
array
(
'c.ref'
=>
array
(
'label'
=>
$langs
->
trans
(
"Contract"
),
'checked'
=>
1
,
'position'
=>
80
),
'c.ref'
=>
array
(
'label'
=>
$langs
->
trans
(
"Contract"
),
'checked'
=>
1
,
'position'
=>
80
),
'p.description'
=>
array
(
'label'
=>
$langs
->
trans
(
"Service"
),
'checked'
=>
1
,
'position'
=>
80
),
'p.description'
=>
array
(
'label'
=>
$langs
->
trans
(
"Service"
),
'checked'
=>
1
,
'position'
=>
80
),
'cd.qty'
=>
array
(
'label'
=>
$langs
->
trans
(
"Qty"
),
'checked'
=>
0
,
'position'
=>
100
),
'cd.total_ht'
=>
array
(
'label'
=>
$langs
->
trans
(
"TotalHT"
),
'checked'
=>
0
,
'position'
=>
100
),
'cd.total_tva'
=>
array
(
'label'
=>
$langs
->
trans
(
"TotalVAT"
),
'checked'
=>
0
,
'position'
=>
100
),
'cd.tva_tx'
=>
array
(
'label'
=>
$langs
->
trans
(
"VAT"
),
'checked'
=>
0
,
'position'
=>
100
),
'cd.subprice'
=>
array
(
'label'
=>
$langs
->
trans
(
"PriceUHT"
),
'checked'
=>
0
,
'position'
=>
100
),
's.nom'
=>
array
(
'label'
=>
$langs
->
trans
(
"ThirdParty"
),
'checked'
=>
1
,
'position'
=>
100
),
's.nom'
=>
array
(
'label'
=>
$langs
->
trans
(
"ThirdParty"
),
'checked'
=>
1
,
'position'
=>
100
),
'cd.date_ouverture_prevue'
=>
array
(
'label'
=>
$langs
->
trans
(
"DateStartPlannedShort"
),
'checked'
=>
((
$mode
==
""
||
$mode
==
-
1
)
||
$mode
==
"0"
)),
'cd.date_ouverture_prevue'
=>
array
(
'label'
=>
$langs
->
trans
(
"DateStartPlannedShort"
),
'checked'
=>
((
$mode
==
""
||
$mode
==
-
1
)
||
$mode
==
"0"
)),
'cd.date_ouverture'
=>
array
(
'label'
=>
$langs
->
trans
(
"DateStartRealShort"
),
'checked'
=>
((
$mode
==
""
||
$mode
==
-
1
)
||
$mode
>
0
)),
'cd.date_ouverture'
=>
array
(
'label'
=>
$langs
->
trans
(
"DateStartRealShort"
),
'checked'
=>
((
$mode
==
""
||
$mode
==
-
1
)
||
$mode
>
0
)),
...
@@ -199,7 +204,11 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk
...
@@ -199,7 +204,11 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk
$sql
.
=
" cd.date_ouverture_prevue,"
;
$sql
.
=
" cd.date_ouverture_prevue,"
;
$sql
.
=
" cd.date_ouverture,"
;
$sql
.
=
" cd.date_ouverture,"
;
$sql
.
=
" cd.date_fin_validite,"
;
$sql
.
=
" cd.date_fin_validite,"
;
$sql
.
=
" cd.date_cloture,"
;
$sql
.
=
" cd.qty,"
;
$sql
.
=
" cd.total_ht,"
;
$sql
.
=
" cd.total_tva,"
;
$sql
.
=
" cd.tva_tx,"
;
$sql
.
=
" cd.subprice,"
;
//$sql.= " cd.date_c as date_creation,";
//$sql.= " cd.date_c as date_creation,";
$sql
.
=
" cd.tms as date_update"
;
$sql
.
=
" cd.tms as date_update"
;
// Add fields from extrafields
// Add fields from extrafields
...
@@ -362,6 +371,11 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"")
...
@@ -362,6 +371,11 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"")
print
'<tr class="liste_titre">'
;
print
'<tr class="liste_titre">'
;
if
(
!
empty
(
$arrayfields
[
'c.ref'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'c.ref'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"c.ref"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'c.ref'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'c.ref'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"c.ref"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'p.description'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'p.description'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"p.description"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'p.description'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'p.description'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"p.description"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.qty'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.qty'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.qty"
,
""
,
$param
,
'align="center" class="nowrap"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.total_ht'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.total_ht'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.total_ht"
,
""
,
$param
,
'align="center" class="nowrap"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.total_tva'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.total_tva'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.total_tva"
,
""
,
$param
,
'align="center" class="nowrap"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.tva_tx'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.tva_tx'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.tva_tx"
,
""
,
$param
,
'align="center" class="nowrap"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.subprice'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.subprice'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.subprice"
,
""
,
$param
,
'align="center" class="nowrap"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
's.nom'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"s.nom"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
's.nom'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"s.nom"
,
""
,
$param
,
""
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.date_ouverture_prevue"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.date_ouverture_prevue"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.date_ouverture'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.date_ouverture"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture'
][
'checked'
]))
print_liste_field_titre
(
$arrayfields
[
'cd.date_ouverture'
][
'label'
],
$_SERVER
[
"PHP_SELF"
],
"cd.date_ouverture"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
...
@@ -407,6 +421,32 @@ if (! empty($arrayfields['p.description']['checked']))
...
@@ -407,6 +421,32 @@ if (! empty($arrayfields['p.description']['checked']))
print
'<input type="text" class="flat maxwidth100" name="search_service" value="'
.
dol_escape_htmltag
(
$search_service
)
.
'">'
;
print
'<input type="text" class="flat maxwidth100" name="search_service" value="'
.
dol_escape_htmltag
(
$search_service
)
.
'">'
;
print
'</td>'
;
print
'</td>'
;
}
}
// detail lines
if
(
!
empty
(
$arrayfields
[
'cd.qty'
][
'checked'
]))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.total_ht'
][
'checked'
]))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.total_tva'
][
'checked'
]))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.tva_tx'
][
'checked'
]))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.subprice'
][
'checked'
]))
{
print
'<td class="liste_titre">'
;
print
'</td>'
;
}
// Third party
// Third party
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
{
{
...
@@ -414,6 +454,8 @@ if (! empty($arrayfields['s.nom']['checked']))
...
@@ -414,6 +454,8 @@ if (! empty($arrayfields['s.nom']['checked']))
print
'<input type="text" class="flat maxwidth100" name="search_name" value="'
.
dol_escape_htmltag
(
$search_name
)
.
'">'
;
print
'<input type="text" class="flat maxwidth100" name="search_name" value="'
.
dol_escape_htmltag
(
$search_name
)
.
'">'
;
print
'</td>'
;
print
'</td>'
;
}
}
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'checked'
]))
if
(
!
empty
(
$arrayfields
[
'cd.date_ouverture_prevue'
][
'checked'
]))
{
{
print
'<td class="liste_titre" align="center">'
;
print
'<td class="liste_titre" align="center">'
;
...
@@ -557,6 +599,38 @@ while ($i < min($num,$limit))
...
@@ -557,6 +599,38 @@ while ($i < min($num,$limit))
print
'</td>'
;
print
'</td>'
;
}
}
if
(
!
empty
(
$arrayfields
[
'cd.qty'
][
'checked'
]))
{
print
'<td>'
;
print
$obj
->
qty
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.total_ht'
][
'checked'
]))
{
print
'<td>'
;
print
price
(
$obj
->
total_ht
);
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.total_tva'
][
'checked'
]))
{
print
'<td>'
;
print
price
(
$obj
->
total_tva
);
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.tva_tx'
][
'checked'
]))
{
print
'<td>'
;
print
price2num
(
$obj
->
tva_tx
)
.
'%'
;
print
'</td>'
;
}
if
(
!
empty
(
$arrayfields
[
'cd.subprice'
][
'checked'
]))
{
print
'<td>'
;
print
price
(
$obj
->
subprice
);
print
'</td>'
;
}
// Third party
// Third party
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
if
(
!
empty
(
$arrayfields
[
's.nom'
][
'checked'
]))
{
{
...
...
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