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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-08 11:21:39 +00:00
parent 5f27c01f8b
commit 8d3b0d4470
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -1780,7 +1780,7 @@ class Facture extends CommonObject
if ($result > 0) if ($result > 0)
{ {
// Mise a jour informations denormalisees au niveau de la facture meme // Mise a jour informations denormalisees au niveau de la facture meme
$this->id=$facid; // \TODO A virer $this->id=$facid; // TODO To move this we must remove parameter facid into this function declaration
$result=$this->update_price(); $result=$this->update_price();
if ($result > 0) if ($result > 0)
{ {

3
htdocs/compta/payment_sc/fiche.php
View File

@ -84,8 +84,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' &&
{ {
$db->commit(); $db->commit();
// \TODO Boucler sur les facture liees a ce paiement et regenerer le pdf $factures=array(); // TODO Get all id of invoices linked to this payment
$factures=array();
foreach($factures as $id) foreach($factures as $id)
{ {
$fac = new Facture($db); $fac = new Facture($db);

6
htdocs/contrat/class/contrat.class.php
View File

@ -866,7 +866,7 @@ class Contrat extends CommonObject
$total_ttc = $tabprice[2]; $total_ttc = $tabprice[2];
$total_localtax1= $tabprice[9]; $total_localtax1= $tabprice[9];
$total_localtax2= $tabprice[10]; $total_localtax2= $tabprice[10];
// \TODO A virer // TODO A virer
// Anciens indicateurs: $price, $remise (a ne plus utiliser) // Anciens indicateurs: $price, $remise (a ne plus utiliser)
$remise = 0; $remise = 0;
$price = price2num(round($pu_ht, 2)); $price = price2num(round($pu_ht, 2));
@ -882,7 +882,7 @@ class Contrat extends CommonObject
$sql.= " localtax1_tx, localtax2_tx, remise_percent, subprice,"; $sql.= " localtax1_tx, localtax2_tx, remise_percent, subprice,";
$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,"; $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
$sql.= " info_bits,"; $sql.= " info_bits,";
$sql.= " price_ht, remise"; // \TODO A virer $sql.= " price_ht, remise"; // TODO A virer
if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; } if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
if ($date_end > 0) { $sql.= ",date_fin_validite"; } if ($date_end > 0) { $sql.= ",date_fin_validite"; }
$sql.= ") VALUES ($this->id, '" . $this->db->escape($label) . "','" . $this->db->escape($desc) . "',"; $sql.= ") VALUES ($this->id, '" . $this->db->escape($label) . "','" . $this->db->escape($desc) . "',";
@ -894,7 +894,7 @@ class Contrat extends CommonObject
$sql.= " ".price2num($remise_percent).",".price2num($pu_ht).","; $sql.= " ".price2num($remise_percent).",".price2num($pu_ht).",";
$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).","; $sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
$sql.= " '".$info_bits."',"; $sql.= " '".$info_bits."',";
$sql.= " ".price2num($price).",".price2num( $remise); // \TODO A virer $sql.= " ".price2num($price).",".price2num( $remise); // TODO A virer
if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); } if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); }
if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); } if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); }
$sql.= ")"; $sql.= ")";

2
htdocs/core/class/html.formorder.class.php
View File

@ -61,7 +61,7 @@ class FormOrder
print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>'; print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
if ($addempty) print '<option value="-1" selected="selected">&nbsp;</option>'; if ($addempty) print '<option value="-1" selected="selected">&nbsp;</option>';
// \TODO Aller chercher les sources dans dictionnaire // TODO Aller chercher les sources dans dictionnaire
print '<option value="0"'.($selected=='0'?' selected="selected"':'').'>'.$langs->trans('OrderSource0').'</option>'; print '<option value="0"'.($selected=='0'?' selected="selected"':'').'>'.$langs->trans('OrderSource0').'</option>';
print '<option value="1"'.($selected=='1'?' selected="selected"':'').'>'.$langs->trans('OrderSource1').'</option>'; print '<option value="1"'.($selected=='1'?' selected="selected"':'').'>'.$langs->trans('OrderSource1').'</option>';
print '<option value="2"'.($selected=='2'?' selected="selected"':'').'>'.$langs->trans('OrderSource2').'</option>'; print '<option value="2"'.($selected=='2'?' selected="selected"':'').'>'.$langs->trans('OrderSource2').'</option>';

10
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -912,7 +912,7 @@ class CommandeFournisseur extends Commande
$subprice = price2num($pu,'MU'); $subprice = price2num($pu,'MU');
// \TODO A virer // TODO A virer
// Anciens indicateurs: $price, $remise (a ne plus utiliser) // Anciens indicateurs: $price, $remise (a ne plus utiliser)
$remise = 0; $remise = 0;
if ($remise_percent > 0) if ($remise_percent > 0)
@ -1148,10 +1148,10 @@ class CommandeFournisseur extends Commande
} }
/** /**
* \bref Set a delivery in database for this supplier order * Set a delivery in database for this supplier order
* \param user User that input data * @param user User that input data
* \param date Date of reception * @param date Date of reception
* \param type Type of receipt * @param type Type of receipt
*/ */
function Livraison($user, $date, $type, $comment) function Livraison($user, $date, $type, $comment)
{ {