Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Invoice creation from order

Browse Source
This commit is contained in:
Laurent Destailleur
2008-12-06 02:44:59 +00:00
parent 46e6f3266f
commit bb3ed6bd91
6 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/commande/commande.class.php
View File

@@ -65,6 +65,9 @@ class Commande extends CommonObject
var $date_livraison; // Date livraison souhaitee
var $fk_remise_except;
var $remise_percent;
var $total_ht; // Total net of tax
var $total_ttc; // Total with tax
var $total_tva; // Total VAT
var $remise_absolue;
var $modelpdf;
var $info_bits;
@@ -813,13 +816,13 @@ class Commande extends CommonObject
/**
* \brief Recupere de la base les caracteristiques d'une commande
* \brief Load an order from database
* \param rowid id de la commande a recuperer
*/
function fetch($id)
{
$sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_statut';
$sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva, c.fk_cond_reglement, c.fk_mode_reglement';
$sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.fk_cond_reglement, c.fk_mode_reglement';
$sql.= ', '.$this->db->pdate('c.date_commande').' as date_commande';
$sql.= ', '.$this->db->pdate('c.date_livraison').' as date_livraison';
$sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as facturee';
@@ -848,7 +851,7 @@ class Commande extends CommonObject
$this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author;
$this->total_ht = $obj->total_ht;
$this->total_tva = $obj->tva;
$this->total_tva = $obj->total_tva;
$this->total_ttc = $obj->total_ttc;
$this->date = $obj->date_commande;
$this->remise = $obj->remise;