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
bc1b2d04
Commit
bc1b2d04
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Uniformise option name
parent
34c197f2
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/admin/facture.php
+5
-5
5 additions, 5 deletions
htdocs/admin/facture.php
htdocs/compta/paiement.php
+3
-3
3 additions, 3 deletions
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
+3
-3
3 additions, 3 deletions
htdocs/fourn/facture/paiement.php
with
11 additions
and
11 deletions
htdocs/admin/facture.php
+
5
−
5
View file @
bc1b2d04
...
...
@@ -262,11 +262,11 @@ if ($action == 'setforcedate')
}
}
if
(
$action
==
'set_
FAC
_AUTO_FILLJS'
)
if
(
$action
==
'set_
INVOICE
_AUTO_FILLJS'
)
{
$freetext
=
GETPOST
(
'
FAC
_AUTO_FILLJS'
);
// No alpha here, we want exact string
$freetext
=
GETPOST
(
'
INVOICE
_AUTO_FILLJS'
);
// No alpha here, we want exact string
$res
=
dolibarr_set_const
(
$db
,
"
FAC
_AUTO_FILLJS"
,
$freetext
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
$res
=
dolibarr_set_const
(
$db
,
"
INVOICE
_AUTO_FILLJS"
,
$freetext
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
if
(
!
$res
>
0
)
$error
++
;
...
...
@@ -754,11 +754,11 @@ print '</form>';
$var
=!
$var
;
print
'<form action="'
.
$_SERVER
[
"PHP_SELF"
]
.
'" method="POST">'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'" />'
;
print
'<input type="hidden" name="action" value="set_
FAC
_AUTO_FILLJS" />'
;
print
'<input type="hidden" name="action" value="set_
INVOICE
_AUTO_FILLJS" />'
;
print
'<tr '
.
$bc
[
$var
]
.
'><td>'
;
print
$langs
->
trans
(
"JSOnPaimentBill"
);
print
'</td><td width="60" align="center">'
;
print
$form
->
selectyesno
(
"
FAC
_AUTO_FILLJS"
,
$conf
->
global
->
FAC
_AUTO_FILLJS
,
1
);
print
$form
->
selectyesno
(
"
INVOICE
_AUTO_FILLJS"
,
$conf
->
global
->
INVOICE
_AUTO_FILLJS
,
1
);
print
'</td><td align="right">'
;
print
'<input type="submit" class="button" value="'
.
$langs
->
trans
(
"Modify"
)
.
'" />'
;
print
"</td></tr>
\n
"
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/paiement.php
+
3
−
3
View file @
bc1b2d04
...
...
@@ -432,7 +432,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
'
;
print
' });'
.
"
\n
"
;
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
)){
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
)){
//Add js for AutoFill
print
' $(document).ready(function () {'
;
print
' $(".AutoFillAmout").on(\'click touchstart\', function(){
...
...
@@ -650,7 +650,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if
(
$action
!=
'add_paiement'
)
{
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
))
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
))
print
img_picto
(
"Auto fill"
,
'rightarrow'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$sign
*
$remaintopay
)
.
"'"
);
print
'<input type=hidden class="remain" name="'
.
$nameRemain
.
'" value="'
.
$remaintopay
.
'">'
;
print
'<input type="text" size="8" class="amount" name="'
.
$namef
.
'" value="'
.
$_POST
[
$namef
]
.
'">'
;
...
...
@@ -673,7 +673,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if
(
$action
!=
'add_paiement'
)
{
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
))
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
))
print
img_picto
(
"Auto fill"
,
'rightarrow'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$sign
*
$multicurrency_remaintopay
)
.
"'"
);
print
'<input type=hidden class="multicurrency_remain" name="'
.
$nameRemain
.
'" value="'
.
$multicurrency_remaintopay
.
'">'
;
print
'<input type="text" size="8" class="multicurrency_amount" name="'
.
$namef
.
'" value="'
.
$_POST
[
$namef
]
.
'">'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/fourn/facture/paiement.php
+
3
−
3
View file @
bc1b2d04
...
...
@@ -403,7 +403,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$i
=
0
;
print
'<br>'
;
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
)){
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
)){
//Add js for AutoFill
print
"
\n
"
.
'<script type="text/javascript" language="javascript">'
;
print
' $(document).ready(function () {'
;
...
...
@@ -469,7 +469,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print
'<td align="center">'
;
$namef
=
'amount_'
.
$objp
->
facid
;
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
))
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
))
print
img_picto
(
"Auto fill"
,
'rightarrow'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$objp
->
total_ttc
-
$objp
->
am
)
.
"'"
);
print
'<input type="text" size="8" name="'
.
$namef
.
'" value="'
.
GETPOST
(
$namef
)
.
'">'
;
print
"</td>"
;
...
...
@@ -479,7 +479,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
print
'<td align="center">'
;
$namef
=
'multicurrency_amount_'
.
$objp
->
facid
;
if
(
!
empty
(
$conf
->
global
->
FAC
_AUTO_FILLJS
))
if
(
!
empty
(
$conf
->
global
->
INVOICE
_AUTO_FILLJS
))
print
img_picto
(
"Auto fill"
,
'rightarrow'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$objp
->
multicurrency_total_ttc
-
$objp
->
multicurrency_am
)
.
"'"
);
print
'<input type="text" size="8" class="multicurrency_amount" name="'
.
$namef
.
'" value="'
.
GETPOST
(
$namef
)
.
'">'
;
print
"</td>"
;
...
...
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