From 5a25ff40ce1bba97885c27ba8d0769b8fee701d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 17 Dec 2007 18:18:51 +0000 Subject: [PATCH] Fix: Gestion de l'escompte sur les factures ne marchait plus --- htdocs/includes/modules/facture/pdf_crabe.modules.php | 2 ++ htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 2 ++ mysql/migration/2.1.0-2.2.0.sql | 2 ++ 3 files changed, 6 insertions(+) diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index bde46e4c2c2..26ca2d7e161 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -809,6 +809,8 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price(abs($object->total_ttc - $deja_regle)), $useborder, 'R', 1); + + $resteapayer=0; } $index++; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 470e4f2e8c9..66c87dc7291 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -681,6 +681,8 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1); + + $resteapayer=0; } $index++; diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index fa36723ae67..35b2dec5c4a 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -1166,6 +1166,8 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_factur -- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)'); -- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)'; +update llx_facture set close_code = 'discount_vat' where close_code = 'escompte'; + ALTER TABLE llx_commande_fournisseurdet MODIFY fk_product integer; -- Le prix d'un produit ne doit pas avoir la valeur NULL