From ca0b6c26df295b8ea5095da9fa8722deb91b6a85 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 1 May 2014 08:19:55 +0200 Subject: [PATCH] Translation --- .../salaries/class/paymentsalary.class.php | 34 +++++++-------- htdocs/compta/tva/class/tva.class.php | 43 +++++++++---------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 54edd9ec45c..f94861c31a6 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -125,14 +125,14 @@ class PaymentSalary extends CommonObject if (! $notrigger) { - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PAYMENT_SALARY_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers } return 1; @@ -239,14 +239,14 @@ class PaymentSalary extends CommonObject return -1; } - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PAYMENT_SALARY_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers return 1; } @@ -324,7 +324,7 @@ class PaymentSalary extends CommonObject $this->db->begin(); - // Insertion dans la table d'un paiement salaire + // Insert into llx_payment_salary $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_user"; $sql.= ", datep"; $sql.= ", datev"; @@ -359,23 +359,23 @@ class PaymentSalary extends CommonObject $result = $this->db->query($sql); if ($result) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary"); // TODO devrait s'appeler payment_salary + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary"); // TODO should be called payment_salary - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PAYMENT_SALARY_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers if ($this->id > 0) { $ok=1; if (! empty($conf->banque->enabled) && ! empty($this->amount)) { - // Insertion dans llx_bank + // Insert into llx_bank require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); @@ -394,8 +394,8 @@ class PaymentSalary extends CommonObject $user ); - // Mise a jour fk_bank dans llx_paiement. - // On connait ainsi le paiement qui a genere l'ecriture bancaire + // Update fk_bank into llx_paiement. + // So we know the payment which has generate the banking ecriture if ($bank_line_id > 0) { $this->update_fk_bank($bank_line_id); @@ -469,9 +469,9 @@ class PaymentSalary extends CommonObject } /** - * Mise a jour du lien entre le paiement salaire et la ligne générée dans llx_bank + * Update link between payment salary and line generate into llx_bank * - * @param int $id_bank Id compte bancaire + * @param int $id_bank Id bank account * @return int <0 if KO, >0 if OK */ function update_fk_bank($id_bank) @@ -492,11 +492,11 @@ class PaymentSalary extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Send name clicable (with possibly the picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * @param string $option Sur quoi pointe le lien - * @return string Chaine avec URL + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @param string $option link option + * @return string Chaine with URL */ function getNomUrl($withpicto=0,$option='') { diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 711ccc62f1f..94c1f3d3cee 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -121,12 +121,12 @@ class Tva extends CommonObject { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TVA_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers return $this->id; } @@ -189,12 +189,12 @@ class Tva extends CommonObject if (! $notrigger) { - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TVA_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers } return 1; @@ -295,12 +295,12 @@ class Tva extends CommonObject return -1; } - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TVA_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers return 1; } @@ -330,7 +330,7 @@ class Tva extends CommonObject /** - * Hum la fonction s'appelle 'Solde' elle doit a mon avis calculer le solde de TVA, non ? + * Balance of VAT * * @param int $year Year * @return double Amount @@ -349,7 +349,7 @@ class Tva extends CommonObject } /** - * Total de la TVA des factures emises par la societe. + * Total of the VAT from invoices emitted by the society. * * @param int $year Year * @return double Amount @@ -431,7 +431,7 @@ class Tva extends CommonObject /** - * Total de la TVA reglee aupres de qui de droit + * Total of the VAT payed * * @param int $year Year * @return double Amount @@ -473,7 +473,7 @@ class Tva extends CommonObject /** - * Ajoute un paiement de TVA + * Create in database * * @param User $user Object user that insert * @return int <0 if KO, rowid in tva table if OK @@ -514,7 +514,7 @@ class Tva extends CommonObject return -5; } - // Insertion dans la table d'un paiement tva + // Insert into llx_tva $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (datep"; $sql.= ", datev"; $sql.= ", amount"; @@ -543,21 +543,21 @@ class Tva extends CommonObject $result = $this->db->query($sql); if ($result) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO devrait s'appeler paiementtva + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called paiementtva - // Appel des triggers + // Start triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TVA_ADDPAYMENT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + // End triggers if ($this->id > 0) { $ok=1; if (! empty($conf->banque->enabled) && ! empty($this->amount)) { - // Insertion dans llx_bank + // Insert into llx_bank require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); @@ -613,9 +613,9 @@ class Tva extends CommonObject } /** - * Mise a jour du lien entre le paiement tva et la ligne generee dans llx_bank + * Update link between payment tva and line generate into llx_bank * - * @param int $id_bank Id compte bancaire + * @param int $id_bank Id bank account * @return int <0 if KO, >0 if OK */ function update_fk_bank($id_bank) @@ -634,13 +634,12 @@ class Tva extends CommonObject } } - /** - * Renvoie nom clicable (avec eventuellement le picto) + * Send name clicable (with possibly the picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * @param string $option Sur quoi pointe le lien - * @return string Chaine avec URL + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @param string $option link option + * @return string Chaine with URL */ function getNomUrl($withpicto=0,$option='') {