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
fc0edc34
Commit
fc0edc34
authored
8 years ago
by
aspangaro
Browse files
Options
Downloads
Patches
Plain Diff
Uniformize presentation of social contribution - Add button cancel in create mode
parent
5e5ce004
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/compta/sociales/card.php
+15
-5
15 additions, 5 deletions
htdocs/compta/sociales/card.php
with
15 additions
and
5 deletions
htdocs/compta/sociales/card.php
+
15
−
5
View file @
fc0edc34
...
...
@@ -2,6 +2,7 @@
/* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@zendsi.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
...
...
@@ -278,14 +279,16 @@ if ($action == 'create')
dol_fiche_head
();
print
'<table class="border" width="100%">'
;
print
"<tr>"
;
// Label
print
'<td class="fieldrequired">'
;
print
"<tr>"
;
print
'<td class="titlefieldcreate fieldrequired">'
;
print
$langs
->
trans
(
"Label"
);
print
'</td>'
;
print
'<td
align="left"
><input type="text" size="34" name="label" class="flat" value="'
.
GETPOST
(
'label'
)
.
'"></td>'
;
print
'<td><input type="text" size="34" name="label" class="flat" value="'
.
GETPOST
(
'label'
)
.
'"></td>'
;
print
'</tr>'
;
print
'<tr>'
;
// Type
print
'<td class="fieldrequired">'
;
print
$langs
->
trans
(
"Type"
);
...
...
@@ -294,6 +297,7 @@ if ($action == 'create')
$formsocialcontrib
->
select_type_socialcontrib
(
GETPOST
(
"actioncode"
)
?
GETPOST
(
"actioncode"
)
:
''
,
'actioncode'
,
1
);
print
'</td>'
;
print
'</tr>'
;
// Date end period
print
'<tr>'
;
print
'<td class="fieldrequired">'
;
...
...
@@ -303,6 +307,7 @@ if ($action == 'create')
print
$form
->
select_date
(
!
empty
(
$dateperiod
)
?
$dateperiod
:
'-1'
,
'period'
,
0
,
0
,
0
,
'charge'
,
1
);
print
'</td>'
;
print
'</tr>'
;
// Amount
print
'<tr>'
;
print
'<td class="fieldrequired">'
;
...
...
@@ -310,10 +315,12 @@ if ($action == 'create')
print
'</td>'
;
print
'<td><input type="text" size="6" name="amount" class="flat" value="'
.
GETPOST
(
'amount'
)
.
'"></td>'
;
print
'</tr>'
;
// Payment Mode
print
'<tr><td>'
.
$langs
->
trans
(
'PaymentMode'
)
.
'</td><td colspan="2">'
;
$form
->
select_types_paiements
(
$mode_reglement_id
,
'mode_reglement_id'
);
print
'</td></tr>'
;
// Bank Account
if
(
!
empty
(
$conf
->
banque
->
enabled
))
{
...
...
@@ -321,6 +328,7 @@ if ($action == 'create')
$form
->
select_comptes
(
$fk_account
,
'fk_account'
,
0
,
''
,
1
);
print
'</td></tr>'
;
}
// Date due
print
'<tr>'
;
print
'<td class="fieldrequired">'
;
...
...
@@ -337,7 +345,9 @@ if ($action == 'create')
print
'<div class="center">'
;
print
'<input type="submit" class="button" value="'
.
$langs
->
trans
(
"Add"
)
.
'">'
;
print
'<div>'
;
print
' '
;
print
'<input type="button" class="button" value="'
.
$langs
->
trans
(
"Cancel"
)
.
'" onClick="javascript:history.go(-1)">'
;
print
'</div>'
;
print
'</form>'
;
}
...
...
@@ -587,7 +597,7 @@ if ($id > 0)
{
print
"<a class=
\"
butAction
\"
href=
\"
"
.
dol_buildpath
(
"/compta/sociales/card.php"
,
1
)
.
"?id=
$object->id
&action=reopen
\"
>"
.
$langs
->
trans
(
"ReOpen"
)
.
"</a>"
;
}
// Edit
if
(
$object
->
paye
==
0
&&
$user
->
rights
->
tax
->
charges
->
creer
)
{
...
...
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