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

Merge pull request #10874 from grandoc/translation

Browse Source 
translation
This commit is contained in:
Laurent Destailleur 2019-03-19 11:14:40 +01:00 committed by GitHub
commit b10690ce88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/cashdesk/class/Facturation.class.php
View File

@ -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 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 // 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); $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_ht = $resultarray[0];
$total_vat = $resultarray[1]; $total_vat = $resultarray[1];
$total_ttc = $resultarray[2]; $total_ttc = $resultarray[2];
$total_localtax1 = $resultarray[9]; $total_localtax1 = $resultarray[9];
$total_localtax2 = $resultarray[10]; $total_localtax2 = $resultarray[10];
// Calcul du montant de la remise // Calculation of the discount amount
if ($this->remisePercent()) if ($this->remisePercent())
{ {
$remise_percent = $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 * @return int Total
*/ */
@ -240,7 +240,7 @@ class Facturation
} }
/** /**
* Reinitialisation des attributs * Reset attributes
* *
* @return void * @return void
*/ */
@ -257,7 +257,7 @@ class Facturation
} }
/** /**
* Reinitialisation des attributs persistants * Resetting persistent attributes
* *
* @return void * @return void
*/ */
@ -275,7 +275,7 @@ class Facturation
} }
// Methodes de modification des attributs proteges // Methods for modifying protected attributes
/** /**
* Getter for id * Getter for id
@ -560,7 +560,7 @@ class Facturation
} }
/** /**
* Get totla HT * Get total HT
* *
* @param int $aTotalHt Total amount * @param int $aTotalHt Total amount
* @return int Total amount * @return int Total amount

2
htdocs/comm/propal/class/propal.class.php
View File

@ -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 $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 $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 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 float $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
* @param float $pu_ttc Prix unitaire TTC * @param float $pu_ttc Prix unitaire TTC

2
htdocs/commande/class/commande.class.php
View File

@ -1281,7 +1281,7 @@ class Commande extends CommonOrder
* @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside) * @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 float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside)
* @param int $fk_product Id of product * @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 $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise * @param int $fk_remise_except Id remise
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC

8
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -681,8 +681,8 @@ class FactureRec extends CommonInvoice
* @param double $txtva Taux de tva force, sinon -1 * @param double $txtva Taux de tva force, sinon -1
* @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax1 Local tax 1 rate (deprecated)
* @param double $txlocaltax2 Local tax 2 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 double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
* @param int $info_bits VAT npr or not ? * @param int $info_bits VAT npr or not ?
* @param int $fk_remise_except Id remise * @param int $fk_remise_except Id remise
@ -862,8 +862,8 @@ class FactureRec extends CommonInvoice
* @param double $txtva Taux de tva force, sinon -1 * @param double $txtva Taux de tva force, sinon -1
* @param double $txlocaltax1 Local tax 1 rate (deprecated) * @param double $txlocaltax1 Local tax 1 rate (deprecated)
* @param double $txlocaltax2 Local tax 2 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 double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
* @param int $info_bits Bits de type de lignes * @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise * @param int $fk_remise_except Id remise

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

@ -2865,9 +2865,9 @@ class Facture extends CommonInvoice
* @param string $desc Description of line * @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 $pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines)
* @param double $qty Quantity * @param double $qty Quantity
* @param double $remise_percent Pourcentage de remise de la ligne * @param double $remise_percent Percentage discount of the line
* @param int $date_start Date de debut de validite du service * @param int $date_start Date de debut de validite du service
* @param int $date_end Date de fin 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 $txtva VAT Rate (Can be '8.5', '8.5 (ABC)')
* @param double $txlocaltax1 Local tax 1 rate * @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate * @param double $txlocaltax2 Local tax 2 rate

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

@ -1345,7 +1345,7 @@ class Contrat extends CommonObject
* @param float $txlocaltax1 Local tax 1 rate * @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate * @param float $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id produit * @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_start Date de debut prevue
* @param int $date_end Date de fin prevue * @param int $date_end Date de fin prevue
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
@ -1552,7 +1552,7 @@ class Contrat extends CommonObject
* @param string $desc Description de la ligne * @param string $desc Description de la ligne
* @param float $pu Prix unitaire * @param float $pu Prix unitaire
* @param int $qty Quantite * @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_start Date de debut prevue
* @param int $date_end Date de fin prevue * @param int $date_end Date de fin prevue
* @param float $tvatx Taux TVA * @param float $tvatx Taux TVA

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

@ -1540,8 +1540,8 @@ class FactureFournisseur extends CommonInvoice
* @param double $txlocaltax1 LocalTax1 Rate * @param double $txlocaltax1 LocalTax1 Rate
* @param double $txlocaltax2 LocalTax2 Rate * @param double $txlocaltax2 LocalTax2 Rate
* @param double $qty Quantite * @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 double $remise_percent Percentage discount of the line
* @param date $date_start Date de debut de validite du service * @param date $date_start Date de debut de validite du service
* @param date $date_end Date de fin de validite du service * @param date $date_end Date de fin de validite du service
* @param string $ventil Code de ventilation comptable * @param string $ventil Code de ventilation comptable
@ -1794,7 +1794,7 @@ class FactureFournisseur extends CommonInvoice
* @param double $price_base_type HT or TTC * @param double $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations of line * @param int $info_bits Miscellaneous informations of line
* @param int $type Type of line (0=product, 1=service) * @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 int $notrigger Disable triggers
* @param timestamp $date_start Date start of service * @param timestamp $date_start Date start of service
* @param timestamp $date_end Date end of service * @param timestamp $date_end Date end of service

4
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -373,8 +373,8 @@ class SupplierProposal extends CommonObject
* @param double $txtva Taux de tva * @param double $txtva Taux de tva
* @param double $txlocaltax1 Local tax 1 rate * @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 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 double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
* @param double $pu_ttc Prix unitaire TTC * @param double $pu_ttc Prix unitaire TTC
* @param int $info_bits Bits de type de lignes * @param int $info_bits Bits de type de lignes