diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index d58a1db2f8f..5ad0eddb35a 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -1952,7 +1952,9 @@ class Propal extends CommonObject $this->socid = $socids[$socid]; $this->date = time(); $this->fin_validite = $this->date+3600*24*30; + $this->cond_reglement_id = 1; $this->cond_reglement_code = 'RECEP'; + $this->mode_reglement_id = 7; $this->mode_reglement_code = 'CHQ'; $this->note_public='SPECIMEN'; $nbp = rand(1, 9); diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index d43d1dea657..9e89a913a0c 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010 Juanjo Menent @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); /** * \class Commande - * \brief Class to manage orders + * \brief Class to manage customers orders */ class Commande extends CommonObject { @@ -2305,6 +2305,7 @@ class Commande extends CommonObject $line->total_ht=100; $line->total_ttc=119.6; $line->total_tva=19.6; + $line->remise_percent=0; $line->fk_product=$prodids[$prodid]; $this->lignes[$xnbp]=$line; // TODO: deprecated