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

Fix: traduction

Browse Source
This commit is contained in:
Regis Houssin 2007-10-20 21:46:32 +00:00
parent 6e69cc9f5e
commit 2b868859c9
4 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -107,14 +107,15 @@ class pdf_einstein extends ModelePDFCommandes
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$outputlangs->load("main"); $outputlangs->load("main");
$outputlangs->load("companies"); $outputlangs->load("dict");
$outputlangs->load("bills"); $outputlangs->load("companies");
$outputlangs->load("products"); $outputlangs->load("bills");
$outputlangs->load("orders"); $outputlangs->load("products");
$outputlangs->load("orders");
$outputlangs->setPhpLang(); $outputlangs->setPhpLang();
if ($conf->commande->dir_output) if ($conf->commande->dir_output)
{ {
// Définition de l'objet $com (pour compatibilite ascendante) // Définition de l'objet $com (pour compatibilite ascendante)
if (! is_object($com)) if (! is_object($com))

62
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -49,12 +49,12 @@ class pdf_crabe extends ModelePDFFactures
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$this->db = $db; $this->db = $db;
$this->name = "crabe"; $this->name = "crabe";
$this->description = $langs->trans('PDFCrabeDescription'); $this->description = $langs->trans('PDFCrabeDescription');
// Dimension page pour format A4 // Dimension page pour format A4
$this->type = 'pdf'; $this->type = 'pdf';
@ -103,39 +103,41 @@ class pdf_crabe extends ModelePDFFactures
*/ */
function write_pdf_file($fac,$outputlangs='') function write_pdf_file($fac,$outputlangs='')
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$outputlangs->load("main"); $outputlangs->load("main");
$outputlangs->load("companies"); $outputlangs->load("dict");
$outputlangs->load("bills"); $outputlangs->load("companies");
$outputlangs->load("products"); $outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->setPhpLang(); $outputlangs->setPhpLang();
if ($conf->facture->dir_output) if ($conf->facture->dir_output)
{
// Définition de l'objet $fac (pour compatibilite ascendante)
if (! is_object($fac))
{ {
// Définition de l'objet $fac (pour compatibilite ascendante) $id = $fac;
if (! is_object($fac)) $fac = new Facture($this->db,"",$id);
{ $ret=$fac->fetch($id);
$id = $fac; }
$fac = new Facture($this->db,"",$id);
$ret=$fac->fetch($id);
}
$deja_regle = $fac->getSommePaiement();
// Définition de $dir et $file $deja_regle = $fac->getSommePaiement();
if ($fac->specimen)
{ // Définition de $dir et $file
$dir = $conf->facture->dir_output; if ($fac->specimen)
$file = $dir . "/SPECIMEN.pdf"; {
} $dir = $conf->facture->dir_output;
else $file = $dir . "/SPECIMEN.pdf";
{ }
$facref = sanitize_string($fac->ref); else
$dir = $conf->facture->dir_output . "/" . $facref; {
$file = $dir . "/" . $facref . ".pdf"; $facref = sanitize_string($fac->ref);
} $dir = $conf->facture->dir_output . "/" . $facref;
$file = $dir . "/" . $facref . ".pdf";
}
if (! file_exists($dir)) if (! file_exists($dir))
{ {

15
htdocs/includes/modules/modProduit.class.php
View File

@ -49,6 +49,8 @@ class modProduit extends DolibarrModules
*/ */
function modProduit($DB) function modProduit($DB)
{ {
global $conf;
$this->db = $DB ; $this->db = $DB ;
$this->id = 'produit'; // Same value xxx than in file modXxx.class.php file $this->id = 'produit'; // Same value xxx than in file modXxx.class.php file
$this->numero = 50 ; $this->numero = 50 ;
@ -168,10 +170,21 @@ class modProduit extends DolibarrModules
$r++; $r++;
$this->import_code[$r]=$this->id.'_'.$r; $this->import_code[$r]=$this->id.'_'.$r;
$this->import_label[$r]="ProductsOrServices"; // Translation key $this->import_label[$r]="ProductsOrServices"; // Translation key
$this->import_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"PriceHT",'p.price_ttc'=>"PriceTTC",'p.tva_tx'=>'VAT','p.envente'=>"OnSell",'p.duration'=>"Duration"); $this->import_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.envente'=>"OnSell",'p.duration'=>"Duration");
$this->import_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>'product','p.envente'=>"product",'p.duration'=>"product"); $this->import_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>'product','p.envente'=>"product",'p.duration'=>"product");
//$this->import_alias_array[$r]=array('p.rowid'=>"id",'p.ref'=>"ref",'p.fk_product_type'=>"type",'p.label'=>"label",'p.description'=>"description",'p.note'=>"note",'p.price'=>"price",'p.tva_tx'=>'vat','p.envente'=>"onsell",'p.duration'=>"duration"); //$this->import_alias_array[$r]=array('p.rowid'=>"id",'p.ref'=>"ref",'p.fk_product_type'=>"type",'p.label'=>"label",'p.description'=>"description",'p.note'=>"note",'p.price'=>"price",'p.tva_tx'=>'vat','p.envente'=>"onsell",'p.duration'=>"duration");
if($conf->global->PRODUIT_MULTIPRICES)
{
$this->import_multiprices[$r]=array();
for($i=1;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
{
$this->import_multiprices[$r][$i]["price_ht"] = "SellingPriceHT ".$i;
$this->import_multiprices[$r][$i]["price_ttc"] = "SellingPriceTTC ".$i;
}
}
} }

9
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -105,10 +105,11 @@ class pdf_propale_azur extends ModelePDFPropales
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$outputlangs->load("main"); $outputlangs->load("main");
$outputlangs->load("companies"); $outputlangs->load("dict");
$outputlangs->load("bills"); $outputlangs->load("companies");
$outputlangs->load("propal"); $outputlangs->load("bills");
$outputlangs->load("products"); $outputlangs->load("propal");
$outputlangs->load("products");
$outputlangs->setPhpLang(); $outputlangs->setPhpLang();