lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15353 from andreubisquerra/master

Browse Source 
Credit note improvements in TakePOS
This commit is contained in:
Laurent Destailleur 2020-11-11 01:22:46 +01:00 committed by GitHub
commit 60bd1d7caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/takepos/invoice.php
View File

@ -419,9 +419,10 @@ if ($action == 'creditnote')
} }
} }
if ($action == 'history') if ($action == 'history' || $action=='creditnote')
{ {
$placeid = (int) GETPOST('placeid', 'int'); if ($action=='creditnote') $placeid = $creditnote->id;
else $placeid = (int) GETPOST('placeid', 'int');
$invoice = new Facture($db); $invoice = new Facture($db);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
@ -769,7 +770,7 @@ if ($action == "order" and $placeid != 0)
} }
$sectionwithinvoicelink = ''; $sectionwithinvoicelink = '';
if ($action == "valid" || $action == "history") if ($action == "valid" || $action == "history" || $action == 'creditnote')
{ {
$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n"; $sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">'; $sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
@ -1315,7 +1316,7 @@ if ($placeid > 0)
print '</table>'; print '</table>';
if ($action == "valid" || $action == "history") { if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE) {
print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>'; print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
} }