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

Merge pull request #23106 from Easya-Solutions/fix-invoice-credit-note-stand-alone

Browse Source 
FIX INVOICE_CREDIT_NOTE_STANDALONE
This commit is contained in:
Laurent Destailleur 2022-12-10 16:38:57 +01:00 committed by GitHub
commit 07037213f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -592,7 +592,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= ", ".(int) $this->fk_multicurrency;
$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql .= ", ".(double) $this->multicurrency_tx;
$sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
$sql .= ", ".($this->fk_facture_source ? ((int) $this->db->escape($this->fk_facture_source)) : "null");
$sql .= ", ".(isset($this->fk_fac_rec_source) ? $this->fk_fac_rec_source : "NULL");
$sql .= ")";
@ -1255,7 +1255,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= " fk_statut=".(isset($this->status) ? $this->status : (isset($this->statut) ? $this->statut : "null")).",";
$sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
$sql .= " fk_facture_source=".($this->fk_facture_source ? ((int) $this->db->escape($this->fk_facture_source)) : "null").",";
$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
$sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";

8
htdocs/fourn/facture/card.php
View File

@ -2337,7 +2337,7 @@ if ($action == 'create') {
print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
if (!$optionsav) {
if (!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
$tmp .= ' disabled';
}
$tmp .= '> ';
@ -2384,7 +2384,11 @@ if ($action == 'create') {
}
} else {
print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
} else {
$tmp='<input type="radio" name="type" id="radio_creditnote" value="2"> ';
}
$text = $tmp.$langs->trans("InvoiceAvoir").' ';
$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").')</span> ';
$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);