mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
commit
8e3948fda7
|
|
@ -601,9 +601,11 @@ function Reduction() {
|
|||
console.log("Open popup to enter reduction on invoiceid="+invoiceid);
|
||||
$.colorbox({href:"reduction.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
|
||||
}
|
||||
|
||||
var closeBillParams="";
|
||||
function CloseBill() {
|
||||
<?php
|
||||
$parameters = array();
|
||||
$reshook = $hookmanager->executeHooks('paramsForCloseBill', $parameters, $obj, $action);
|
||||
if (getDolGlobalString('TAKEPOS_FORBID_SALES_TO_DEFAULT_CUSTOMER')) {
|
||||
echo "customerAnchorTag = document.querySelector('a[id=\"customer\"]'); ";
|
||||
echo "if (customerAnchorTag && customerAnchorTag.innerText.trim() === '".$langs->trans("Customer")."') { ";
|
||||
|
|
@ -632,7 +634,7 @@ function CloseBill() {
|
|||
$payurl = dol_buildpath($alternative_payurl, 1);
|
||||
}
|
||||
?>
|
||||
$.colorbox({href:"<?php echo $payurl; ?>?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
|
||||
$.colorbox({href:"<?php echo $payurl; ?>?place="+place+"&invoiceid="+invoiceid+closeBillParams, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
|
||||
}
|
||||
|
||||
function Split() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user