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
8ce5fcd9
Commit
8ce5fcd9
authored
8 years ago
by
aspangaro
Browse files
Options
Downloads
Patches
Plain Diff
Uniformize presentation salary payment
parent
0b7a5a4a
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/compta/salaries/card.php
+4
-4
4 additions, 4 deletions
htdocs/compta/salaries/card.php
htdocs/compta/salaries/document.php
+3
-3
3 additions, 3 deletions
htdocs/compta/salaries/document.php
htdocs/compta/salaries/info.php
+1
-3
1 addition, 3 deletions
htdocs/compta/salaries/info.php
with
8 additions
and
10 deletions
htdocs/compta/salaries/card.php
+
4
−
4
View file @
8ce5fcd9
<?php
/* Copyright (C) 2011-201
5
Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
/* Copyright (C) 2011-201
6
Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
* Copyright (C) 2015 Charlie BENKE
<charlie@patas-monkey.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -187,7 +187,7 @@ if ($action == 'delete')
* View
*/
llxHeader
();
llxHeader
(
""
,
$langs
->
trans
(
"SalaryPayment"
)
);
$form
=
new
Form
(
$db
);
...
...
@@ -339,7 +339,7 @@ if ($id)
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/compta/salaries/index.php'
.
(
!
empty
(
$socid
)
?
'?socid='
.
$socid
:
''
)
.
'">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
print
"<tr>"
;
print
'<td
width="25%
">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td colspan="3">'
;
print
'<td
class="titlefield
">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td colspan="3">'
;
print
$form
->
showrefnav
(
$object
,
'id'
,
$linkback
,
1
,
'rowid'
,
'ref'
,
''
);
print
'</td></tr>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/salaries/document.php
+
3
−
3
View file @
8ce5fcd9
...
...
@@ -6,7 +6,7 @@
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2015
Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015
-2016
Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form
=
new
Form
(
$db
);
llxHeader
(
""
,
""
,
$langs
->
trans
(
"SalaryPayment"
));
llxHeader
(
""
,
$langs
->
trans
(
"SalaryPayment"
));
if
(
$object
->
id
)
...
...
@@ -107,7 +107,7 @@ if ($object->id)
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/compta/salaries/index.php'
.
(
!
empty
(
$socid
)
?
'?socid='
.
$socid
:
''
)
.
'">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
// Ref
print
'<tr><td
width="30%
">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td>'
;
print
'<tr><td
class="titlefield
">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td>'
;
print
$form
->
showrefnav
(
$object
,
'id'
,
$linkback
,
1
,
'rowid'
,
'ref'
,
''
);
print
'</td></tr>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/salaries/info.php
+
1
−
3
View file @
8ce5fcd9
...
...
@@ -44,9 +44,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
* View
*/
$help_url
=
'EN:Module_Salaries|FR:Module Fiche de paie|ES:Módulo Salarios'
;
llxHeader
(
""
,
$langs
->
trans
(
"Salaries"
),
$help_url
);
llxHeader
(
""
,
$langs
->
trans
(
"SalaryPayment"
));
$salpayment
=
new
PaymentSalary
(
$db
);
$result
=
$salpayment
->
fetch
(
$id
);
...
...
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