From 0f03b16313287c8a12e5c765d175e5baa2717630 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 18 Mar 2019 12:46:32 +0100 Subject: [PATCH 1/3] translation --- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/compta/facture/class/facture-rec.class.php | 4 ++-- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index fd9187afb9c..dc9bc9ea87e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -411,7 +411,7 @@ class Propal extends CommonObject * @param float $txtva Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)') * @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside) * @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside) - * @param int $fk_product Id du produit/service predefini + * @param int $fk_product Product/Service ID predefined * @param float $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC * @param float $pu_ttc Prix unitaire TTC diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 0d32c25bc5a..4b801804e3e 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -681,7 +681,7 @@ class FactureRec extends CommonInvoice * @param double $txtva Taux de tva force, sinon -1 * @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax2 Local tax 2 rate (deprecated) - * @param int $fk_product Id du produit/service predefini + * @param int $fk_product Product/Service ID predefined * @param double $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC * @param int $info_bits VAT npr or not ? @@ -862,7 +862,7 @@ class FactureRec extends CommonInvoice * @param double $txtva Taux de tva force, sinon -1 * @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax2 Local tax 2 rate (deprecated) - * @param int $fk_product Id du produit/service predefini + * @param int $fk_product Product/Service ID predefined * @param double $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC * @param int $info_bits Bits de type de lignes diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index aa914b54894..e30ae227aa0 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1540,7 +1540,7 @@ class FactureFournisseur extends CommonInvoice * @param double $txlocaltax1 LocalTax1 Rate * @param double $txlocaltax2 LocalTax2 Rate * @param double $qty Quantite - * @param int $fk_product Id du produit/service predefini + * @param int $fk_product Product/Service ID predefined * @param double $remise_percent Pourcentage de remise de la ligne * @param date $date_start Date de debut de validite du service * @param date $date_end Date de fin de validite du service diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 3aba8afccc1..3ce2ee71438 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -373,7 +373,7 @@ class SupplierProposal extends CommonObject * @param double $txtva Taux de tva * @param double $txlocaltax1 Local tax 1 rate * @param double $txlocaltax2 Local tax 2 rate - * @param int $fk_product Id du produit/service predefini + * @param int $fk_product Product/Service ID predefined * @param double $remise_percent Pourcentage de remise de la ligne * @param string $price_base_type HT or TTC * @param double $pu_ttc Prix unitaire TTC From c13a1dbc63fd0e1b53607cfb993019f5f185faea Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 18 Mar 2019 13:45:24 +0100 Subject: [PATCH 2/3] translation --- htdocs/commande/class/commande.class.php | 2 +- htdocs/compta/facture/class/facture-rec.class.php | 4 ++-- htdocs/compta/facture/class/facture.class.php | 6 +++--- htdocs/contrat/class/contrat.class.php | 4 ++-- htdocs/fourn/class/fournisseur.facture.class.php | 4 ++-- htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index a92bfe23eb8..f391d4bf0e0 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1281,7 +1281,7 @@ class Commande extends CommonOrder * @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside) * @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside) * @param int $fk_product Id of product - * @param float $remise_percent Pourcentage de remise de la ligne + * @param float $remise_percent Percentage discount of the line * @param int $info_bits Bits de type de lignes * @param int $fk_remise_except Id remise * @param string $price_base_type HT or TTC diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 4b801804e3e..89f324d2450 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -682,7 +682,7 @@ class FactureRec extends CommonInvoice * @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax2 Local tax 2 rate (deprecated) * @param int $fk_product Product/Service ID predefined - * @param double $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Percentage discount of the line * @param string $price_base_type HT or TTC * @param int $info_bits VAT npr or not ? * @param int $fk_remise_except Id remise @@ -863,7 +863,7 @@ class FactureRec extends CommonInvoice * @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax2 Local tax 2 rate (deprecated) * @param int $fk_product Product/Service ID predefined - * @param double $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Percentage discount of the line * @param string $price_base_type HT or TTC * @param int $info_bits Bits de type de lignes * @param int $fk_remise_except Id remise diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 6076cbb6232..092049e5c13 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2865,9 +2865,9 @@ class Facture extends CommonInvoice * @param string $desc Description of line * @param double $pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines) * @param double $qty Quantity - * @param double $remise_percent Pourcentage de remise de la ligne - * @param int $date_start Date de debut de validite du service - * @param int $date_end Date de fin de validite du service + * @param double $remise_percent Percentage discount of the line + * @param int $date_start Date de debut de validite du service + * @param int $date_end Date de fin de validite du service * @param double $txtva VAT Rate (Can be '8.5', '8.5 (ABC)') * @param double $txlocaltax1 Local tax 1 rate * @param double $txlocaltax2 Local tax 2 rate diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index f083ef59a2d..f89ad5e7307 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1345,7 +1345,7 @@ class Contrat extends CommonObject * @param float $txlocaltax1 Local tax 1 rate * @param float $txlocaltax2 Local tax 2 rate * @param int $fk_product Id produit - * @param float $remise_percent Pourcentage de remise de la ligne + * @param float $remise_percent Percentage discount of the line * @param int $date_start Date de debut prevue * @param int $date_end Date de fin prevue * @param string $price_base_type HT or TTC @@ -1552,7 +1552,7 @@ class Contrat extends CommonObject * @param string $desc Description de la ligne * @param float $pu Prix unitaire * @param int $qty Quantite - * @param float $remise_percent Pourcentage de remise de la ligne + * @param float $remise_percent Percentage discount of the line * @param int $date_start Date de debut prevue * @param int $date_end Date de fin prevue * @param float $tvatx Taux TVA diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index e30ae227aa0..4450ee611f8 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1541,7 +1541,7 @@ class FactureFournisseur extends CommonInvoice * @param double $txlocaltax2 LocalTax2 Rate * @param double $qty Quantite * @param int $fk_product Product/Service ID predefined - * @param double $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Percentage discount of the line * @param date $date_start Date de debut de validite du service * @param date $date_end Date de fin de validite du service * @param string $ventil Code de ventilation comptable @@ -1794,7 +1794,7 @@ class FactureFournisseur extends CommonInvoice * @param double $price_base_type HT or TTC * @param int $info_bits Miscellaneous informations of line * @param int $type Type of line (0=product, 1=service) - * @param double $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Percentage discount of the line * @param int $notrigger Disable triggers * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 3ce2ee71438..90e6a10c0a0 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -374,7 +374,7 @@ class SupplierProposal extends CommonObject * @param double $txlocaltax1 Local tax 1 rate * @param double $txlocaltax2 Local tax 2 rate * @param int $fk_product Product/Service ID predefined - * @param double $remise_percent Pourcentage de remise de la ligne + * @param double $remise_percent Percentage discount of the line * @param string $price_base_type HT or TTC * @param double $pu_ttc Prix unitaire TTC * @param int $info_bits Bits de type de lignes From 5a48cd2f6a8ba1dc104fed3cdacccdc986eaa491 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 18 Mar 2019 14:01:03 +0100 Subject: [PATCH 3/3] translation --- htdocs/cashdesk/class/Facturation.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index cbaacee2a2f..f565e86aa1b 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -21,7 +21,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; /** - * Class ot manage invoices for pos module (cashdesk) + * Class to manage invoices for pos module (cashdesk) */ class Facturation { @@ -84,7 +84,7 @@ class Facturation } - // Methodes de traitement des donnees + // Data processing methods /** @@ -124,14 +124,14 @@ class Facturation // Define part of HT, VAT, TTC $resultarray=calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray); - // Calcul du total ht sans remise + // Calculation of total HT without discount $total_ht = $resultarray[0]; $total_vat = $resultarray[1]; $total_ttc = $resultarray[2]; $total_localtax1 = $resultarray[9]; $total_localtax2 = $resultarray[10]; - // Calcul du montant de la remise + // Calculation of the discount amount if ($this->remisePercent()) { $remise_percent = $this->remisePercent(); @@ -201,7 +201,7 @@ class Facturation } /** - * Calcul du total HT, total TTC et montants TVA + * Calculation of total HT, total TTC and VAT amounts * * @return int Total */ @@ -240,7 +240,7 @@ class Facturation } /** - * Reinitialisation des attributs + * Reset attributes * * @return void */ @@ -257,7 +257,7 @@ class Facturation } /** - * Reinitialisation des attributs persistants + * Resetting persistent attributes * * @return void */ @@ -275,7 +275,7 @@ class Facturation } - // Methodes de modification des attributs proteges + // Methods for modifying protected attributes /** * Getter for id @@ -560,7 +560,7 @@ class Facturation } /** - * Get totla HT + * Get total HT * * @param int $aTotalHt Total amount * @return int Total amount