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
384abd84
Commit
384abd84
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Uniformize look and feel
parent
7b3793c7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/expedition/stats/index.php
+11
-6
11 additions, 6 deletions
htdocs/expedition/stats/index.php
htdocs/product/stock/mouvement.php
+1
-1
1 addition, 1 deletion
htdocs/product/stock/mouvement.php
htdocs/projet/card.php
+5
-5
5 additions, 5 deletions
htdocs/projet/card.php
with
17 additions
and
12 deletions
htdocs/expedition/stats/index.php
+
11
−
6
View file @
384abd84
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-201
3
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-201
6
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -234,7 +234,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
// Show filter box
print
'<form name="stats" method="POST" action="'
.
$_SERVER
[
"PHP_SELF"
]
.
'">'
;
print
'<input type="hidden" name="mode" value="'
.
$mode
.
'">'
;
print
'<table class="border" width="100%">'
;
print
'<table class="noborder" width="100%">'
;
print
'<tr class="liste_titre"><td class="liste_titre" colspan="2">'
.
$langs
->
trans
(
"Filter"
)
.
'</td></tr>'
;
// Company
print
'<tr><td align="left">'
.
$langs
->
trans
(
"ThirdParty"
)
.
'</td><td align="left">'
;
...
...
@@ -259,8 +260,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print
'<br><br>'
;
//}
print
'<table class="border" width="100%">'
;
print
'<tr height="24">'
;
print
'<table class="
no
border" width="100%">'
;
print
'<tr
class="liste_titre"
height="24">'
;
print
'<td align="center">'
.
$langs
->
trans
(
"Year"
)
.
'</td>'
;
print
'<td align="center">'
.
$langs
->
trans
(
"NbOfSendings"
)
.
'</td>'
;
/*print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
...
...
@@ -268,13 +269,16 @@ print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
print
'</tr>'
;
$oldyear
=
0
;
$var
=
true
;
foreach
(
$data
as
$val
)
{
$year
=
$val
[
'year'
];
while
(
!
empty
(
$year
)
&&
$oldyear
>
$year
+
1
)
{
// If we have empty year
$oldyear
--
;
print
'<tr height="24">'
;
$var
=!
$var
;
print
'<tr '
.
$bc
[
$var
]
.
' height="24">'
;
print
'<td align="center"><a href="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?year='
.
$oldyear
.
'&mode='
.
$mode
.
'">'
.
$oldyear
.
'</a></td>'
;
print
'<td align="right">0</td>'
;
...
...
@@ -283,7 +287,8 @@ foreach ($data as $val)
print
'</tr>'
;
}
print
'<tr height="24">'
;
$var
=!
$var
;
print
'<tr '
.
$bc
[
$var
]
.
' height="24">'
;
print
'<td align="center"><a href="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?year='
.
$year
.
'&mode='
.
$mode
.
'">'
.
$year
.
'</a></td>'
;
print
'<td align="right">'
.
$val
[
'nb'
]
.
'</td>'
;
/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/mouvement.php
+
1
−
1
View file @
384abd84
...
...
@@ -646,7 +646,7 @@ if ($resql)
// Warehouse
if
(
!
$id
>
0
)
{
print
'<td class="liste_titre" align="left">'
;
print
'<td class="liste_titre
maxwidthonsmartphone
" align="left">'
;
//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
print
$formproduct
->
selectWarehouses
(
$search_warehouse
,
'search_warehouse'
,
''
,
1
);
print
'</td>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/projet/card.php
+
5
−
5
View file @
384abd84
...
...
@@ -494,7 +494,7 @@ if ($action == 'create' && $user->rights->projet->creer)
// Thirdparty
if
(
$conf
->
societe
->
enabled
)
{
print
'<tr><td>'
.
$langs
->
trans
(
"ThirdParty"
)
.
'</td><td>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"ThirdParty"
)
.
'</td><td
class="maxwidthonsmartphone"
>'
;
$filteronlist
=
''
;
if
(
!
empty
(
$conf
->
global
->
PROJECT_FILTER_FOR_THIRDPARTY_LIST
))
$filteronlist
=
$conf
->
global
->
PROJECT_FILTER_FOR_THIRDPARTY_LIST
;
$text
=
$form
->
select_thirdparty_list
(
GETPOST
(
'socid'
,
'int'
),
'socid'
,
$filteronlist
,
'SelectThirdParty'
,
1
,
0
,
array
(),
''
,
0
,
0
,
'minwidth300'
);
...
...
@@ -517,8 +517,8 @@ if ($action == 'create' && $user->rights->projet->creer)
print
'</td></tr>'
;
}
//
Public
print
'<tr><td>'
.
$langs
->
trans
(
"Visibility"
)
.
'</td><td>'
;
//
Visibility
print
'<tr><td>'
.
$langs
->
trans
(
"Visibility"
)
.
'</td><td
class="maxwidthonsmartphone"
>'
;
$array
=
array
();
if
(
empty
(
$conf
->
global
->
PROJECT_DISABLE_PRIVATE_PROJECT
))
$array
[
0
]
=
$langs
->
trans
(
"PrivateProject"
);
if
(
empty
(
$conf
->
global
->
PROJECT_DISABLE_PUBLIC_PROJECT
))
$array
[
1
]
=
$langs
->
trans
(
"SharedProject"
);
...
...
@@ -539,13 +539,13 @@ if ($action == 'create' && $user->rights->projet->creer)
{
// Opportunity status
print
'<tr><td>'
.
$langs
->
trans
(
"OpportunityStatus"
)
.
'</td>'
;
print
'<td>'
;
print
'<td
class="maxwidthonsmartphone"
>'
;
print
$formproject
->
selectOpportunityStatus
(
'opp_status'
,
GETPOST
(
'opp_status'
)
?
GETPOST
(
'opp_status'
)
:
$object
->
opp_status
);
print
'</tr>'
;
// Opportunity probability
print
'<tr><td>'
.
$langs
->
trans
(
"OpportunityProbability"
)
.
'</td>'
;
print
'<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'
.
(
GETPOST
(
'opp_percent'
)
!=
''
?
price
(
GETPOST
(
'opp_percent'
))
:
''
)
.
'">
%
'
;
print
'<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'
.
(
GETPOST
(
'opp_percent'
)
!=
''
?
price
(
GETPOST
(
'opp_percent'
))
:
''
)
.
'">
<span class="hideonsmartphone"> %</span>
'
;
print
'<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'
.
(
GETPOST
(
'opp_percent'
)
!=
''
?
'0'
:
'1'
)
.
'">'
;
print
'</td>'
;
print
'</tr>'
;
...
...
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