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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
1ce4996a
Commit
1ce4996a
authored
10 years ago
by
Andrelec1
Browse files
Options
Downloads
Patches
Plain Diff
finish implement
remove old code and add new one ...
parent
3548f72d
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/compta/paiement.php
+10
-35
10 additions, 35 deletions
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
+2
-2
2 additions, 2 deletions
htdocs/fourn/facture/paiement.php
htdocs/master.inc.php
+0
-2
0 additions, 2 deletions
htdocs/master.inc.php
with
12 additions
and
39 deletions
htdocs/compta/paiement.php
+
10
−
35
View file @
1ce4996a
...
...
@@ -374,19 +374,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
});
'
;
// Add user helper to input amount on invoices
if
(
!
empty
(
$conf
->
global
->
MAIN_JS_ON_PAYMENT
)
&&
$facture
->
type
!=
2
)
{
print
' $("#payment_form").find("img").click(function() {
callForResult(jQuery(this).attr("id"));
});
$("#amountpayment").change(function() {
callForResult();
print
' });'
.
"
\n
"
;
if
(
!
empty
(
$conf
->
global
->
FAC_AUTO_FILLJS
)){
//Add js for AutoFill
print
' $(document).ready(function () {'
;
print
' $(".AutoFillAmout").on(\'click touchstart\', function(){
$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value"));
});'
;
}
print
' });'
.
"
\n
"
;
}
print
' </script>'
.
"
\n
"
;
}
...
...
@@ -412,7 +408,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print
'<td>'
.
$langs
->
trans
(
'Comments'
)
.
'</td></tr>'
;
$rowspan
=
5
;
if
(
$conf
->
use_javascript_ajax
&&
!
empty
(
$conf
->
global
->
MAIN_JS_ON_PAYMENT
))
$rowspan
++
;
// Payment mode
print
'<tr><td><span class="fieldrequired">'
.
$langs
->
trans
(
'PaymentMode'
)
.
'</span></td><td>'
;
...
...
@@ -438,24 +433,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print
"</tr>
\n
"
;
// Payment amount
if
(
$conf
->
use_javascript_ajax
&&
!
empty
(
$conf
->
global
->
MAIN_JS_ON_PAYMENT
))
{
print
'<tr><td><span class="fieldrequired">'
.
$langs
->
trans
(
'AmountPayment'
)
.
'</span></td>'
;
print
'<td>'
;
if
(
$action
==
'add_paiement'
)
{
print
'<input id="amountpayment" name="amountpaymenthidden" size="8" type="text" value="'
.
(
empty
(
$_POST
[
'amountpayment'
])
?
''
:
$_POST
[
'amountpayment'
])
.
'" disabled="disabled">'
;
print
'<input name="amountpayment" type="hidden" value="'
.
(
empty
(
$_POST
[
'amountpayment'
])
?
''
:
$_POST
[
'amountpayment'
])
.
'">'
;
}
else
{
print
'<input id="amountpayment" name="amountpayment" size="8" type="text" value="'
.
(
empty
(
$_POST
[
'amountpayment'
])
?
''
:
$_POST
[
'amountpayment'
])
.
'">'
;
}
print
'</td>'
;
print
'</tr>'
;
}
// Cheque number
print
'<tr><td>'
.
$langs
->
trans
(
'Numero'
);
print
' <em>('
.
$langs
->
trans
(
"ChequeOrTransferNumber"
)
.
')</em>'
;
...
...
@@ -578,10 +555,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if
(
$action
!=
'add_paiement'
)
{
if
(
$conf
->
use_javascript_ajax
&&
!
empty
(
$conf
->
global
->
MAIN_JS_ON_PAYMENT
))
{
print
img_picto
(
$langs
->
trans
(
'AddRemind'
),
'rightarrow.png'
,
'id="'
.
$objp
->
facid
.
'"'
);
}
if
(
!
empty
(
$conf
->
global
->
FAC_AUTO_FILLJS
))
print
img_picto
(
"Auto fill"
,
'rightarrow'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$sign
*
$remaintopay
)
.
"'"
);
print
'<input type=hidden name="'
.
$nameRemain
.
'" value="'
.
$remaintopay
.
'">'
;
print
'<input type="text" size="8" name="'
.
$namef
.
'" value="'
.
$_POST
[
$namef
]
.
'">'
;
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/fourn/facture/paiement.php
+
2
−
2
View file @
1ce4996a
...
...
@@ -382,7 +382,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
))
print
img_picto
(
"Auto fill"
,
'
1
rightarrow
_selected
'
,
"class='AutoFillAmout' data-rowname='"
.
$namef
.
"' data-value='"
.
(
$objp
->
total_ttc
-
$objp
->
am
)
.
"'"
);
// TODO ADD lang
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></tr>
\n
"
;
$total
+=
$objp
->
total_ht
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/master.inc.php
+
0
−
2
View file @
1ce4996a
...
...
@@ -244,8 +244,6 @@ $hookmanager=new HookManager($db);
if
(
!
defined
(
'MAIN_LABEL_MENTION_NPR'
)
)
define
(
'MAIN_LABEL_MENTION_NPR'
,
'NPR'
);
// We force feature to help debug
//$conf->global->MAIN_JS_ON_PAYMENT=0;
// We force FPDF
if
(
!
empty
(
$dolibarr_pdf_force_fpdf
))
$conf
->
global
->
MAIN_USE_FPDF
=
$dolibarr_pdf_force_fpdf
;
...
...
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