diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index aaf97cc6010..be0aa69a82b 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,8 +67,12 @@ class FactureFournisseur extends Facture var $amount; var $remise; var $tva; + var $localtax1; + var $localtax2; var $total_ht; var $total_tva; + var $total_localtax1; + var $total_localtax2; var $total_ttc; var $note; var $note_public; @@ -94,6 +98,8 @@ class FactureFournisseur extends Facture $this->amount = 0; $this->remise = 0; $this->tva = 0; + $this->total_localtax1 = 0; + $this->total_localtax2 = 0; $this->total_ht = 0; $this->total_tva = 0; $this->total_ttc = 0; @@ -183,6 +189,8 @@ class FactureFournisseur extends Facture $this->lines[$i]->description, $this->lines[$i]->pu_ht, $this->lines[$i]->tva_tx, + $this->lines[$i]->localtax1_tx, + $this->lines[$i]->localtax2_tx, $this->lines[$i]->qty, $this->lines[$i]->fk_product, 'HT', @@ -310,8 +318,8 @@ class FactureFournisseur extends Facture $this->close_code = $obj->close_code; $this->close_note = $obj->close_note; $this->tva = $obj->tva; - $this->localtax1 = $obj->localtax1; - $this->localtax2 = $obj->localtax2; + $this->total_localtax1 = $obj->localtax1; + $this->total_localtax2 = $obj->localtax2; $this->total = $obj->total; $this->total_ht = $obj->total_ht; $this->total_tva = $obj->total_tva; @@ -457,6 +465,7 @@ class FactureFournisseur extends Facture function fetch_lines() { $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.= ', pf.ref_fourn'; @@ -485,10 +494,14 @@ class FactureFournisseur extends Facture $this->lines[$i]->pu_ht = $obj->pu_ht; $this->lines[$i]->pu_ttc = $obj->pu_ttc; $this->lines[$i]->tva_tx = $obj->tva_tx; + $this->lines[$i]->localtax1_tx = $obj->localtax1_tx; + $this->lines[$i]->localtax2_tx = $obj->localtax2_tx; $this->lines[$i]->qty = $obj->qty; $this->lines[$i]->tva = $obj->tva; $this->lines[$i]->total_ht = $obj->total_ht; $this->lines[$i]->total_tva = $obj->total_tva; + $this->lines[$i]->total_localtax1 = $obj->total_localtax1; + $this->lines[$i]->total_localtax2 = $obj->total_localtax2; $this->lines[$i]->total_ttc = $obj->total_ttc; $this->lines[$i]->fk_product = $obj->fk_product; $this->lines[$i]->product_type = $obj->product_type; @@ -536,6 +549,8 @@ class FactureFournisseur extends Facture if (isset($this->total)) $this->total=trim($this->total); if (isset($this->total_ht)) $this->total_ht=trim($this->total_ht); if (isset($this->total_tva)) $this->total_tva=trim($this->total_tva); + // if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1); + // if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2); if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc); if (isset($this->statut)) $this->statut=trim($this->statut); if (isset($this->author)) $this->author=trim($this->author); @@ -953,25 +968,29 @@ class FactureFournisseur extends Facture /** - * \brief Ajoute une ligne de facture (associe a aucun produit/service predefini) - * \param desc Description de la ligne - * \param pu Prix unitaire (HT ou TTC selon price_base_type) - * \param txtva Taux de tva force, sinon -1 - * \param qty Quantite - * \param fk_product Id du produit/service predefini - * \param remise_percent Pourcentage de remise de la ligne - * \param date_start Date de debut de validite du service - * \param date_end Date de fin de validite du service - * \param ventil Code de ventilation comptable - * \param info_bits Bits de type de lines - * \param price_base_type HT ou TTC - * \param type Type of line (0=product, 1=service) - * \remarks Les parametres sont deja cense etre juste et avec valeurs finales a l'appel - * de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini - * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod) - * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) + * Ajoute une ligne de facture (associe a aucun produit/service predefini) + * Les parametres sont deja cense etre juste et avec valeurs finales a l'appel + * de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini + * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod) + * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) + * + * @param desc Description de la ligne + * @param pu Prix unitaire (HT ou TTC selon price_base_type) + * @param txtva Taux de tva force, sinon -1 + * @param txlocaltax1 LocalTax1 Rate + * @param txlocaltax2 LocalTax2 Rate + * @param qty Quantite + * @param fk_product Id du produit/service predefini + * @param remise_percent Pourcentage de remise de la ligne + * @param date_start Date de debut de validite du service + * @param date_end Date de fin de validite du service + * @param ventil Code de ventilation comptable + * @param info_bits Bits de type de lines + * @param price_base_type HT ou TTC + * @param type Type of line (0=product, 1=service) + * @return int >0 if OK, <0 if KO */ - function addline($desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0) + function addline($desc, $pu, $txtva, $txlocaltax1=0, $txlocaltax2=0, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0) { dol_syslog("FactureFourn::Addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG); include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); @@ -995,7 +1014,7 @@ class FactureFournisseur extends Facture { $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det'); - $result=$this->updateline($idligne, $desc, $pu, $txtva, $qty, $fk_product, $price_base_type, $info_bits, $type); + $result=$this->updateline($idligne, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product, $price_base_type, $info_bits, $type); if ($result > 0) { $this->db->commit(); @@ -1023,6 +1042,8 @@ class FactureFournisseur extends Facture * @param label Description of line * @param pu Prix unitaire (HT ou TTC selon price_base_type) * @param vatrate VAT Rate + * @param txlocaltax1 LocalTax1 Rate + * @param txlocaltax2 LocalTax2 Rate * @param qty Quantity * @param idproduct Id produit * @param price_base_type HT or TTC @@ -1030,7 +1051,7 @@ class FactureFournisseur extends Facture * @param type Type of line (0=product, 1=service) * @return int <0 if KO, >0 if OK */ - function updateline($id, $label, $pu, $vatrate, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0) + function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0) { include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); @@ -1042,19 +1063,26 @@ class FactureFournisseur extends Facture if ($type < 0) return -1; // Clean parameters - if (empty($vatrate)) $vatrate=0; + if (empty($txlocaltax1)) $txlocaltax1=0; + if (empty($txlocaltax2)) $txlocaltax2=0; + + + $txlocaltax1=price2num($txlocaltax1); + $txlocaltax2=price2num($txlocaltax2); // Calcul du total TTC et de la TVA pour la ligne a partir de // qty, pu, remise_percent et txtva // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. - $tabprice = calcul_price_total($qty, $pu, 0, $vatrate, 0,0, 0, $price_base_type, $info_bits); + $tabprice = calcul_price_total($qty, $pu, 0, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; $total_ttc = $tabprice[2]; $pu_ht = $tabprice[3]; $pu_tva = $tabprice[4]; $pu_ttc = $tabprice[5]; + $total_localtax1 = $tabprice[9]; + $total_localtax2 = $tabprice[10]; if ($idproduct) { @@ -1073,8 +1101,12 @@ class FactureFournisseur extends Facture $sql.= ", pu_ttc = ".price2num($pu_ttc); $sql.= ", qty = ".price2num($qty); $sql.= ", tva_tx = ".price2num($vatrate); + $sql.= ", localtax1_tx = ".price2num($txlocaltax1); + $sql.= ", localtax2_tx = ".price2num($txlocaltax2); $sql.= ", total_ht = ".price2num($total_ht); $sql.= ", tva= ".price2num($total_tva); + $sql.= ", total_localtax1= ".price2num($total_localtax1); + $sql.= ", total_localtax2= ".price2num($total_localtax2); $sql.= ", total_ttc = ".price2num($total_ttc); if ($idproduct) $sql.= ", fk_product = ".$idproduct; else $sql.= ", fk_product = null"; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index dccd6a82174..ef384050250 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -232,8 +232,8 @@ if ($_POST['action'] == 'addline' && $user->rights->fournisseur->commande->creer unset($_POST['np_desc']); unset($_POST['pu']); unset($_POST['tva_tx']); - unset($_POST['localtax1_tx']); - unset($_POST['localtax2_tx']); + unset($localtax1_tx); + unset($localtax2_tx); } else if (empty($mesg)) { diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index b3fbe913980..e7a7437ea67 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -286,6 +286,8 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer) $desc, $lines[$i]->subprice, $lines[$i]->tva_tx, + $lines[$i]->localtax1_tx, + $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, @@ -338,7 +340,11 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer) $price_base='TTC'; $amount=$amountttc; } $atleastoneline=1; - $ret=$facfou->addline($label, $amount, $tauxtva, $qty, $fk_product, $remise_percent, '', '', '', 0, $price_base); + + $product=new Product($db); + $product->fetch($_POST['idprod'.$i]); + + $ret=$facfou->addline($label, $amount, $tauxtva, $product->localtax1_tx, $product->localtax2_tx, $qty, $fk_product, $remise_percent, '', '', '', 0, $price_base); if ($ret < 0) $error++; } } @@ -370,7 +376,7 @@ if ($_GET['action'] == 'del_ligne') // Modification d'une ligne if ($_REQUEST['action'] == 'update_line') { - if ($_REQUEST['etat'] == '1' && ! $_REQUEST['cancel']) // si on valide la modification + if ($_REQUEST['etat'] == '1' && ! $_REQUEST['cancel']) // si on valide la modification { $facfou = new FactureFournisseur($db); $facfou->fetch($_GET['facid']); @@ -392,14 +398,23 @@ if ($_REQUEST['action'] == 'update_line') $prod->fetch($_POST['idprod']); $label = $prod->libelle; $type = $prod->type; + $localtax1_tx = $prod->localtax1_tx; + $localtax2_tx = $prod->localtax2_tx; } else { + if ($facfou->socid) + { + $societe=new Societe($db); + $societe->fetch($facfou->socid); + } $label = $_POST['label']; $type = $_POST["type"]?$_POST["type"]:0; + $localtax1tx= get_localtax($_POST['tauxtva'], 1, $societe); + $localtax2tx= get_localtax($_POST['tauxtva'], 2, $societe); } - $result=$facfou->updateline($_GET['lineid'], $label, $pu, $_POST['tauxtva'], $_POST['qty'], $_POST['idprod'], $price_base_type, 0, $type); + $result=$facfou->updateline($_GET['lineid'], $label, $pu, $_POST['tauxtva'], $localtax1tx, $localtax2tx, $_POST['qty'], $_POST['idprod'], $price_base_type, 0, $type); if ($result >= 0) { unset($_POST['label']); @@ -416,6 +431,12 @@ if ($_GET['action'] == 'addline') dol_print_error($db,$facfou->error); exit; } + + if ($facfou->socid) + { + $societe=new Societe($db); + $societe->fetch($facfou->socid); + } if ($_POST['idprodfournprice']) // > 0 or -1 { @@ -429,17 +450,16 @@ if ($_GET['action'] == 'addline') // $label = '['.$product->ref.'] - '. $product->libelle; $label = $product->libelle; - $societe=''; - if ($facfou->socid) - { - $societe=new Societe($db); - $societe->fetch($facfou->socid); - } + $tvatx=get_default_tva($societe,$mysoc,$product->id); + + $localtax1tx= get_localtax($tvatx, 1, $societe); + $localtax2tx= get_localtax($tvatx, 2, $societe); + $type = $product->type; - $result=$facfou->addline($label, $product->fourn_pu, $tvatx, $_POST['qty'], $idprod); + $result=$facfou->addline($label, $product->fourn_pu, $tvatx, $localtax2tx, $localtax2tx ,$_POST['qty'], $idprod); } if ($idprod == -1) { @@ -451,6 +471,9 @@ if ($_GET['action'] == 'addline') else { $tauxtva = price2num($_POST['tauxtva']); + $localtax1tx= get_localtax($tauxtva, 1, $societe); + $localtax2tx= get_localtax($tauxtva, 2, $societe); + if (! $_POST['label']) { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'
'; @@ -462,15 +485,16 @@ if ($_GET['action'] == 'addline') { $ht = price2num($_POST['amount']); $price_base_type = 'HT'; + //$desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0) - $result=$facfou->addline($_POST['label'], $ht, $tauxtva, $_POST['qty'], 0, 0, $datestart, $dateend, 0, 0, $price_base_type, $type); + $result=$facfou->addline($_POST['label'], $ht, $tauxtva, $localtax1tx, $localtax2tx, $_POST['qty'], 0, 0, $datestart, $dateend, 0, 0, $price_base_type, $type); } else { $ttc = price2num($_POST['amountttc']); $ht = $ttc / (1 + ($tauxtva / 100)); $price_base_type = 'HT'; - $result=$facfou->addline($_POST['label'], $ht, $tauxtva, $_POST['qty'], 0, 0, $datestart, $dateend, 0, 0, $price_base_type, $type); + $result=$facfou->addline($_POST['label'], $ht, $tauxtva,$localtax1tx, $localtax2tx, $_POST['qty'], 0, 0, $datestart, $dateend, 0, 0, $price_base_type, $type); } } } @@ -495,6 +519,8 @@ if ($_GET['action'] == 'addline') unset($_POST['pu']); unset($_POST['tva_tx']); unset($_POST['label']); + unset($localtax1_tx); + unset($localtax2_tx); } else if (empty($mesg)) { @@ -1399,13 +1425,13 @@ else if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).''; - print ''.price($propal->total_localtax1).''; + print ''.price($fac->total_localtax1).''; print ''.$langs->trans("Currency".$conf->monnaie).''; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).''; - print ''.price($propal->total_localtax2).''; + print ''.price($fac->total_localtax2).''; print ''.$langs->trans("Currency".$conf->monnaie).''; } } diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 0460b55ae26..0ff6099bbcd 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -1,6 +1,6 @@ - * Copyright (C) 2010 Laurent Destailleur +/* Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -282,10 +282,20 @@ class pdf_canelle extends ModelePDFSuppliersInvoices // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva $tvaligne=$object->lines[$i]->total_tva; + + $localtax1ligne=$object->lines[$i]->total_localtax1; + $localtax2ligne=$object->lines[$i]->total_localtax2; + if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100; + $vatrate=(string) $object->lines[$i]->tva_tx; + $localtax1rate=(string) $object->lines[$i]->localtax1_tx; + $localtax2rate=(string) $object->lines[$i]->localtax2_tx; + if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*'; $this->tva[$vatrate] += $tvaligne; + $this->localtax1[$localtax1rate]+=$localtax1ligne; + $this->localtax2[$localtax2rate]+=$localtax2ligne; $nexY+=2; // Passe espace entre les lignes @@ -382,6 +392,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices */ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs) { + global $conf,$mysoc; $default_font_size = pdf_getPDFFontSize($outputlangs); $tab2_top = $posy; @@ -440,6 +451,84 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1); + + // Total LocalTax1 + if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0) + { + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code), $useborder, 'L', 1); + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1); + } + + // Total LocalTax2 + if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0) + { + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code), $useborder, 'L', 1); + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1); + } + } + else + { + //Local tax 1 + if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') + { + foreach( $this->localtax1 as $tvakey => $tvaval ) + { + if ($tvakey>0) // On affiche pas taux 0 + { + //$this->atleastoneratenotnull++; + + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + + $tvacompl=''; + if (preg_match('/\*/',$tvakey)) + { + $tvakey=str_replace('*','',$tvakey); + $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; + } + $totalvat =$outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' '; + $totalvat.=vatrate($tvakey,1).$tvacompl; + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1); + } + } + } + + //Local tax 2 + if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') + { + foreach( $this->localtax2 as $tvakey => $tvaval ) + { + if ($tvakey>0) // On affiche pas taux 0 + { + //$this->atleastoneratenotnull++; + + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + + $tvacompl=''; + if (preg_match('/\*/',$tvakey)) + { + $tvakey=str_replace('*','',$tvakey); + $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; + } + $totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' '; + $totalvat.=vatrate($tvakey,1).$tvacompl; + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1); + } + } + } } $useborder=0; diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 4f12914a118..0aa26803edc 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke + * Copyright (C) 2010 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by