Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fix payment conditions on commercial proposals

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-16 18:06:40 +00:00
parent 55598dd901
commit 3fa3ebf316
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -20,6 +20,7 @@ For users:
- New: Added a link from product list to their stock movements.
- New: Several speed enhancements after using the Google Page speed
plugin for FireBug.
- Fix: Fix payment conditions on commercial proposals.
- Fix: Nb of orders to process was wrong.
- Fix: Customer code was not correct on PDF it if contains special
characters.

6
htdocs/propal.class.php
View File

@ -770,7 +770,7 @@ class Propal extends CommonObject
$sql.= ", p.fk_cond_reglement";
$sql.= ", p.fk_mode_reglement";
$sql.= ", c.label as statut_label";
$sql.= ", cr.code as cond_reglement_code, cr.libelle, cr.libelle_facture";
$sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture";
$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
$sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."propal as p";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
@ -820,8 +820,8 @@ class Propal extends CommonObject
$this->mode_reglement = $obj->mode_reglement;
$this->cond_reglement_id = $obj->fk_cond_reglement;
$this->cond_reglement_code = $obj->cond_reglement_code;
$this->cond_reglement = $objc->libelle;
$this->cond_reglement_document = $objc->libelle_facture;
$this->cond_reglement = $obj->cond_reglement;
$this->cond_reglement_document = $obj->libelle_facture;
$this->user_author_id = $obj->fk_user_author;