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

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-06-10 14:28:23 +00:00
parent cc1329b108
commit 976c74ac87
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,9 @@ class CommandeFournisseur extends Commande
var $fk_element = 'fk_commande';
var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $ref;
var $ref; // TODO deprecated
var $product_ref;
var $ref_supplier;
var $brouillon;
var $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
// -> 7=Canceled/Never received -> (reopen) 3=Process runing
@ -172,7 +174,7 @@ class CommandeFournisseur extends Commande
$sql.= " l.tva_tx, l.remise_percent, l.subprice,";
$sql.= " l.localtax1_tx, l. localtax2_tx, l.total_localtax1, l.total_localtax2,";
$sql.= " l.total_ht, l.total_tva, l.total_ttc,";
$sql.= " p.rowid as product_id, p.ref, p.label as label, p.description as product_desc";
$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
$sql.= " WHERE l.fk_commande = ".$this->id;
@ -212,7 +214,8 @@ class CommandeFournisseur extends Commande
$line->libelle = $objp->label; // Label produit
$line->product_desc = $objp->product_desc; // Description produit
$line->ref = $objp->ref; // Reference
$line->ref = $objp->product_ref; // TODO deprecated
$line->product_ref = $objp->product_ref; // Internal reference
$line->ref_fourn = $objp->ref_supplier; // TODO deprecated
$line->ref_supplier = $objp->ref_supplier; // Reference supplier

8
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -47,7 +47,8 @@ class FactureFournisseur extends Facture
var $fk_element='fk_facture_fourn';
var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $ref;
var $ref; // TODO deprecated
var $product_ref;
var $ref_supplier;
var $socid;
//! 0=Standard invoice, 1=Replacement invoice, 2=Credit note invoice, 3=Deposit invoice, 4=Proforma invoice
@ -382,7 +383,7 @@ class FactureFournisseur extends Facture
$sql = 'SELECT f.rowid, f.description, f.pu_ht, f.pu_ttc, f.qty, f.tva_tx, f.tva';
$sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type';
$sql.= ', p.rowid as product_id, p.ref, p.label as label, p.description as product_desc';
$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
//$sql.= ', pf.ref_fourn';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
@ -402,7 +403,8 @@ class FactureFournisseur extends Facture
$obj = $this->db->fetch_object($resql_rows);
$this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->description = $obj->description;
$this->lines[$i]->ref = $obj->ref; // Reference interne du produit
$this->lines[$i]->ref = $obj->product_ref; // TODO deprecated
$this->lines[$i]->product_ref = $obj->product_ref; // Internal reference
//$this->lines[$i]->ref_fourn = $obj->ref_fourn; // Reference fournisseur du produit
$this->lines[$i]->libelle = $obj->label; // Label du produit
$this->lines[$i]->product_desc = $obj->product_desc; // Description du produit

3
htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
View File

@ -175,7 +175,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
{
// Get code using getLabelFromKey
$code=$outputlangs->getLabelFromKey($this->db,$object->expedition_method_id,'c_shipment_mode','rowid','code');
$label=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
$label=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
$label.=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top-1, $label." ".$object->tracking_url, 0, 1, false, true, 'L');
}

1
htdocs/langs/en_US/sendings.lang
View File

@ -53,6 +53,7 @@ DateReceived=Date delivery received
SendShippingByEMail=Send shipping by EMail
SendShippingRef=Send shipping %s
ActionsOnShipping=Acions on shipping
LinkToTrackYourPackage=Link to track your package
# Sending methods
SendingMethodCATCH=Catch by customer

1
htdocs/langs/fr_FR/sendings.lang
View File

@ -53,6 +53,7 @@ DateReceived=Date réception réelle
SendShippingByEMail=Envoi bon d'expédition par EMail
SendShippingRef=Envoi bon d'expédition %s
ActionsOnShipping=Événements sur l'expédition
LinkToTrackYourPackage=Lien pour suivi de votre colis
# Sending methods
SendingMethodCATCH=Enlèvement par le client