From 69475b7bf8debd1224b918293bb8450078743ff0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 12:49:30 +0200 Subject: [PATCH 01/10] Sync from transifex. Fix var not initialized. --- htdocs/comm/action/class/ical.class.php | 19 +-- htdocs/langs/ar_SA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/bg_BG/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/bs_BA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ca_ES/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/cs_CZ/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/da_DK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/de_DE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/el_GR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/et_EE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/eu_ES/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/fa_IR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/fi_FI/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/he_IL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/hr_HR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/hu_HU/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/id_ID/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/is_IS/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/it_IT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ja_JP/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ko_KR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/lt_LT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/lv_LV/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/mk_MK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/nb_NO/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/nl_NL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/pl_PL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/pt_PT/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ro_RO/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/ru_RU/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sk_SK/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sl_SI/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sq_AL/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/sv_SE/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/th_TH/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/tr_TR/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/uk_UA/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/vi_VN/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/zh_CN/accountancy.lang | 158 ++++++++++++++++++++++++ htdocs/langs/zh_TW/accountancy.lang | 158 ++++++++++++++++++++++++ 40 files changed, 6173 insertions(+), 8 deletions(-) create mode 100644 htdocs/langs/ar_SA/accountancy.lang create mode 100644 htdocs/langs/bg_BG/accountancy.lang create mode 100644 htdocs/langs/bs_BA/accountancy.lang create mode 100644 htdocs/langs/ca_ES/accountancy.lang create mode 100644 htdocs/langs/cs_CZ/accountancy.lang create mode 100644 htdocs/langs/da_DK/accountancy.lang create mode 100644 htdocs/langs/de_DE/accountancy.lang create mode 100644 htdocs/langs/el_GR/accountancy.lang create mode 100644 htdocs/langs/et_EE/accountancy.lang create mode 100644 htdocs/langs/eu_ES/accountancy.lang create mode 100644 htdocs/langs/fa_IR/accountancy.lang create mode 100644 htdocs/langs/fi_FI/accountancy.lang create mode 100644 htdocs/langs/he_IL/accountancy.lang create mode 100644 htdocs/langs/hr_HR/accountancy.lang create mode 100644 htdocs/langs/hu_HU/accountancy.lang create mode 100644 htdocs/langs/id_ID/accountancy.lang create mode 100644 htdocs/langs/is_IS/accountancy.lang create mode 100644 htdocs/langs/it_IT/accountancy.lang create mode 100644 htdocs/langs/ja_JP/accountancy.lang create mode 100644 htdocs/langs/ko_KR/accountancy.lang create mode 100644 htdocs/langs/lt_LT/accountancy.lang create mode 100644 htdocs/langs/lv_LV/accountancy.lang create mode 100644 htdocs/langs/mk_MK/accountancy.lang create mode 100644 htdocs/langs/nb_NO/accountancy.lang create mode 100644 htdocs/langs/nl_NL/accountancy.lang create mode 100644 htdocs/langs/pl_PL/accountancy.lang create mode 100644 htdocs/langs/pt_PT/accountancy.lang create mode 100644 htdocs/langs/ro_RO/accountancy.lang create mode 100644 htdocs/langs/ru_RU/accountancy.lang create mode 100644 htdocs/langs/sk_SK/accountancy.lang create mode 100644 htdocs/langs/sl_SI/accountancy.lang create mode 100644 htdocs/langs/sq_AL/accountancy.lang create mode 100644 htdocs/langs/sv_SE/accountancy.lang create mode 100644 htdocs/langs/th_TH/accountancy.lang create mode 100644 htdocs/langs/tr_TR/accountancy.lang create mode 100644 htdocs/langs/uk_UA/accountancy.lang create mode 100644 htdocs/langs/vi_VN/accountancy.lang create mode 100644 htdocs/langs/zh_CN/accountancy.lang create mode 100644 htdocs/langs/zh_TW/accountancy.lang diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 717d7269fa2..2dd6ea2b125 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -1,8 +1,8 @@ - * Copyright (C) 2011 Juanjo Menent - * Copyright (C) 2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin +/* Copyright (C) 2006 Roman Ozana + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2013-2014 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin * * 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 @@ -261,6 +261,7 @@ class ICal */ function ical_rrule($value) { + $result=aray(); $rrule = explode(';',$value); foreach ($rrule as $line) { @@ -299,6 +300,7 @@ class ICal */ function ical_dt_date($key, $value) { + $return_value=array(); $value = $this->ical_date_to_unix($value); // Analyse TZID @@ -309,8 +311,8 @@ class ICal $value = str_replace('T', '', $value); return array($key,$value); } - // adding $value and $tzid - $key = $temp[0]; + + $key = $temp[0]; $temp = explode("=", $temp[1]); $return_value[$temp[0]] = $temp[1]; $return_value['unixtime'] = $value; @@ -330,8 +332,9 @@ class ICal { usort($temp, array(&$this, "ical_dtstart_compare")); return $temp; - } else - { + } + else + { return false; } } diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/da_DK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang new file mode 100644 index 00000000000..f7b40ac7301 --- /dev/null +++ b/htdocs/langs/de_DE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Buchhaltung +Globalparameters=Globale Parameter +Chartofaccounts=Kontenplan +Fiscalyear=Fiskalische Jahre +Menuaccount=Buchhaltung Konten +Menuthirdpartyaccount=Partner Konten +MenuTools=Werkzeuge + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journale +JournalFinancial=Finanz-Journale +Exports=Exports +Modelcsv=Exportmodell +Selectmodelcsv=Wählen Sie ein Exportmodell +Modelcsv_normal=Klassischer Export +Modelcsv_CEGID=Export zu CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Rückkehr + +Definechartofaccounts=Kontenplan definieren +Selectchartofaccounts=Kontenplan wählen +Validate=Freigeben +Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu +AccountAccounting=Buchhaltungs Konto +Ventilation=Erörterung +ToDispatch=Zu versenden +Dispatched=Versendet + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Handelsspanne +Reports=Berichte +ByCustomerInvoice=Nach Kundenrechnungen +ByMonth=Nach Monat +NewAccount=Neues Buchhaltungskonto +Update=Aktualisieren +List=Liste +Create=Erstelle +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Hauptbuch +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Zeile + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=erörtern +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Gewählte Zeilen +Lineofinvoice=Rechnungszeile +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Verkaufsjournal +ACCOUNTINGEX_PURCHASE_JOURNAL=Einkaufsjournal +ACCOUNTINGEX_BANK_JOURNAL=Bankauszug +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Dokumententyp +Docdate=Datum +Docref=Referenz +Numerocompte=Konto +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Soll +Credit=Haben +Amount=Betrag +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Verkaufsjournal +PurchasesJournal=Einkaufsjournal +DescSellsJournal=Verkaufsjournal +DescPurchasesJournal=Einkaufsjournal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Barzahlung + +SupplierInvoicePayment=Rechnungszahlung (Lieferant) +CustomerInvoicePayment=Rechnungszahlung (Kunde) + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=Neue Änderung +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version des Plans +Pcgtype=Kontenklasse +Pcgsubtype=Unterkontenklasse +Accountparent=Root of the account +Active=Auszug + +NewFiscalYear=Neues fiskalisches Jahr + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Gesamt-Spanne +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Automatisch geltend machen + +ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird. + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang new file mode 100644 index 00000000000..9ab9b394682 --- /dev/null +++ b/htdocs/langs/el_GR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Λογιστική +Globalparameters=Global parameters +Chartofaccounts=Διάγραμμα των λογαριασμών +Fiscalyear=Οικονομικά έτη +Menuaccount=Λογαριασμοί Λογιστικής +Menuthirdpartyaccount=Λογαριασμοί Πελ./Προμ. +MenuTools=Εργαλεία + +ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert +Journaux=Ημερολόγια +JournalFinancial=Financial journals +Exports=Εξαγωγές +Modelcsv=Πρότυπο εξαγωγής +Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή +Modelcsv_normal=Κλασική εξαγωγή +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών +Back=Επιστροφή + +Definechartofaccounts=Ορίστε ένα διάγραμμα των λογαριασμών +Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογαριασμών +Validate=Επικύρωση +Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό +AccountAccounting=Λογιστική λογαριασμού +Ventilation=Ventilation +ToDispatch=Για την αποστολή +Dispatched=Αποστέλλονται + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Εμπορικό Περιθώριο +Reports=Αναφορές +ByCustomerInvoice=Με τιμολόγια πελατών +ByMonth=Μέχρι το μήνα +NewAccount=Νέος λογιστικός λογαριασμός +Update=Ενημέρωση +List=Λίστα +Create=Δημιουργία +UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Γενικό Καθολικό +AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Γραμμή + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Επεξεργασία +EndProcessing=Τέλος της επεξεργασίας +AnyLineVentilate=Any lines to ventilate +SelectedLines=Επιλεγμένες γραμμές +Lineofinvoice=Γραμμή τιμολογίου +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Διαχωριστικό CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Τύπος εγγράφου +Docdate=Ημερομηνία +Docref=Παραπομπή +Numerocompte=Λογαριασμός +Code_tiers=Πελ./Προμ. +Labelcompte=Ετικέτα λογαριασμού +Debit=Χρέωση +Credit=Πίστωση +Amount=Σύνολο +Sens=Sens +Codejournal=Ημερολόγιο + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/et_EE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/he_IL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/id_ID/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/is_IS/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang new file mode 100644 index 00000000000..3c1337696d8 --- /dev/null +++ b/htdocs/langs/it_IT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Contabilità avanzata +Globalparameters=Parametri globali +Chartofaccounts=Lista degli account +Fiscalyear=Anni fiscali +Menuaccount=Account contabilità +Menuthirdpartyaccount=Account terze parti +MenuTools=Strumenti + +ConfigAccountingExpert=Configurazione del modulo contabilità esperta +Journaux=Giornali +JournalFinancial=Giornali finanziari +Exports=Esportazioni +Modelcsv=Modello di esportazione +Selectmodelcsv=Seleziona un modello di esportazione +Modelcsv_normal=Esportazione classica +Modelcsv_CEGID=Esporta tramite CEGID Esperto +BackToChartofaccounts=Ritorna alla lista dell'account +Back=Indietro + +Definechartofaccounts=Definisci una lista degli account +Selectchartofaccounts=Seleziona una lista degli account +Validate=Convalida +Addanaccount=Aggiungi un account di contabilità +AccountAccounting=Account di contabilità +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Report +ByCustomerInvoice=Per fatture clienti +ByMonth=Per mese +NewAccount=Nuovo account di contabilità +Update=Aggiorna +List=Elenco +Create=Crea +UpdateAccount=Modifica di un account di contabilità +UpdateMvts=Modifica di un movimento +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Data +Docref=Riferimento +Numerocompte=Account +Code_tiers=Terza parte +Labelcompte=Etichetta account +Debit=Debito +Credit=Credito +Amount=Importo +Sens=Sens +Codejournal=Giornale + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Giornale di vendita +PurchasesJournal=Giornale acquisti +DescSellsJournal=Giornale di vendita +DescPurchasesJournal=Giornale acquisti +BankJournal=Giornale bancario +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang new file mode 100644 index 00000000000..cbe133b742f --- /dev/null +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Globālie iestatījumi +Chartofaccounts=Chart of accounts +Fiscalyear=Fiskālie gadi +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Trešo personu komti +MenuTools=Rīki + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Žurnāli +JournalFinancial=Financial journals +Exports=Eksports +Modelcsv=Eksporta modulis +Selectmodelcsv=Select a model of export +Modelcsv_normal=Klasiskais eksports +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=Jānosūta +Dispatched=Nosūtīts + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Atskaites +ByCustomerInvoice=By invoices customers +ByMonth=Šķirot pēc mēneša +NewAccount=New accounting account +Update=Atjaunot +List=Saraksts +Create=Izveidot +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=Virsgrāmata +AccountBalanceByMonth=Konta bilance pa mēnešiem + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Apstrādā +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Pārdošanas žurnāls +ACCOUNTINGEX_PURCHASE_JOURNAL=Pirkumu žurnāls +ACCOUNTINGEX_BANK_JOURNAL=Bankas žurnāls +ACCOUNTINGEX_CASH_JOURNAL=Skaidras naudas žurnāls +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Dokumenta veids +Docdate=Datums +Docref=Atsauce +Numerocompte=Konts +Code_tiers=Trešās personas +Labelcompte=Konta nosaukums +Debit=Debets +Credit=Kredīts +Amount=Apjoms +Sens=Sens +Codejournal=Žurnāls + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Pārdošanas žurnāls +PurchasesJournal=Iepirkumu žurnāls +DescSellsJournal=Pārdošanas žurnāls +DescPurchasesJournal=Pirkumu žurnāls +BankJournal=Bankas žurnāls +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Skaidras naudas žurnāls +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Trešās personas konts + +NewAccountingMvt=Jauna pārvietošana +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Plāna versija +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=Jaauns fiskālais gads + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/th_TH/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang new file mode 100644 index 00000000000..5ea1eb67478 --- /dev/null +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Muhasebe +Globalparameters=Genel parametreler +Chartofaccounts=Hesap planı +Fiscalyear=Mali yıllar +Menuaccount=Muhasebe hesapları +Menuthirdpartyaccount=Üçüncü parti hesapları +MenuTools=Araçlar + +ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması +Journaux=Günlükler +JournalFinancial=Mali günlükler +Exports=Dışaaktarımlar +Modelcsv=Dışaaktarım modeli +Selectmodelcsv=Bir dışaaktarım modeli seç +Modelcsv_normal=Klasik dışaaktarım +Modelcsv_CEGID=CEGID Uzmanına yönelik dışaaktarım +BackToChartofaccounts=Hesap planı geliri +Back=Gelir + +Definechartofaccounts=Hesap planı tanımla +Selectchartofaccounts=Hesap planı seç +Validate=Doğrula +Addanaccount=Muhasebe hesabı ekle +AccountAccounting=Muhasebe hesabı +Ventilation=Ventilation +ToDispatch=Gönderilecek +Dispatched=Gönderilmiş + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Ticaret marjı +Reports=Raporlar +ByCustomerInvoice=Müşteri faturalarına göre +ByMonth=Aya göre +NewAccount=Yeni muhasebe hesabı +Update=Güncelle +List=Liste +Create=Oluştur +UpdateAccount=Bir muhasebe hesabının değiştirilmesi +UpdateMvts=Bir hareketin değiştirilmesi +WriteBookKeeping=Büyük defter hesap kayıtları +Bookkeeping=Büyük Defter +AccountBalanceByMonth=Aylık hesap bakiyesi + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Satır + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=Muhasebe hesabında + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=İşleme +EndProcessing=İşleme sonu +AnyLineVentilate=Any lines to ventilate +SelectedLines=Seçilen satırlar +Lineofinvoice=Fatura satırı +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=CSV ayırıcısı + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Genel hesapların uzunluğu +ACCOUNTINGEX_LENGTH_AACCOUNT=Üçüncü parti hesapları uzunluğu + +ACCOUNTINGEX_SELL_JOURNAL=Satış günlüğü +ACCOUNTINGEX_PURCHASE_JOURNAL=Satınalma günlüğü +ACCOUNTINGEX_BANK_JOURNAL=Banka günlüğü +ACCOUNTINGEX_CASH_JOURNAL=Kasa günlüğü +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Çeşitli günlük +ACCOUNTINGEX_SOCIAL_JOURNAL=Sosyal günlük + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Aktarım hesabı +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Bekleme hesabı + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Belge türü +Docdate=Tarih +Docref=Referans +Numerocompte=Hesap +Code_tiers=Üçüncü parti +Labelcompte=Hesap etiketi +Debit=Borç +Credit=Alacak +Amount=Tutar +Sens=Sens (borsa haberleri yayınlama günlüğü) +Codejournal=Günlük + +DelBookKeeping=Büyük defter kayıtlarını sil + +SellsJournal=Satış günlüğü +PurchasesJournal=Satınalma günlüğü +DescSellsJournal=Satış günlüğü +DescPurchasesJournal=Satınalma günlüğü +BankJournal=Banka günlüğü +DescBankJournal=Nakitten dışında her türlü ödemeyi içeren banka günlüğü +CashJournal=Kasa günlüğü +DescCashJournal=Nakit ödeme türünü içeren kasa günlüğü + +CashPayment=Nakit ödeme + +SupplierInvoicePayment=Tedarikçi faturası ödemesi +CustomerInvoicePayment=Müşteri faturası ödemesi + +ThirdPartyAccount=Üçüncü parti hesabı + +NewAccountingMvt=Yeni hareket +NumMvts=Hareket sayısı +ListeMvts=Hareket listesi +ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz + +ReportThirdParty=Üçüncü parti hesabını listele +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=Muhasebe hesapları listesi + +Pcgversion=Plan sürümü +Pcgtype=Hesap sınıfı +Pcgsubtype=Hesap sınıfı altında +Accountparent=Hesabın kökü +Active=Hesap özeti + +NewFiscalYear=Yeni mali yıl + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Toplam ciro HT +TotalMarge=Toplam satışlar oranı +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun + +ValidateHistory=Otomatikman doğrula + +ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz + +FicheVentilation=Havalandırma kartı diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang new file mode 100644 index 00000000000..27a516d5a4f --- /dev/null +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=会计 +Globalparameters=全局参数 +Chartofaccounts=科目表 +Fiscalyear=财年 +Menuaccount=会计账目 +Menuthirdpartyaccount=第三方帐户 +MenuTools=工具 + +ConfigAccountingExpert=配置"会计专家模块" +Journaux=日记帐 +JournalFinancial=财经杂志 +Exports=出口 +Modelcsv=出口型号 +Selectmodelcsv=选择一个“导出模型” +Modelcsv_normal=典型的导出 +Modelcsv_CEGID=出口对Cegid的专家 +BackToChartofaccounts=返回科目表 +Back=返回 + +Definechartofaccounts=定义会计科目表 +Selectchartofaccounts=选择会计科目表 +Validate=验证 +Addanaccount=添加一个会计帐户 +AccountAccounting=会计账户 +Ventilation=通风 +ToDispatch=派遣 +Dispatched=调度 + +CustomersVentilation=通风客户 +SuppliersVentilation=通风系统供应商 +TradeMargin=贸易保证金 +Reports=报告 +ByCustomerInvoice=依据”发票“的客户 +ByMonth=按月份 +NewAccount=”新建“会计账户 +Update=更新 +List=名单 +Create=创建 +UpdateAccount=修改”会计帐户“ +UpdateMvts=对一个”活动“进行修改 +WriteBookKeeping=在”总账“中的”账户记录“ +Bookkeeping=总帐 +AccountBalanceByMonth=”账户余额“按月份 + +AccountingVentilation=会计通风 +AccountingVentilationSupplier=会计通风的供应商 +AccountingVentilationCustomer=会计通风客户 +Line=线 + +CAHTF=总采购供应商HT +InvoiceLines=发票行进行通风 +InvoiceLinesDone=发票通风线 +IntoAccount=在会计帐户 + +Ventilate=通风 +VentilationAuto=自动通风 + +Processing=处理 +EndProcessing=处理的结束 +AnyLineVentilate=任何行通风 +SelectedLines=选系 +Lineofinvoice=发票行 +VentilatedinAccount=在会计账户成功通风 +NotVentilatedinAccount=不通风的会计账户 + +ACCOUNTINGEX_SEPARATORCSV=CSV的”分隔符“ + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=待显示的一个页面的元素个数（最大推荐：50） +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=由最近的元素开始通气“有通风”页面的排序 +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=由最近的元素开始的通风“通风”的页面排序 + +AccountLength=会计长度账户显示在的Dolibarr +AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。 +ACCOUNTINGEX_LENGTH_GACCOUNT=一般账户的长度 +ACCOUNTINGEX_LENGTH_AACCOUNT=第三方账户的长度 + +ACCOUNTINGEX_SELL_JOURNAL=卖杂志 +ACCOUNTINGEX_PURCHASE_JOURNAL=购买杂志 +ACCOUNTINGEX_BANK_JOURNAL=银行的”日记账“ +ACCOUNTINGEX_CASH_JOURNAL=现金的”日记账“ +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=其他的”日记帐“ +ACCOUNTINGEX_SOCIAL_JOURNAL=社交的”日记帐“ + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=转让帐户 +ACCOUNTINGEX_ACCOUNT_SUSPENSE=等待的帐户 + +COMPTA_PRODUCT_BUY_ACCOUNT=会计帐户默认情况下，购买的产品（如果在产品表没有定义） +COMPTA_PRODUCT_SOLD_ACCOUNT=会计帐户默认为销售的产品（如果在产品表没有定义） +COMPTA_SERVICE_BUY_ACCOUNT=会计帐户默认情况下，该买的服务（如果服务表没有定义） +COMPTA_SERVICE_SOLD_ACCOUNT=会计帐户默认为卖服务（如果服务表没有定义） + +Doctype=文件类型 +Docdate=日期 +Docref=参考 +Numerocompte=帐户 +Code_tiers=第三方 +Labelcompte=标签帐户 +Debit=借记卡 +Credit=信用 +Amount=金额 +Sens=SENS +Codejournal=日记帐 + +DelBookKeeping=删除总帐的记录 + +SellsJournal=出售的”日记帐“ +PurchasesJournal=购买的”日记帐“ +DescSellsJournal=出售的”日记帐“ +DescPurchasesJournal=购买的”日记帐“ +BankJournal=银行日记账 +DescBankJournal=银行日记账，包括支付现金以外的所有类型 +CashJournal=现金日记账 +DescCashJournal=现金日记账，包括支付现金的类型 + +CashPayment=现金付款 + +SupplierInvoicePayment=付款发票的供应商 +CustomerInvoicePayment=付款发票的客户 + +ThirdPartyAccount=第三方账户 + +NewAccountingMvt=创建新的活动 +NumMvts=移动号码 +ListeMvts=”活动“的列表 +ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值 + +ReportThirdParty=列出第三方账户 +DescThirdPartyReport=在这里请教第三方客户及供应商，其会计账目清单 + +ListAccounts=会计账目清单 + +Pcgversion=该计划的版本 +Pcgtype=账户类 +Pcgsubtype=在类账户 +Accountparent=该帐户的根 +Active=声明 + +NewFiscalYear=新财年 + +DescVentilCustomer=在这里，请咨询您的发票客户的年度会计通风 +TotalVente=总成交量HT +TotalMarge=总销售利润率 +DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表 +DescVentilTodoCustomer=与会计帐户通风客户发票行 +ChangeAccount=变化的账户选择行会计帐户： +Vide=- +DescVentilSupplier=在这里，请咨询您的发票供应商的年度会计通风 +DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路 +DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表 + +ValidateHistory=自动验证 + +ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来 + +FicheVentilation=通风卡 diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang new file mode 100644 index 00000000000..f103efef589 --- /dev/null +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -0,0 +1,158 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Modelcsv=Model of export +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Ventilation +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Ventilation customers +SuppliersVentilation=Ventilation suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Accounting ventilation +AccountingVentilationSupplier=Accounting ventilation supplier +AccountingVentilationCustomer=Accounting ventilation customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic ventilation + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTINGEX_SEPARATORCSV=Separator CSV + +ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) +ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements +ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTINGEX_SELL_JOURNAL=Sell journal +ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal +ACCOUNTINGEX_BANK_JOURNAL=Bank journal +ACCOUNTINGEX_CASH_JOURNAL=Cash journal +ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal + +ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait + +COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Ventilation card From 97eec37f1c21e152b31a275a74a3b96b77cd90f4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 17:20:17 +0200 Subject: [PATCH 02/10] Uniformize code: property "nom" for thirdparty is aliased into "name" everywhere. --- htdocs/accountancy/customer/list.php | 54 +++++----- htdocs/accountancy/journal/bankjournal.php | 2 +- htdocs/accountancy/journal/cashjournal.php | 6 +- htdocs/accountancy/supplier/list.php | 52 ++++----- .../adherents/class/adherent_type.class.php | 14 +-- htdocs/admin/barcode.php | 2 +- htdocs/barcode/codeinit.php | 2 +- htdocs/comm/contact.php | 4 +- htdocs/comm/index.php | 4 +- htdocs/comm/propal/index.php | 8 +- htdocs/comm/propal/list.php | 6 +- htdocs/comm/prospect/list.php | 4 +- htdocs/comm/prospect/recap-prospect.php | 4 +- htdocs/comm/recap-client.php | 4 +- htdocs/commande/apercu.php | 2 +- htdocs/commande/customer.php | 4 +- htdocs/commande/index.php | 16 +-- htdocs/commande/list.php | 8 +- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/search.php | 14 +-- htdocs/compta/bank/treso.php | 8 +- htdocs/compta/clients.php | 12 +-- htdocs/compta/dons/class/don.class.php | 43 ++++---- htdocs/compta/facture/fiche-rec.php | 8 +- htdocs/compta/facture/impayees.php | 6 +- htdocs/compta/facture/list.php | 6 +- htdocs/compta/index.php | 28 ++--- htdocs/compta/localtax/clients.php | 21 ++-- htdocs/compta/paiement/card.php | 4 +- .../compta/paiement/class/paiement.class.php | 10 +- htdocs/compta/paiement/list.php | 4 +- .../class/bonprelevement.class.php | 12 +-- .../class/rejetprelevement.class.php | 2 +- htdocs/compta/prelevement/create.php | 4 +- htdocs/compta/prelevement/demandes.php | 4 +- htdocs/compta/prelevement/factures.php | 20 ++-- htdocs/compta/prelevement/fiche-rejet.php | 20 ++-- htdocs/compta/prelevement/index.php | 4 +- htdocs/compta/prelevement/ligne.php | 6 +- htdocs/compta/prelevement/lignes.php | 6 +- htdocs/compta/prelevement/list.php | 4 +- htdocs/compta/recap-compta.php | 4 +- htdocs/compta/resultat/clientfourn.php | 40 +++---- htdocs/compta/sociales/charges.php | 101 ++++++++---------- .../sociales/class/chargesociales.class.php | 24 +++-- htdocs/compta/tva/clients.php | 14 +-- htdocs/contact/class/contact.class.php | 10 +- htdocs/contact/vcard.php | 2 +- htdocs/contrat/index.php | 20 ++-- htdocs/contrat/list.php | 7 +- htdocs/contrat/services.php | 4 +- htdocs/core/boxes/box_actions.php | 12 +-- htdocs/core/boxes/box_clients.php | 4 +- htdocs/core/boxes/box_commandes.php | 4 +- htdocs/core/boxes/box_contracts.php | 4 +- htdocs/core/boxes/box_factures.php | 4 +- htdocs/core/boxes/box_factures_fourn.php | 4 +- htdocs/core/boxes/box_factures_fourn_imp.php | 4 +- htdocs/core/boxes/box_factures_imp.php | 4 +- htdocs/core/boxes/box_ficheinter.php | 4 +- htdocs/core/boxes/box_fournisseurs.php | 4 +- htdocs/core/boxes/box_propales.php | 4 +- htdocs/core/boxes/box_prospect.php | 4 +- htdocs/core/boxes/box_services_contracts.php | 4 +- htdocs/core/boxes/box_services_expired.php | 4 +- htdocs/core/boxes/box_supplier_orders.php | 4 +- htdocs/core/class/html.form.class.php | 30 +++--- htdocs/core/class/html.formcompany.class.php | 20 ++-- htdocs/core/class/infobox.class.php | 3 +- htdocs/core/lib/files.lib.php | 2 +- htdocs/core/lib/functions2.lib.php | 4 +- htdocs/core/lib/pdf.lib.php | 2 +- htdocs/core/lib/tax.lib.php | 2 +- .../barcode/mod_barcode_product_standard.php | 2 +- .../modules/barcode/modules_barcode.class.php | 16 +-- .../doc/doc_generic_order_odt.modules.php | 4 +- .../commande/doc/pdf_einstein.modules.php | 4 +- .../commande/doc/pdf_proforma.modules.php | 4 +- .../contract/doc/pdf_strato.modules.php | 4 +- .../doc/doc_generic_shipment_odt.modules.php | 4 +- .../expedition/doc/pdf_merou.modules.php | 4 +- .../expedition/doc/pdf_rouget.modules.php | 4 +- .../doc/doc_generic_invoice_odt.modules.php | 4 +- .../modules/facture/doc/pdf_crabe.modules.php | 14 +-- .../fichinter/doc/pdf_soleil.modules.php | 4 +- .../livraison/doc/pdf_typhon.modules.php | 4 +- .../modules/mailings/framboise.modules.php | 6 +- .../modules/mailings/thirdparties.modules.php | 4 - .../thirdparties_services_expired.modules.php | 6 +- .../product/mod_codeproduct_elephant.php | 1 + .../product/mod_codeproduct_leopard.php | 1 + .../modules/product/modules_product.class.php | 4 +- .../doc/doc_generic_project_odt.modules.php | 6 +- .../modules/project/mod_project_simple.php | 19 ++-- .../modules/project/mod_project_universal.php | 11 +- .../task/doc/doc_generic_task_odt.modules.php | 2 +- .../modules/project/task/mod_task_simple.php | 19 ++-- .../project/task/mod_task_universal.php | 11 +- .../doc/doc_generic_proposal_odt.modules.php | 4 +- .../modules/propale/doc/pdf_azur.modules.php | 6 +- .../societe/mod_codeclient_elephant.php | 4 +- .../societe/mod_codeclient_leopard.php | 1 + .../modules/societe/mod_codeclient_monkey.php | 5 +- .../societe/mod_codecompta_aquarium.php | 7 +- .../societe/mod_codecompta_panicum.php | 8 +- .../modules/societe/modules_societe.class.php | 2 +- .../pdf/pdf_canelle.modules.php | 4 +- .../interface_20_all_Logevents.class.php | 12 +-- ...terface_50_modAgenda_ActionsAuto.class.php | 4 +- htdocs/ecm/docother.php | 4 +- htdocs/expedition/index.php | 19 ++-- htdocs/expedition/list.php | 8 +- htdocs/fichinter/apercu.php | 2 +- htdocs/fichinter/list.php | 4 +- htdocs/fourn/ajax/getSupplierPrices.php | 5 +- htdocs/fourn/class/fournisseur.class.php | 12 +-- htdocs/fourn/commande/index.php | 12 +-- htdocs/fourn/commande/list.php | 6 +- htdocs/fourn/facture/impayees.php | 8 +- htdocs/fourn/facture/list.php | 6 +- htdocs/fourn/facture/paiement.php | 10 +- htdocs/fourn/index.php | 14 +-- htdocs/fourn/list.php | 4 +- htdocs/fourn/paiement/card.php | 4 +- htdocs/fourn/product/list.php | 8 +- htdocs/holiday/class/holiday.class.php | 12 +-- htdocs/livraison/card.php | 2 +- htdocs/margin/agentMargins.php | 4 +- htdocs/margin/customerMargins.php | 4 +- htdocs/margin/tabs/productMargins.php | 4 +- .../class/opensurveysondage.class.php | 4 +- htdocs/opensurvey/exportcsv.php | 6 +- htdocs/opensurvey/public/studs.php | 10 +- htdocs/opensurvey/results.php | 10 +- htdocs/paybox/lib/paybox.lib.php | 2 +- htdocs/paypal/lib/paypal.lib.php | 2 +- htdocs/product/admin/product.php | 10 +- htdocs/product/stats/commande.php | 4 +- htdocs/product/stats/commande_fournisseur.php | 4 +- htdocs/product/stats/contrat.php | 4 +- htdocs/product/stats/facture.php | 4 +- htdocs/product/stats/facture_fournisseur.php | 4 +- htdocs/product/stats/propal.php | 4 +- htdocs/product/stock/replenishorders.php | 4 +- htdocs/projet/admin/project.php | 4 +- htdocs/projet/index.php | 4 +- htdocs/projet/list.php | 6 +- htdocs/societe/admin/societe.php | 20 ++-- .../canvas/actions_card_common.class.php | 2 +- htdocs/societe/class/address.class.php | 12 +-- htdocs/societe/class/societe.class.php | 2 +- htdocs/societe/notify/index.php | 7 +- htdocs/user/class/usergroup.class.php | 31 +++--- htdocs/user/group/card.php | 20 ++-- htdocs/user/group/index.php | 4 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/group/perms.php | 2 +- htdocs/user/home.php | 4 +- htdocs/user/index.php | 4 +- scripts/user/sync_groups_ldap2dolibarr.php | 11 +- test/phpunit/AdherentTest.php | 28 ++++- 162 files changed, 710 insertions(+), 699 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 0d00a0a9127..3af059cad94 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -3,7 +3,7 @@ * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2014 Ari Elbaz (elarifr) * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2014 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 @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; @@ -64,22 +64,22 @@ if ($action == 'ventil') { $cpt = 0; foreach ( $mesCasesCochees as $maLigneCochee ) { // print '
id selectionnee : '.$monChoix."
"; - $maLigneCourante = split("_", $maLigneCochee); + $maLigneCourante = explode("_", $maLigneCochee); $monId = $maLigneCourante[0]; $monNumLigne = $maLigneCourante[1]; $monCompte = $mesCodesVentilChoisis[$monNumLigne]; - + $sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet"; $sql .= " SET fk_code_ventilation = " . $monCompte; $sql .= " WHERE rowid = " . $monId; - + dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG); if ($db->query($sql)) { print '
' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '
'; } else { print '
' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '
' . $sql . '
'; } - + $cpt ++; } } else { @@ -130,15 +130,15 @@ $result = $db->query($sql); if ($result) { $num_lines = $db->num_rows($result); $i = 0; - + // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list... print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); - + print '
' . $langs->trans("DescVentilTodoCustomer") . '
'; - + print '
' . "\n"; print ''; - + print ''; print ''; print ''; @@ -149,24 +149,24 @@ if ($result) { print ''; print ''; print ''; - + $facture_static = new Facture($db); $product_static = new Product($db); $form = new Form($db); - + $var = True; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); $var = ! $var; - + // product_type: 0 = service ? 1 = product // if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service // issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB ! $code_sell_notset = ''; - + if (empty($objp->code_sell)) { $code_sell_notset = 'color:red'; - + if (! empty($objp->type)) { if ($objp->type == 1) { $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); @@ -175,7 +175,7 @@ if ($result) { } } else { $code_sell_notset = 'color:blue'; - + if ($objp->type == 1) { $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { @@ -183,14 +183,14 @@ if ($result) { } } } - + print ""; - + // Ref facture $facture_static->ref = $objp->facnumber; $facture_static->id = $objp->facid; print ''; - + // Ref produit $product_static->ref = $objp->product_ref; $product_static->id = $objp->product_id; @@ -201,34 +201,34 @@ if ($result) { else print ' '; print ''; - + print ''; print ''; - + print ''; - + print ''; - + // Colonne choix du compte print ''; - + // Colonne choix ligne a ventiler print ''; - + print ''; $i ++; } - + print ''; - + print '
' . $langs->trans("Invoice") . '' . $langs->trans("Ref") . '' . $langs->trans("IntoAccount") . '' . $langs->trans("Ventilate") . '
' . $facture_static->getNomUrl(1) . '' . dol_trunc($objp->product_label, 24) . '' . nl2br(dol_trunc($objp->description, 32)) . ''; print price($objp->total_ht); print ''; print $objp->code_sell; print ''; print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1); print ''; print 'aarowid ? "checked" : "") . '/>'; print '
 
'; print '
'; } else { diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index cb308a7e1af..dcd8fca4d41 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -189,7 +189,7 @@ if ($result) { else if ($links[$key]['type'] == 'company') { $societestatic->id = $links[$key]['url_id']; - $societestatic->nom = $links[$key]['label']; + $societestatic->name = $links[$key]['label']; $tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30); $tabtp[$obj->rowid][$compta_soc] += $obj->amount; } diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index 52cdbb4f616..8af84a9ed58 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -171,7 +171,7 @@ if ($result) { } else if ($links[$key]['type'] == 'company') { $societestatic->id = $links[$key]['url_id']; - $societestatic->nom = $links[$key]['label']; + $societestatic->name = $links[$key]['label']; $tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30); $tabtp[$obj->rowid][$compta_soc] += $obj->amount; } else if ($links[$key]['type'] == 'sc') { @@ -448,14 +448,14 @@ if ($action == 'export_csv') { llxHeader('', $langs->trans("CashJournal"), ''); - $nom = $langs->trans("CashJournal"); + $name = $langs->trans("CashJournal"); $nomlink = ''; $periodlink = ''; $exportlink = ''; $builddate = time(); $description = $langs->trans("DescCashJournal") . '
'; $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1); - report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => '')); + report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => '')); print ''; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index f066821e035..4bf603236db 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2014 Alexandre Spangaro - * Copyright (C) 2014 Ari Elbaz (elarifr) + * Copyright (C) 2014 Ari Elbaz (elarifr) * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Juanjo Menent s * @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; @@ -63,25 +63,25 @@ if ($action == 'ventil') { print '
' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '
'; $mesCodesVentilChoisis = $codeventil; $cpt = 0; - + foreach ( $mesCasesCochees as $maLigneCochee ) { // print '
id selectionnee : '.$monChoix."
"; - $maLigneCourante = split("_", $maLigneCochee); + $maLigneCourante = explode("_", $maLigneCochee); $monId = $maLigneCourante[0]; $monNumLigne = $maLigneCourante[1]; $monCompte = $mesCodesVentilChoisis[$monNumLigne]; - + $sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det"; $sql .= " SET fk_code_ventilation = " . $monCompte; $sql .= " WHERE rowid = " . $monId; - + dol_syslog('accountancy/supplier/list.php:: sql=' . $sql); if ($db->query($sql)) { print '
' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '
'; } else { print '
' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '
' . $sql . '
'; } - + $cpt ++; } } else { @@ -133,15 +133,15 @@ $result = $db->query($sql); if ($result) { $num_lines = $db->num_rows($result); $i = 0; - + // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list... print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); - + print '
' . $langs->trans("DescVentilTodoSupplier") . '
'; - + print '
' . "\n"; print ''; - + print ''; print ''; print ''; @@ -152,22 +152,22 @@ if ($result) { print ''; print ''; print "\n"; - + $facturefourn_static = new FactureFournisseur($db); $productfourn_static = new ProductFournisseur($db); $form = new Form($db); - + $var = True; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); $var = ! $var; print ""; - + // Ref facture $facturefourn_static->ref = $objp->ref; $facturefourn_static->id = $objp->facid; print ''; - + // Ref facture supplier $productfourn_static->ref = $objp->product_ref; $productfourn_static->id = $objp->product_id; @@ -178,23 +178,23 @@ if ($result) { else print ' '; print ''; - + // print ''; - + // print ''; - + print ''; - + print ''; - + print ''; - + print ''; - + // Colonne choix du compte print ''; - + print ""; $i ++; } - + print ''; - + print "
Facture' . $langs->trans("Ref") . '' . $langs->trans("IntoAccount") . '' . $langs->trans("Ventilate") . '
' . $facturefourn_static->getNomUrl(1) . ''.$objp->ref.''.$objp->ref_supplier.'' . dol_trunc($objp->product_label, 24) . '' . stripslashes(nl2br($objp->description)) . ''; print price($objp->price); print ''; print $objp->code_buy; print ''; print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1); @@ -203,15 +203,15 @@ if ($result) { print ''; print 'aarowid ? "checked" : "") . '/>'; print '
 
"; - + print '
'; } else { print $db->error(); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 43a272cf574..2d5f3d835be 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -119,7 +119,7 @@ class AdherentType extends CommonObject if ($result) { $action='update'; - + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('membertypedao')); $parameters=array('membertype'=>$this->id); @@ -151,21 +151,23 @@ class AdherentType extends CommonObject * Fonction qui permet de supprimer le status de l'adherent * * @param int $rowid Id of member type to delete - * @return int >0 if OK, < 0 if KO + * @return int >0 if OK, 0 if not found, < 0 if KO */ - function delete($rowid) + function delete($rowid='') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid"; + if (empty($rowid)) $rowid=$this->id; + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = ".$rowid; $resql=$this->db->query($sql); if ($resql) { - if ( $this->db->affected_rows($resql) ) + if ($this->db->affected_rows($resql)) { return 1; } else - { + { return 0; } } diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 78c99916910..11341f632a2 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -396,7 +396,7 @@ if ($conf->produit->enabled) $var = !$var; print ''; - print ''.$modBarCode->nom."\n"; + print ''.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."\n"; print $modBarCode->info($langs); print ''; print ''.$modBarCode->getExample($langs)."\n"; diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index 1484566dbaf..19fb5c193bb 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -287,7 +287,7 @@ if ($conf->product->enabled || $conf->product->service) { print $langs->trans("BarCodeNumberManager").": "; $objproduct=new Product($db); - print ''.$modBarCodeProduct->nom.' - '.$langs->trans("NextValue").': '.$modBarCodeProduct->getNextValue($objproduct).'
'; + print ''.(isset($modBarCodeProduct->name)?$modBarCodeProduct->name:$modBarCodeProduct->nom).' - '.$langs->trans("NextValue").': '.$modBarCodeProduct->getNextValue($objproduct).'
'; $disabled=0; } else diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index d4652b57353..a80796fe574 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -72,7 +72,7 @@ if ($type == "f") * */ -$sql = "SELECT s.rowid, s.nom, st.libelle as stcomm"; +$sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm"; $sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone"; $sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,"; @@ -159,7 +159,7 @@ if ($resql) print "$obj->firstname"; print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print "rowid."\">$obj->nom\n"; + print "rowid."\">$obj->name\n"; print ''.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 22068860076..c5347246719 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -444,7 +444,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { $langs->load("propal"); - $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv"; + $sql = "SELECT s.nom as name, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -497,7 +497,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print ""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''."\n"; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).''."\n"; print ''; print dol_print_date($db->jdate($obj->dp),'day').''."\n"; print ''.price($obj->total_ttc).''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 8c7f38ed607..de51cf63104 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -381,7 +381,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) /* if (! empty($conf->propal->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."propal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -433,7 +433,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; @@ -453,7 +453,7 @@ if (! empty($conf->propal->enabled)) */ /*if (! empty($conf->propal->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -505,7 +505,7 @@ if (! empty($conf->propal->enabled)) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 51c07eaa5b2..6522a592097 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -142,7 +142,7 @@ if (! $sortorder) $sortorder='DESC'; $limit = $conf->liste_limit; -$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,'; +$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,'; $sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; $sql.= ' u.login'; @@ -246,7 +246,7 @@ if ($result) if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_author) $param.='&search_author='.$search_author; if ($search_town) $param.='&search_town='.$search_town; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); // Lignes des champs de filtre print '
'; @@ -375,7 +375,7 @@ if ($result) // Company $companystatic->id=$objp->rowid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; $companystatic->code_client=$objp->code_client; print ''; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 7dada3e115f..94286ee4c53 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -178,7 +178,7 @@ if ($action == 'cstc') $formother=new FormOther($db); $form=new Form($db); -$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; +$sql = "SELECT s.rowid, s.nom as name, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,"; $sql.= " d.nom as departement"; if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) @@ -402,7 +402,7 @@ if ($resql) print ''; print ''; $prospectstatic->id=$obj->rowid; - $prospectstatic->nom=$obj->nom; + $prospectstatic->name=$obj->name; $prospectstatic->status=$obj->status; $prospectstatic->code_client=$obj->code_client; $prospectstatic->client=$obj->client; diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 1eb30f02b55..5d7358a806e 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -64,8 +64,8 @@ if ($socid > 0) print ''; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index bb079a34169..ec54e553bdb 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -63,8 +63,8 @@ if ($socid > 0) print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Thirdpary").''.$societe->getNomUrl(1).'
'; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 1257769b954..abb2be95076 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -167,7 +167,7 @@ if ($id > 0 || ! empty($ref)) // Client print ""; print ''; print ''; diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 29812903d12..f40277ea34a 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -67,7 +67,7 @@ $thirdpartystatic=new Societe($db); * Mode List */ -$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea"; +$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c"; @@ -161,7 +161,7 @@ if ($resql) $lien=$lienfin=''; $lien = ''; $lienfin=''; - $name=$obj->nom; + $name=$obj->name; $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 705354d401b..b7d9be05529 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -166,7 +166,7 @@ else */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -195,7 +195,7 @@ if (! empty($conf->commande->enabled)) print ""; print '"; - print ''; + print ''; $i++; } } @@ -215,7 +215,7 @@ $max=5; */ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,"; -$sql.= " s.nom, s.rowid as socid"; +$sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -268,7 +268,7 @@ if ($resql) print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -285,7 +285,7 @@ else dol_print_error($db); */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -337,7 +337,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; @@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled)) */ if (! empty($conf->commande->enabled)) { - $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -408,7 +408,7 @@ if (! empty($conf->commande->enabled)) print ''; - print ''; + print ''; print ''; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index daf73effed3..bd31a438b05 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -112,7 +112,7 @@ $companystatic = new Societe($db); $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes"; llxHeader('',$langs->trans("Orders"),$help_url); -$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; +$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; @@ -221,7 +221,7 @@ if ($resql) { $soc = new Societe($db); $soc->fetch($socid); - $title = $langs->trans('ListOfOrders') . ' - '.$soc->nom; + $title = $langs->trans('ListOfOrders') . ' - '.$soc->name; } else { @@ -367,7 +367,7 @@ if ($resql) // Company $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Thirdparty").''.$societe->getNomUrl(1).'
".$langs->trans("Customer")."'; - print ''.$soc->nom.''; + print ''.$soc->getNomUrl(1).''; print '
'; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'
'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.dol_print_date($db->jdate($obj->datem),'day').''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print $companystatic->getNomUrl(1,'customer'); @@ -380,7 +380,7 @@ if ($resql) if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0)) { print ' '; - print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->nom, 'object_bill', 'hideonsmartphone').''; + print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').''; } } } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index eb29889f115..49824a7f6cb 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -573,7 +573,7 @@ if (($action != 'create' && $action != 'add') || !$error) { // Company $companystatic->id=$socid; - $companystatic->nom=$soc->nom; + $companystatic->name=$soc->name; print '

'.$companystatic->getNomUrl(1,'customer').'

'; } diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 14b586c6d80..87b7d3e62c5 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -680,7 +680,7 @@ if ($id > 0 || ! empty($ref)) if ($links[$key]['type']=='company') { $societestatic->id=$links[$key]['url_id']; - $societestatic->nom=$links[$key]['label']; + $societestatic->name=$links[$key]['label']; print $societestatic->getNomUrl(1,'',16); } else if ($links[$key]['type']=='user') diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index d30c1519f10..25b7d91a3ff 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2012 Vinícius Nogueira * Copyright (C) 2014 Florian Henry - * + * * 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 * the Free Software Foundation; either version 3 of the License, or @@ -158,7 +158,7 @@ if ($resql) if (GETPOST("bid")) { $result=$bankcateg->fetch(GETPOST("bid")); - print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); } else { @@ -166,18 +166,18 @@ if ($resql) } print ''; - + $moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': '; $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1); $moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1); - - + + if ($moreforfilter) { print '
'; print $moreforfilter; print '
'; } - + print ''; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); @@ -278,7 +278,7 @@ if ($resql) if ($objp->url_id) { $companystatic->id=$objp->url_id; - $companystatic->nom=$objp->labelurl; + $companystatic->name=$objp->labelurl; print $companystatic->getNomUrl(1); } else diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 909770cf38c..7ac510525be 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -148,7 +148,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Customer invoices $sql = "SELECT 'invoice' as family, f.rowid as objid, f.facnumber as ref, f.total_ttc, f.type, f.date_lim_reglement as dlr,"; - $sql.= " s.rowid as socid, s.nom, s.fournisseur"; + $sql.= " s.rowid as socid, s.nom as name, s.fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; $sql.= " WHERE f.entity = ".$conf->entity; @@ -158,7 +158,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Supplier invoices $sql2= " SELECT 'invoice_supplier' as family, ff.rowid as objid, ff.ref_supplier as ref, (-1*ff.total_ttc) as total_ttc, ff.type, ff.date_lim_reglement as dlr,"; - $sql2.= " s.rowid as socid, s.nom, s.fournisseur"; + $sql2.= " s.rowid as socid, s.nom as name, s.fournisseur"; $sql2.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid"; $sql2.= " WHERE ff.entity = ".$conf->entity; @@ -265,7 +265,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $ref = $facturefournstatic->getNomUrl(1,''); $societestatic->id = $obj->socid; - $societestatic->nom = $obj->nom; + $societestatic->name = $obj->name; $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = -1*$facturefournstatic->getSommePaiement(); // Payment already done @@ -279,7 +279,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $ref = $facturestatic->getNomUrl(1,''); $societestatic->id = $obj->socid; - $societestatic->nom = $obj->nom; + $societestatic->name = $obj->name; $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = $facturestatic->getSommePaiement(); // Payment already done diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index dbdc8c72368..528ed14e849 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -73,7 +73,7 @@ if ($action == 'note') if ($mode == 'search') { if ($modesearch == 'soc') { $sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s "; - $sql.= " WHERE lower(s.nom) LIKE '%".$db->escape(strtolower($socname))."%'"; + $sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'"; $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; } @@ -93,7 +93,7 @@ if ($mode == 'search') { * Mode List */ -$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea"; +$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; @@ -107,13 +107,13 @@ if (dol_strlen($stcomm)) } if ($socname) { - $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($socname))."%'"; + $sql.= " AND s.nom LIKE '%".$db->escape($socname)."%'"; $sortfield = "s.nom"; $sortorder = "ASC"; } if ($_GET["search_nom"]) { - $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($_GET["search_nom"]))."%'"; + $sql.= " AND s.nom LIKE '%".$db->escape($_GET["search_nom"])."%'"; } if ($_GET["search_compta"]) { @@ -141,7 +141,7 @@ if ($resql) $i = 0; $langs->load('commercial'); - + print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num); print ''; @@ -188,7 +188,7 @@ if ($resql) print ""; print ''; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index ab33bdbb43d..61e1b9cd926 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -202,7 +202,8 @@ class Don extends CommonObject /** - * Check params + * Check params and init ->errors array. + * TODO This function seems to not be used by core code. * * @param int $minimum Minimum * @return int 0 if KO, >0 if OK @@ -212,39 +213,40 @@ class Don extends CommonObject global $langs; $langs->load('main'); $langs->load('companies'); - + + $error_string = array(); $err = 0; if (dol_strlen(trim($this->societe)) == 0) { if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname')); $err++; } } if (dol_strlen(trim($this->address)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Address')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Address')); $err++; } if (dol_strlen(trim($this->zip)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip')); $err++; } if (dol_strlen(trim($this->town)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Town')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Town')); $err++; } if (dol_strlen(trim($this->email)) == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail')); $err++; } @@ -256,7 +258,7 @@ class Don extends CommonObject { if (!isset($map[substr($this->amount, $i, 1)] )) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); $err++; $amount_invalid = 1; break; @@ -267,14 +269,14 @@ class Don extends CommonObject { if ($this->amount == 0) { - $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); + $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount')); $err++; } else { if ($this->amount < $minimum && $minimum > 0) { - $error_string[$err] = $langs->trans('MinimumAmount',$langs->trans('$minimum')); + $error_string[] = $langs->trans('MinimumAmount',$langs->trans('$minimum')); $err++; } } @@ -282,14 +284,13 @@ class Don extends CommonObject if ($err) { - $this->error = $error_string; + $this->errors = $error_string; return 0; } else - { + { return 1; } - } /** @@ -311,7 +312,7 @@ class Don extends CommonObject $this->country=($this->country?$this->country:$this->country); $now=dol_now(); - + $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."don ("; @@ -368,7 +369,7 @@ class Don extends CommonObject // Call trigger $result=$this->call_trigger('DON_CREATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers $this->db->commit(); @@ -398,7 +399,7 @@ class Don extends CommonObject $this->country=($this->country?$this->country:$this->country); $this->db->begin(); - + $sql = "UPDATE ".MAIN_DB_PREFIX."don SET "; $sql .= "amount = " . price2num($this->amount); $sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null"); @@ -426,9 +427,9 @@ class Don extends CommonObject { // Call trigger $result=$this->call_trigger('DON_UPDATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers - + $this->db->commit(); return 1; } @@ -448,7 +449,7 @@ class Don extends CommonObject */ function delete($rowid) { - + $this->db-begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;"; @@ -460,9 +461,9 @@ class Don extends CommonObject { // Call trigger $result=$this->call_trigger('DON_DELETE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers - + $this->db->commit(); return 1; } diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c7514e96fbb..02674b59745 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -526,7 +526,7 @@ else { echo '
'.$langs->trans("CreateBill").'
'; } - + if ($object->statut == 0 && $user->rights->facture->supprimer) { print '
'.$langs->trans('Delete').'
'; @@ -544,7 +544,7 @@ else /* * List mode */ - $sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid"; + $sql = "SELECT s.nom as name, s.rowid as socid, f.titre, f.total, f.rowid as facid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; @@ -584,13 +584,13 @@ else print "\n"; $companystatic->id=$objp->socid; - $companystatic->name=$objp->nom; + $companystatic->name=$objp->name; print ''; print ''."\n"; echo ''; print ''; @@ -219,7 +219,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire) { $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.type,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0"; @@ -254,7 +254,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -294,7 +294,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms,"; $sql.= " f.date_lim_reglement as datelimite,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; @@ -351,7 +351,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''; @@ -392,7 +392,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $facstatic=new FactureFournisseur($db); $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.tms, ff.paye"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", SUM(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn"; @@ -432,7 +432,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -613,7 +613,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $langs->load("orders"); $sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -675,7 +675,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us print ''; @@ -717,7 +717,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms,"; $sql.= " f.date_lim_reglement as datelimite,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; @@ -774,7 +774,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''; @@ -821,7 +821,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $facstatic=new FactureFournisseur($db); $sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.paye,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " sum(pf.amount) as am"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn"; @@ -863,7 +863,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print $facstatic->getNomUrl(1,''); print ''; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=0; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index b6c0a13f246..7c34cec1ed4 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -149,7 +149,8 @@ $vatcust=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code); $vatsup=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code); // IRPF that the customer has retained me -if($conf->global->$calc ==0 || $conf->global->$calc == 2){ +if($conf->global->$calc ==0 || $conf->global->$calc == 2) +{ print "
'; $thirdpartystatic->id=$obj->rowid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->client=$obj->client; print $thirdpartystatic->getNomUrl(1,'compta'); print ''.$companystatic->getNomUrl(1,'customer').''.price($objp->total).''; - + if ($user->rights->facture->creer) { echo ''; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 4db7935e69c..d3987bcbad8 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -395,7 +395,7 @@ if (! $sortorder) $sortorder="ASC"; $limit = $conf->liste_limit; -$sql = "SELECT s.nom, s.rowid as socid, s.email"; +$sql = "SELECT s.nom as name, s.rowid as socid, s.email"; $sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"; $sql.= ", f.datef as df, f.date_lim_reglement as datelimite"; $sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement"; @@ -462,7 +462,7 @@ if ($resql) $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder; $urlsource.=str_replace('&','&',$param); - $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->nom):$langs->trans("BillsCustomersUnpaid")); + $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid")); if ($option == 'late') $titre.=' ('.$langs->trans("Late").')'; else $titre.=' ('.$langs->trans("All").')'; @@ -658,7 +658,7 @@ if ($resql) print ''; $thirdparty=new Societe($db); $thirdparty->id=$objp->socid; - $thirdparty->nom=$objp->nom; + $thirdparty->name=$objp->name; $thirdparty->client=$objp->client; $thirdparty->code_client=$objp->code_client; print $thirdparty->getNomUrl(1,'customer'); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 07ebfa5ad7d..39dcc6b6427 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -144,7 +144,7 @@ else $sql = 'SELECT DISTINCT'; $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,'; $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,'; $sql.= ' f.paye as paye, f.fk_statut,'; -$sql.= ' s.nom, s.rowid as socid, s.code_client, s.client '; +$sql.= ' s.nom as name, s.rowid as socid, s.code_client, s.client '; if (! $sall) $sql.= ', SUM(pf.amount) as am'; // To be able to sort on status $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'facture as f'; @@ -265,7 +265,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc; - print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $i = 0; print ''."\n"; @@ -400,7 +400,7 @@ if ($resql) print ''; $thirdparty=new Societe($db); $thirdparty->id=$objp->socid; - $thirdparty->nom=$objp->nom; + $thirdparty->name=$objp->name; $thirdparty->client=$objp->client; $thirdparty->code_client=$objp->code_client; print $thirdparty->getNomUrl(1,'customer'); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index eecf5e75746..1908b0670ff 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -145,7 +145,7 @@ if (! empty($conf->don->enabled) && $user->rights->don->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -185,7 +185,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->client=1; print $thirdpartystatic->getNomUrl(1,'customer',44); print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->fournisseur=1; print $thirdpartystatic->getNomUrl(1,'supplier',44); print ''; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); print '' ; $societestatic->id=$obj->socid; - $societestatic->nom=$obj->nom; + $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); print ''.$societestatic->getNomUrl(1, 'supplier', 44).''.price($obj->total_ht).'
"; print ""; print '"; @@ -160,7 +161,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ print "\n"; $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell'); - + $action = "tvaclient"; $object = &$coll_list; $parameters["mode"] = $modetax; @@ -170,7 +171,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks - + if (is_array($coll_list)) { $var=true; @@ -196,7 +197,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; print ''; $find = array(' ','.'); $replace = array('',''); @@ -210,7 +211,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){ } } $x_coll_sum = $total; - + print ''; print ''; print ''; @@ -240,7 +241,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ print "\n"; $company_static=new Societe($db); - + $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy'); $parameters["direction"] = 'buy'; $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks @@ -269,7 +270,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; print ''; $find = array(' ','.'); $replace = array('',''); @@ -283,14 +284,14 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){ } } $x_paye_sum = $total; - + print ''; print ''; print ''; print ''; - + print '
'.$langs->trans("Num")."
'.$i."'.$company_static->getNomUrl(1).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'.$i."'.$company_static->getNomUrl(1).'
'.$langs->trans("Total").':'.price($totalamount).''.price($total).'
'; - + } else { diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 658e1992e9d..d0e15307be5 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -273,7 +273,7 @@ print '
'; */ $disable_delete = 0; -$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom, s.rowid as socid'; +$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom as name, s.rowid as socid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s'; $sql.= ' WHERE pf.fk_facture = f.rowid'; $sql.= ' AND f.fk_soc = s.rowid'; @@ -322,7 +322,7 @@ if ($resql) // Third party print ''; $thirdpartystatic->id=$objp->socid; - $thirdpartystatic->nom=$objp->nom; + $thirdpartystatic->name=$objp->name; print $thirdpartystatic->getNomUrl(1); print ''; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index cd6ba5c59a2..95503db6ff9 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -221,7 +221,7 @@ class Paiement extends CommonObject if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more."); else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more."); else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more."); - else + else { $result=$invoice->set_paid($user,'',''); if ($result<0) @@ -360,8 +360,8 @@ class Paiement extends CommonObject { // Appel des triggers $result=$this->call_trigger('PAYMENT_DELETE', $user); - if ($result < 0) - { + if ($result < 0) + { $this->db->rollback(); return -1; } @@ -483,7 +483,7 @@ class Paiement extends CommonObject $bank_line_id, $fac->thirdparty->id, DOL_URL_ROOT.'/comm/card.php?socid=', - $fac->thirdparty->nom, + $fac->thirdparty->name, 'company' ); if ($result <= 0) dol_print_error($this->db); @@ -501,7 +501,7 @@ class Paiement extends CommonObject $bank_line_id, $fac->thirdparty->id, DOL_URL_ROOT.'/fourn/card.php?socid=', - $fac->thirdparty->nom, + $fac->thirdparty->name, 'company' ); if ($result <= 0) dol_print_error($this->db); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 46fa00df68c..da1f2bd2833 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -85,7 +85,7 @@ else //$sql.= " c.libelle as paiement_type,"; $sql.= " c.code as paiement_code,"; $sql.= " ba.rowid as bid, ba.label,"; - $sql.= " s.rowid as socid, s.nom"; + $sql.= " s.rowid as socid, s.nom as name"; //$sql.= " f.facnumber"; $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid"; @@ -197,7 +197,7 @@ if ($resql) if ($objp->socid) { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; print $companystatic->getNomUrl(1,'',24); } else print ' '; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 527705e4ab0..ed5b123d923 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -760,7 +760,7 @@ class BonPrelevement extends CommonObject $sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc"; $sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib"; $sql.= ", pfd.amount"; - $sql.= ", s.nom"; + $sql.= ", s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; @@ -829,8 +829,8 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->nom, LOG_ERR); - $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->nom; + dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR); + $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name; } } else @@ -1262,7 +1262,7 @@ class BonPrelevement extends CommonObject * section Debiteur (sepa Debiteurs bloc lines) */ $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,"; - $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; + $sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; $sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum"; $sql.= " FROM"; $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; @@ -1286,7 +1286,7 @@ class BonPrelevement extends CommonObject while ($i < $num) { $obj = $this->db->fetch_object($resql); - $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); + $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); $this->total = $this->total + $obj->somme; $i++; } @@ -1490,7 +1490,7 @@ class BonPrelevement extends CommonObject * Write recipient of request (customer) * * @param string $row_code_client soc.code_client as code, - * @param string $row_nom pl.client_nom AS nom, + * @param string $row_nom pl.client_nom AS name, * @param string $row_address soc.address AS adr, * @param string $row_zip soc.zip * @param string $row_town soc.town diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 51f9a83ed3c..27ae87ca3b4 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -244,7 +244,7 @@ class RejetPrelevement $arr_mime = array(); $arr_name = array(); $facref = $fac->ref; - $socname = $soc->nom; + $socname = $soc->name; $amount = price($fac->total_ttc); $userinfo = $this->user->getFullName($langs); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index a3f7ca2ace8..0326e4922f1 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -156,7 +156,7 @@ print '
'; * Invoices waiting for withdraw */ -$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.rowid as socid,"; +$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,"; $sql.= " pfd.date_demande"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."societe as s,"; @@ -197,7 +197,7 @@ if ($resql) print ''; print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 4cd3098bfc3..9b58f1e44c0 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="f.facnumber"; */ $sql= "SELECT f.facnumber, f.rowid, f.total_ttc,"; -$sql.= " s.nom, s.rowid as socid,"; +$sql.= " s.nom as name, s.rowid as socid,"; $sql.= " pfd.date_demande as date_demande,"; $sql.= " pfd.fk_user_demande"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; @@ -137,7 +137,7 @@ if ($resql) print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 3833a45215a..bf3e428cd0e 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -63,17 +63,17 @@ if ($prev_id) print ''.$langs->trans("Ref").''.$bon->getNomUrl(1).''; print ''.$langs->trans("Date").''.dol_print_date($bon->datec,'day').''; print ''.$langs->trans("Amount").''.price($bon->amount).''; - + // Status print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); $muser->fetch($bon->user_trans); - + print ''.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; @@ -87,19 +87,19 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; - + print '
'; - + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; print ''.$relativepath.''; print '
'; - + dol_fiche_end(); - + } else { @@ -114,7 +114,7 @@ $offset = $conf->liste_limit * $page ; */ $sql = "SELECT pf.rowid"; $sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc"; -$sql.= ", s.rowid as socid, s.nom, pl.statut"; +$sql.= ", s.rowid as socid, s.nom as name, pl.statut"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture as pf"; @@ -166,7 +166,7 @@ if ($result) print ''.$obj->ref."\n"; print ''; - print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."\n"; + print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."\n"; print ''.price($obj->total_ttc)."\n"; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index e43ea95ae44..161227aa121 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -62,17 +62,17 @@ if ($prev_id) print ''.$langs->trans("Ref").''.$bon->getNomUrl(1).''; print ''.$langs->trans("Date").''.dol_print_date($bon->datec,'day').''; print ''.$langs->trans("Amount").''.price($bon->amount).''; - + // Status print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); $muser->fetch($bon->user_trans); - + print ''.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; @@ -86,19 +86,19 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; - + print '
'; - + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; print ''.$relativepath.''; print '
'; - + dol_fiche_end(); - + } else { @@ -112,7 +112,7 @@ $rej = new RejetPrelevement($db, $user); * Liste des factures */ $sql = "SELECT pl.rowid, pl.amount, pl.statut"; -$sql.= " , s.rowid as socid, s.nom"; +$sql.= " , s.rowid as socid, s.nom as name"; $sql.= " , pr.motif, pr.afacturer, pr.fk_facture"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; @@ -152,7 +152,7 @@ if ($resql) print img_picto('', 'statut'.$obj->statut).' '; print substr('000000'.$obj->rowid, -6); print ''; - print ''.stripslashes($obj->nom)."\n"; + print ''.$obj->name."\n"; print ''.price($obj->amount)."\n"; print ''.$rej->motifs[$obj->motif].''; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 911ffde6f99..1abc421cf46 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -96,7 +96,7 @@ print '
'; */ $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,"; $sql.= " pfd.date_demande,"; -$sql.= " s.nom, s.rowid as socid"; +$sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -137,7 +137,7 @@ if ($resql) print ''; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; print $thirdpartystatic->getNomUrl(1,'customer'); print ''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 45bab4d69dc..b3f9acb3570 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -190,7 +190,7 @@ if ($id) print ''.$langs->trans("WithdrawalRefused").''; //Select yes/no - print ''.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?'; + print ''.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->name.' ?'; print ''; print $form->selectyesno("confirm",1,0); print ''; @@ -257,7 +257,7 @@ if ($id) */ $sql = "SELECT pf.rowid"; $sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; - $sql.= " , s.rowid as socid, s.nom"; + $sql.= " , s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; @@ -308,7 +308,7 @@ if ($id) print ''.$obj->ref."\n"; print ''; - print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."\n"; + print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."\n"; print ''.price($obj->total_ttc)."\n"; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index ef884f50edf..1e96e9276d8 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -106,7 +106,7 @@ if ($prev_id) print ''; dol_fiche_end(); - + } else { @@ -128,7 +128,7 @@ $pagenext = $page + 1; * */ $sql = "SELECT pl.rowid, pl.statut, pl.amount"; -$sql.= ", s.rowid as socid, s.nom"; +$sql.= ", s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -175,7 +175,7 @@ if ($result) print substr('000000'.$obj->rowid, -6); print ''; - print ''.stripslashes($obj->nom)."\n"; + print ''.$obj->name."\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 819d879b098..7e0b818279f 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -63,7 +63,7 @@ llxHeader('',$langs->trans("WithdrawalsLines")); $sql = "SELECT p.rowid, p.ref, p.statut, p.datec"; $sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc"; -$sql.= " , s.rowid as socid, s.nom, s.code_client"; +$sql.= " , s.rowid as socid, s.nom as name, s.code_client"; $sql.= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; @@ -162,7 +162,7 @@ if ($result) print ' '.$obj->facnumber."\n"; print ''; - print ''.$obj->nom."\n"; + print ''.$obj->name."\n"; print ''.$obj->code_client."\n"; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index f56652fc4b6..59599e93dc6 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -64,8 +64,8 @@ if ($socid > 0) print ''; - // Nom - print ''; + // Name + print ''; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 19054bfd7c9..9122ece2ed9 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -120,7 +120,7 @@ $total_ttc=0; // Affiche en-tete de rapport if ($modecompta=="CREANCES-DETTES") { - $nom=$langs->trans("AnnualByCompaniesDueDebtMode"); + $name=$langs->trans("AnnualByCompaniesDueDebtMode"); $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); @@ -132,7 +132,7 @@ if ($modecompta=="CREANCES-DETTES") //$exportlink=$langs->trans("NotYetAvailable"); } else { - $nom=$langs->trans("AnnualByCompaniesInputOutputMode"); + $name=$langs->trans("AnnualByCompaniesInputOutputMode"); $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; //$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1); @@ -142,7 +142,7 @@ else { $builddate=time(); //$exportlink=$langs->trans("NotYetAvailable"); } -report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode); +report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode); // Show report array print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Name").''.$societe->name.'
'; @@ -160,7 +160,7 @@ print ''; if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT s.nom, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= " WHERE f.fk_soc = s.rowid"; @@ -178,7 +178,7 @@ else * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin) */ - $sql = "SELECT s.nom as nom, s.rowid as socid, sum(pf.amount) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf"; @@ -206,7 +206,7 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; @@ -225,7 +225,7 @@ if ($result) { // On ajoute les paiements clients anciennes version, non lie par paiement_facture if ($modecompta != 'CREANCES-DETTES') { - $sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc"; + $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ", ".MAIN_DB_PREFIX."paiement as p"; @@ -236,8 +236,8 @@ if ($modecompta != 'CREANCES-DETTES') $sql.= " AND ba.entity = ".$conf->entity; if (! empty($date_start) && ! empty($date_end)) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; - $sql.= " GROUP BY nom, idp"; - $sql.= " ORDER BY nom"; + $sql.= " GROUP BY name, idp"; + $sql.= " ORDER BY name"; dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG); $result = $db->query($sql); @@ -290,7 +290,7 @@ print ''; */ if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc"; + $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f"; $sql.= " WHERE f.fk_soc = s.rowid"; @@ -338,7 +338,7 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; @@ -381,7 +381,7 @@ print '"; - print ''; + print ''; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; @@ -455,7 +455,7 @@ print '"; - print ''; + print ''; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; @@ -550,7 +550,7 @@ if ($mysoc->tva_assuj == 'franchise') // Non assujeti if ($conf->salaries->enabled) { print ''; - $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -618,7 +618,7 @@ if ($conf->salaries->enabled) if ($conf->donation->enabled) { print ''; - $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; + $sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."don as p"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " AND fk_statut=2"; @@ -650,7 +650,7 @@ if ($conf->donation->enabled) $var = !$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 0ccd450e0cb..af070901517 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -153,60 +153,49 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; } if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer)) { - - $db->begin(); + $db->begin(); - $originalId = $id; - - $object = new ChargeSociales($db); - $object->fetch($id); + $originalId = $id; - if ($object->id > 0) - { - $object->paye = 0; - $object->id = $object->ref = null; - - if(GETPOST('clone_for_next_month') != '') { - - $object->date_ech = strtotime('+1month', $object->date_ech); - $object->periode = strtotime('+1month', $object->periode); - } - - if ($object->check()) - { - $id = $object->create($user); - if ($id > 0) - { - $db->commit(); - $db->close(); + $object = new ChargeSociales($db); + $object->fetch($id); - header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); - exit; - } - else - { - $id=$originalId; - $db->rollback(); - - if (count($object->errors)) - { - setEventMessage($object->errors, 'errors'); - dol_print_error($db,$object->errors); - } - else - { - setEventMessage($langs->trans($object->error), 'errors'); - dol_print_error($db,$object->error); - } - } - } - } - else - { - $db->rollback(); - dol_print_error($db,$object->error); - } - + if ($object->id > 0) + { + $object->paye = 0; + $object->id = $object->ref = null; + + if(GETPOST('clone_for_next_month') != '') { + + $object->date_ech = strtotime('+1month', $object->date_ech); + $object->periode = strtotime('+1month', $object->periode); + } + + if ($object->check()) + { + $id = $object->create($user); + if ($id > 0) + { + $db->commit(); + $db->close(); + + header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); + exit; + } + else + { + $id=$originalId; + $db->rollback(); + + setEventMessages($object->error,$object->errors, 'errors'); + } + } + } + else + { + $db->rollback(); + dol_print_error($db,$object->error); + } } @@ -301,18 +290,18 @@ if ($id > 0) $head=tax_prepare_head($object); dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill'); - + // Clone confirmation if ($action === 'clone') { $formclone=array( array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1), - + ); - + print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes'); } - + // Confirmation de la suppression de la charge if ($action == 'paid') { @@ -492,7 +481,7 @@ if ($id > 0) { print "id&action=paid\">".$langs->trans("ClassifyPaid").""; } - + // Clone if ($user->rights->tax->charges->creer) { diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 807466ef95f..44e62ad0f10 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -106,22 +106,23 @@ class ChargeSociales extends CommonObject return -1; } } - /* - * Check if a social contribution can be created into database - * - */ - function check() { - + + /** + * Check if a social contribution can be created into database + * + * @return boolean True or false + */ + function check() + { $newamount=price2num($this->amount,'MT'); // Validation parametres if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) { - return false; } - - + + return true; } @@ -138,7 +139,8 @@ class ChargeSociales extends CommonObject // Nettoyage parametres $newamount=price2num($this->amount,'MT'); - if(!$this->check()) { + if (!$this->check()) + { $this->error="ErrorBadParameter"; return -2; } @@ -357,7 +359,7 @@ class ChargeSociales extends CommonObject global $langs; $langs->load('customers'); $langs->load('bills'); - + if ($mode == 0) { if ($statut == 0) return $langs->trans("Unpaid"); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 422354ee7c3..c2620fd34df 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -110,10 +110,10 @@ $fsearch.=' '; // Affiche en-tete du rapport if ($modetax==1) // Calculate on invoice for goods and services { - $nom=$langs->trans("VATReportByCustomersInDueDebtMode"); + $name=$langs->trans("VATReportByCustomersInDueDebtMode"); $calcmode=$langs->trans("CalcModeVATDebt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - //$nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; + //$name.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()."".img_next()."":""); $description=$langs->trans("RulesVATDueServices"); @@ -138,10 +138,10 @@ if ($modetax==1) // Calculate on invoice for goods and services } if ($modetax==0) // Invoice for goods, payment for services { - $nom=$langs->trans("VATReportByCustomersInInputOutputMode"); + $name=$langs->trans("VATReportByCustomersInInputOutputMode"); $calcmode=$langs->trans("CalcModeVATEngagement"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - //$nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; + //$name.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()."".img_next()."":""); $description=$langs->trans("RulesVATInServices"); @@ -165,7 +165,7 @@ if ($modetax==0) // Invoice for goods, payment for services $amountsup=$langs->trans("AmountHT"); if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')'; } -report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode); +report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode); $vatcust=$langs->trans("VATReceived"); $vatsup=$langs->trans("VATPaid"); @@ -223,7 +223,7 @@ if (is_array($coll_list)) print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; $company_static->client=1; print ''; $find = array(' ','.'); @@ -304,7 +304,7 @@ if (is_array($coll_list)) print ""; print '"; $company_static->id=$coll->socid; - $company_static->nom=$coll->nom; + $company_static->name=$coll->name; $company_static->fournisseur=1; print ''; $find = array(' ','.'); diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 19ce91f9c82..9e93523a654 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -185,7 +185,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_CREATE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -304,7 +304,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_MODIFY',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -374,7 +374,7 @@ class Contact extends CommonObject $soc = new Societe($this->db); $soc->fetch($this->socid); - $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->nom; + $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name; if ($soc->client == 1) $info["businessCategory"] = "Customers"; if ($soc->client == 2) $info["businessCategory"] = "Prospects"; if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers"; @@ -774,7 +774,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_DELETE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } @@ -1060,7 +1060,7 @@ class Contact extends CommonObject { // Call trigger $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user); - if ($result < 0) { $error++; } + if ($result < 0) { $error++; } // End call triggers } diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index e78c298c541..77abf31ac89 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -75,7 +75,7 @@ if ($company->id) if (! $contact->zip) $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country_code, "WORK;POSTAL"); if ($company->email != $contact->email) $v->setEmail($company->email,'internet'); // Si contact lie a un tiers non de type "particulier" - if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom); + if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name); } // Personal informations diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 400899993ae..02a580174c3 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -227,7 +227,7 @@ print "
'.$langs->trans("CustomersInvoices").'
 ".$langs->trans("Bills").' '.$objp->nom."".$langs->trans("Bills").' '.$objp->name."".price($objp->amount_ht)."
 ".$langs->trans("Bills")." socid."\">".$objp->nom."".$langs->trans("Bills")." socid."\">".$objp->name."".price(-$objp->amount_ht)."
'.$langs->trans("SocialContributions").' ('.$langs->t if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= " WHERE cs.fk_type = c.id"; @@ -391,7 +391,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { - $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -424,7 +424,7 @@ if ($result) { $var = !$var; print "
 '.$obj->nom.''.$obj->label.''.price(-$obj->amount).''.price(-$obj->amount).'
'.$langs->trans("SocialContributions").' ('.$langs->t if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= " WHERE cs.fk_type = c.id"; @@ -468,7 +468,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { - $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount"; + $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs"; $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -501,7 +501,7 @@ if ($result) { $var = !$var; print "
 '.$obj->nom.''.$obj->label.''.price(-$obj->amount).''.price(-$obj->amount).'
'.$langs->trans("Salaries").'
'.$langs->trans("Donation").'
 ".$langs->trans("Donation")." nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).'
'.$i."'.$company_static->getNomUrl(1,'customer').'
'.$i."'.$company_static->getNomUrl(1,'supplier').'

"; if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { $sql = "SELECT c.rowid as ref, c.rowid,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.rowid = c.fk_soc"; @@ -262,7 +262,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) print ''; print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print ''; @@ -298,7 +298,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.d $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,'; $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; -$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid"; +$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,"; $sql.= " ".MAIN_DB_PREFIX."contrat as c"; @@ -342,7 +342,7 @@ if ($result) print ''; print ''; $staticcompany->id=$obj->socid; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''.dol_print_date($obj->tms,'dayhour').''; @@ -369,7 +369,7 @@ print '
'; // Last modified services $sql = "SELECT c.ref, c.fk_soc, "; $sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -423,7 +423,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; @@ -447,7 +447,7 @@ print '
'; // Not activated services $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -503,7 +503,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; @@ -526,7 +526,7 @@ print '
'; // Expired services $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,"; -$sql.= " s.nom,"; +$sql.= " s.nom as name,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype"; $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -583,7 +583,7 @@ if ($resql) print ''; print ''; $staticcompany->id=$obj->fk_soc; - $staticcompany->nom=$obj->nom; + $staticcompany->name=$obj->name; print $staticcompany->getNomUrl(1,'',20); print ''; print ''; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 7970e80603c..d8e635dacb0 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -96,9 +96,8 @@ if (!empty($search_ref_customer)) { if ($sall) { $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); } -$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut,"; -$sql.= " s.nom, s.rowid"; -$sql.= " ORDER BY $sortfield $sortorder"; +$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, s.nom, s.rowid"; +$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit + 1, $offset); $resql=$db->query($sql); @@ -157,7 +156,7 @@ if ($resql) if ($obj->nb_late) print img_warning($langs->trans("Late")); print ''; print ''.$obj->ref_customer.''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; //print ''.dol_print_date($obj->datec).''; print ''.dol_print_date($db->jdate($obj->date_contrat)).''; //print ''.$staticcontrat->LibStatut($obj->statut,3).''; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 4318d81e923..77fc0155430 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -80,7 +80,7 @@ $form=new Form($db); llxHeader(); $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,"; -$sql.= " s.rowid as socid, s.nom,"; +$sql.= " s.rowid as socid, s.nom as name,"; $sql.= " cd.rowid, cd.description, cd.statut,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype,"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,"; @@ -225,7 +225,7 @@ if ($resql) // Third party print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=1; print $companystatic->getNomUrl(1,'customer',28); print ''; diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 8b88b6ff557..7d118932ba4 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -64,7 +64,7 @@ class box_actions extends ModeleBoxes { $sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,"; $sql.= " ta.code,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, "; $sql.= MAIN_DB_PREFIX."actioncomm AS a)"; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; @@ -112,7 +112,7 @@ class box_actions extends ModeleBoxes 'url' => ($objp->socid?DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid:'')); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,24), + 'text' => dol_trunc($objp->name,24), 'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"', @@ -155,7 +155,7 @@ class box_actions extends ModeleBoxes global $langs, $conf; parent::showBox($this->info_box_head, $this->info_box_contents); if ($conf->global->SHOW_DIALOG_HOMEPAGE) - { + { $actioncejour=false; $contents=$this->info_box_contents; $nblines=count($contents); @@ -170,7 +170,7 @@ class box_actions extends ModeleBoxes if (isset($contents[$i])) { // on affiche que les évènement du jours ou passé - // qui ne sont pas à 100% + // qui ne sont pas à 100% $actioncejour=true; $var=!$var; // TR @@ -193,8 +193,8 @@ class box_actions extends ModeleBoxes print ''; } } - print ''; - + print ''; + } print ''; if ($actioncejour) diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index ae6b6b7ef15..9e1706a5e6b 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -63,7 +63,7 @@ class box_clients extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (1, 3)"; @@ -93,7 +93,7 @@ class box_clients extends ModeleBoxes 'url' => $url.$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => $url.$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index f88eaa939ac..a89fca4acc0 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -63,7 +63,7 @@ class box_commandes extends ModeleBoxes if ($user->rights->commande->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.ref, c.tms, c.rowid,"; $sql.= " c.fk_statut, c.facture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -101,7 +101,7 @@ class box_commandes extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 4297d4de46e..dc0ff8e5382 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -60,7 +60,7 @@ class box_contracts extends ModeleBoxes if ($user->rights->contrat->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -108,7 +108,7 @@ class box_contracts extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index 92af03f57ad..ee5326250b3 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -66,7 +66,7 @@ class box_factures extends ModeleBoxes { $sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df"; $sql.= ", f.paye, f.fk_statut, f.datec, f.tms"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", f.date_lim_reglement as datelimite"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -113,7 +113,7 @@ class box_factures extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength'=>40, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 20d2a11bf9c..441c9f743fe 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -63,7 +63,7 @@ class box_factures_fourn extends ModeleBoxes if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.amount,"; $sql.= " f.paye, f.fk_statut,"; $sql.= ' f.datef as df,'; @@ -115,7 +115,7 @@ class box_factures_fourn extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index dadfe58a27a..aa217f1c436 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -60,7 +60,7 @@ class box_factures_fourn_imp extends ModeleBoxes if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,"; $sql.= " f.amount, f.datef as df,"; $sql.= " f.paye, f.fk_statut, f.type"; @@ -111,7 +111,7 @@ class box_factures_fourn_imp extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][5] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 8aab8fa9b15..e6df1530f8d 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -63,7 +63,7 @@ class box_factures_imp extends ModeleBoxes if ($user->rights->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.facnumber, f.date_lim_reglement as datelimite,"; $sql.= " f.amount, f.datef as df,"; $sql.= " f.paye, f.fk_statut, f.rowid as facid"; @@ -110,7 +110,7 @@ class box_factures_imp extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength'=>44, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 118a18a007a..fdebad2f38a 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -65,7 +65,7 @@ class box_ficheinter extends ModeleBoxes $sql.= " f.datec,"; $sql.= " f.date_valid as datev,"; $sql.= " f.tms as datem,"; - $sql.= " s.nom, s.rowid as socid, s.client"; + $sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -109,7 +109,7 @@ class box_ficheinter extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 3423d8bee63..f233221ccaa 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -62,7 +62,7 @@ class box_fournisseurs extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -89,7 +89,7 @@ class box_fournisseurs extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 19c007bb287..b548e90671b 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -62,7 +62,7 @@ class box_propales extends ModeleBoxes if ($user->rights->propale->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; @@ -106,7 +106,7 @@ class box_propales extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 8c1a0afd288..dd8682515c7 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -63,7 +63,7 @@ class box_prospect extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (2, 3)"; @@ -92,7 +92,7 @@ class box_prospect extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][2] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index d6e525e42d4..eb48fc83d2b 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -62,7 +62,7 @@ class box_services_contracts extends ModeleBoxes if ($user->rights->service->lire && $user->rights->contrat->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.rowid,"; $sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,"; $sql.= " p.rowid as pid, p.label, p.fk_product_type"; @@ -125,7 +125,7 @@ class box_services_contracts extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'maxlength' => 28, 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index 8bfe5749215..52f3777e2af 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -63,7 +63,7 @@ class box_services_expired extends ModeleBoxes // Select contracts with at least one expired service $sql = "SELECT "; $sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,"; - $sql.= " s.nom, s.rowid as socid,"; + $sql.= " s.nom as name, s.rowid as socid,"; $sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services"; $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -104,7 +104,7 @@ class box_services_expired extends ModeleBoxes 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => dol_trunc($objp->nom,40), + 'text' => dol_trunc($objp->name,40), 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid); $this->info_box_contents[$i][4] = array('td' => 'align="center"', diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 0634b1548a8..876b50c849f 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -62,7 +62,7 @@ class box_supplier_orders extends ModeleBoxes if ($user->rights->fournisseur->commande->lire) { - $sql = "SELECT s.nom, s.rowid as socid,"; + $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " c.ref, c.tms, c.rowid,"; $sql.= " c.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -102,7 +102,7 @@ class box_supplier_orders extends ModeleBoxes 'url' => $urls); $this->info_box_contents[$i][3] = array('td' => 'align="left"', - 'text' => $objp->nom, + 'text' => $objp->name, 'url' => $urls); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 33b1d42ca08..51b9c5eff46 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -769,7 +769,7 @@ class Form $outarray=array(); // On recherche les societes - $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur"; + $sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.code_client, s.code_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; @@ -836,11 +836,11 @@ class Form if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) { $label .= $obj->code_fournisseur. ' - '; } - $label.=' '.$obj->nom; + $label.=' '.$obj->name; } else { - $label=$obj->nom; + $label=$obj->name; } if ($showtype) @@ -996,16 +996,12 @@ class Form // On recherche les societes $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste"; - if ($showsoc > 0) { - $sql.= " , s.nom as company"; - } + if ($showsoc > 0) $sql.= " , s.nom as company"; $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp"; - if ($showsoc > 0) { - $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc "; - } + if ($showsoc > 0) $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc"; $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid; - if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 "; + if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0"; $sql.= " ORDER BY sp.lastname ASC"; dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG); @@ -1839,7 +1835,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; if ($socid) $sql.= " AND pfp.fk_soc = ".$socid; @@ -1951,8 +1947,8 @@ class Form } if (! $socid) { - $opt .= " - ".dol_trunc($objp->nom,8); - $outval.=" - ".dol_trunc($objp->nom,8); + $opt .= " - ".dol_trunc($objp->name,8); + $outval.=" - ".dol_trunc($objp->name,8); } } else @@ -2007,7 +2003,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid"; @@ -2044,7 +2040,7 @@ class Form if($num == 1) { $opt .= ' selected="selected"'; } - $opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - '; + $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - '; if ($objp->quantity == 1) { @@ -4433,7 +4429,7 @@ class Form $out=''; // On recherche les groupes - $sql = "SELECT ug.rowid, ug.nom "; + $sql = "SELECT ug.rowid, ug.nom as name"; if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= ", e.label"; @@ -4478,7 +4474,7 @@ class Form } $out.= '>'; - $out.= $obj->nom; + $out.= $obj->name; if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1) { $out.= " (".$obj->label.")"; diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index f158a86f5da..ef58b6c7322 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -222,7 +222,7 @@ class FormCompany $out=''; // On recherche les departements/cantons/province active d'une region et pays actif - $sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, c.label as country, c.code as country_code FROM"; + $sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code FROM"; $sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c"; $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid"; $sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1"; @@ -270,7 +270,7 @@ class FormCompany $out.= ''; } $i++; @@ -292,7 +292,7 @@ class FormCompany * Retourne la liste deroulante des regions actives dont le pays est actif * La cle de la liste est le code (il peut y avoir plusieurs entree pour * un code donnee mais dans ce cas, le champ pays et lang differe). - * Ainsi les liens avec les regions se font sur une region independemment de son nom. + * Ainsi les liens avec les regions se font sur une region independemment de son name. * * @param string $selected Preselected value * @param string $htmlname Name of HTML select field @@ -529,20 +529,20 @@ class FormCompany global $conf, $langs; // On recherche les societes - $sql = "SELECT s.rowid, s.nom FROM"; + $sql = "SELECT s.rowid, s.nom as name FROM"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; - if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND rowid = ".$selected; + if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND s.rowid = ".$selected; else { // For ajax search we limit here. For combo list, we limit later if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && is_array($limitto) && count($limitto)) { - $sql.= " AND rowid IN (".join(',',$limitto).")"; + $sql.= " AND s.rowid IN (".join(',',$limitto).")"; } } - $sql.= " ORDER BY nom ASC"; + $sql.= " ORDER BY s.nom ASC"; $resql = $this->db->query($sql); if ($resql) @@ -620,7 +620,7 @@ class FormCompany } else { - print ''; + print ''; } print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength); //print ''; @@ -653,14 +653,14 @@ class FormCompany { print ''; + print ' selected="selected">'.dol_trunc($obj->name,24).''; $firstCompany = $obj->rowid; } else { print ''; + print '>'.dol_trunc($obj->name,24).''; } $i ++; } diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index fdc2d6fbe4f..52d27f82523 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -202,7 +202,8 @@ class InfoBox $db->begin(); - // Sauve parametre indiquant que le user a une config dediee + // Save parameters to say user has a dedicated setup + $tab=array(); $confuserzone='MAIN_BOXES_'.$zone; $tab[$confuserzone]=1; if (dol_set_user_param($db, $conf, $user, $tab) < 0) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d5bd9ae9198..f85d1c8f4af 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -954,7 +954,7 @@ function dol_meta_create($object) if (is_dir($dir)) { $nblignes = count($object->lines); - $client = $object->client->nom . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town; + $client = $object->client->name . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town; $meta = "REFERENCE=\"" . $object->ref . "\" DATE=\"" . dol_print_date($object->date,'') . "\" NB_ITEMS=\"" . $nblignes . "\" diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 38ca67bc9b2..746755b824c 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1143,8 +1143,8 @@ function weight_convert($weight,&$from_unit,$to_unit) * * @param DoliDB $db Handler database * @param Conf $conf Object conf - * @param User $user Object user - * @param array $tab Tableau (cle=>valeur) des parametres a sauvegarder + * @param User $user Object user + * @param array $tab Array (key=>value) with all parameters to save * @return int <0 if KO, >0 if OK * * @see dolibarr_get_const, dolibarr_set_const, dolibarr_del_const diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index ff0587c7612..5000e00b345 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -682,7 +682,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass { // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $fromcompany->nom, + '__FROM_NAME__' => $fromcompany->name, '__FROM_EMAIL__' => $fromcompany->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index 62e46b7b9f7..cc9478f5d61 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -124,7 +124,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction } if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) { - $sql = "SELECT s.rowid as socid, s.nom as nom, s.siren as tva_intra, s.tva_assuj as assuj,"; + $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,"; $sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,"; $sql.= " sum(fd.".$total_localtax1.") as localtax1,"; $sql.= " sum(fd.".$total_localtax2.") as localtax2"; diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 28fa03ee4f3..0bd7a262a9c 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php' */ class mod_barcode_product_standard extends ModeleNumRefBarCode { - var $nom='Standard'; // Model Name + var $name='Standard'; // Model Name var $code_modifiable; // Editable code var $code_modifiable_invalide; // Modified code if it is invalid var $code_modifiable_null; // Modified code if it is null diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php index 0f87306354a..d03302f36b7 100644 --- a/htdocs/core/modules/barcode/modules_barcode.class.php +++ b/htdocs/core/modules/barcode/modules_barcode.class.php @@ -62,7 +62,7 @@ abstract class ModeleNumRefBarCode $langs->load("bills"); return $langs->trans("NoDescription"); } - + /** Return model name * * @param Translate $langs Object langs @@ -70,10 +70,10 @@ abstract class ModeleNumRefBarCode */ function getNom($langs) { - return $this->nom; + return empty($this->name)?$this->nom:$this->name; } - - /** Return a numbering example + + /** Return a numbering example * * @param Translate $langs Object langs * @return string Example @@ -96,7 +96,7 @@ abstract class ModeleNumRefBarCode global $langs; return $langs->trans("Function_getNextValue_InModuleNotWorking"); } - + /** Return version of module * * @return string Version @@ -112,7 +112,7 @@ abstract class ModeleNumRefBarCode if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } - + /** * Return description of module parameters * @@ -128,7 +128,7 @@ abstract class ModeleNumRefBarCode $langs->load("admin"); $s=''; - $s.=$langs->trans("Name").': '.$this->nom.'
'; + $s.=$langs->trans("Name").': '.$this->name.'
'; $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; $s.='
'; @@ -171,6 +171,6 @@ abstract class ModeleNumRefBarCode return $s; } - + } diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index 895ad153fc8..e95d40e0908 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -277,7 +277,7 @@ class doc_generic_order_odt extends ModelePDFCommandes // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -483,7 +483,7 @@ class doc_generic_order_odt extends ModelePDFCommandes } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 7c2b7e742a5..3e7803af70a 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1233,12 +1233,12 @@ class pdf_einstein extends ModelePDFCommandes { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index 05dfadac4a7..0216bd4163a 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -1190,12 +1190,12 @@ class pdf_proforma extends ModelePDFCommandes { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index d522a12eef2..bd4cc333743 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -586,12 +586,12 @@ class pdf_strato extends ModelePDFContract { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $this->recipient->name=$outputlangs->convToOutputCharset($socname); } else { - $this->recipient->name=$outputlangs->convToOutputCharset($object->client->nom); + $this->recipient->name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target'); diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index b4325139878..aaddbc1d748 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -483,7 +483,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 69286c7980d..bdf61e3ea72 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -617,12 +617,12 @@ class pdf_merou extends ModelePdfExpedition { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails'); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index bf4b738354a..ccb4f93a611 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -631,12 +631,12 @@ class pdf_rouget extends ModelePdfExpedition { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails'); diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 0084df11e72..023978d0999 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -285,7 +285,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -440,7 +440,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 6b337ac4ad3..35a0ff47aa0 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -182,7 +182,7 @@ class pdf_crabe extends ModelePDFFactures } } if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; - + if ($conf->facture->dir_output) { $object->fetch_thirdparty(); @@ -369,7 +369,7 @@ class pdf_crabe extends ModelePDFFactures // $pdf->Image does not increase value return by getY, so we save it manually $posYAfterImage=$curY+$imglinesize['height']; } - + // Description of product line $curX = $this->posxdesc-1; @@ -407,7 +407,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->commitTransaction(); } $posYAfterDescription=$pdf->GetY(); - + $nexY = $pdf->GetY(); $pageposafter=$pdf->getPage(); $pdf->setPage($pageposbefore); @@ -487,7 +487,7 @@ class pdf_crabe extends ModelePDFFactures $this->tva[$vatrate] += $tvaligne; if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage; - + // Add line if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) { @@ -1241,7 +1241,7 @@ class pdf_crabe extends ModelePDFFactures //$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C'); } } - + if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) { $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height); @@ -1479,12 +1479,12 @@ class pdf_crabe extends ModelePDFFactures { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 7a697817eb3..0d09aa7ce6c 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -565,12 +565,12 @@ class pdf_soleil extends ModelePDFFicheinter { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target'); diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index bb9f1d155ff..7717a43c575 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -825,12 +825,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php index d8f88ef766c..c647466e796 100644 --- a/htdocs/core/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -59,7 +59,7 @@ class mailing_framboise extends MailingTargets global $conf, $langs; $langs->load("members"); $langs->load("companies"); - + $cibles = array(); // Select the members from category @@ -229,10 +229,6 @@ class mailing_framboise extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"user").''; } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index 9d7fb16aaab..df8ec79f988 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -240,10 +240,6 @@ class mailing_thirdparties extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"company").''; } diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index a907ad0ec3f..5837329a476 100644 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -40,7 +40,7 @@ class mailing_thirdparties_services_expired extends MailingTargets function __construct($db) { global $conf; - + $this->db=$db; $this->arrayofproducts=array(); @@ -233,10 +233,6 @@ class mailing_thirdparties_services_expired extends MailingTargets */ function url($id) { - //$companystatic=new Societe($this->db); - //$companystatic->id=$id; - //$companystatic->nom=''; - //return $companystatic->getNomUrl(1); // Url too long return ''.img_object('',"company").''; } diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 37383474c2d..5a041fd31ce 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php' class mod_codeproduct_elephant extends ModeleProductCode { var $nom='Elephant'; // Nom du modele + var $name='Elephant'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index a3df52f682f..3b850e1ba91 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -40,6 +40,7 @@ class mod_codeproduct_leopard extends ModeleProductCode */ var $nom='Leopard'; // Nom du modele + var $name='Leopard'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index 66affcf256a..0bfd3f8f03e 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -46,7 +46,7 @@ abstract class ModeleProductCode */ function getNom($langs) { - return $this->nom; + return empty($this->name)?$this->nom:$this->name; } @@ -147,7 +147,7 @@ abstract class ModeleProductCode $langs->load("admin"); $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->nom.'
'; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index fc18f1068ce..97e571c2972 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -339,7 +339,7 @@ class doc_generic_project_odt extends ModelePDFProjects $texte.= '
'; $texte.= ''; $texte.= '
'; - + // Scan directories if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': '.count($listoffiles).''; @@ -452,7 +452,7 @@ class doc_generic_project_odt extends ModelePDFProjects // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, ); complete_substitutions_array($substitutionarray, $langs, $object); @@ -1020,7 +1020,7 @@ class doc_generic_project_odt extends ModelePDFProjects } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 17ae9f29ddf..49e4586d07b 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -35,11 +35,12 @@ class mod_project_simple extends ModeleNumRefProjects var $prefix='PJ'; var $error=''; var $nom = "Simple"; + var $name = "Simple"; - /** + /** * Return description of numbering module - * + * * @return string Text with description */ function info() @@ -49,9 +50,9 @@ class mod_project_simple extends ModeleNumRefProjects } - /** + /** * Return an example of numbering module values - * + * * @return string Example */ function getExample() @@ -62,7 +63,7 @@ class mod_project_simple extends ModeleNumRefProjects /** Test si les numeros deja en vigueur dans la base ne provoquent pas de * de conflits qui empechera cette numerotation de fonctionner. - * + * * @return boolean false si conflit, true si ok */ function canBeActivated() @@ -97,7 +98,7 @@ class mod_project_simple extends ModeleNumRefProjects /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -130,7 +131,7 @@ class mod_project_simple extends ModeleNumRefProjects //$yymm = strftime("%y%m",time()); $yymm = strftime("%y%m",$date); - + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is else $num = sprintf("%04s",$max+1); @@ -139,9 +140,9 @@ class mod_project_simple extends ModeleNumRefProjects } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index 5633a61f8ac..e76ed349b46 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -33,11 +33,12 @@ class mod_project_universal extends ModeleNumRefProjects var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $error = ''; var $nom = 'Universal'; + var $name = 'Universal'; /** * Renvoi la description du modele de numerotation - * + * * @return string Texte descripif */ function info() @@ -78,7 +79,7 @@ class mod_project_universal extends ModeleNumRefProjects /** * Renvoi un exemple de numerotation - * + * * @return string Example */ function getExample() @@ -99,7 +100,7 @@ class mod_project_universal extends ModeleNumRefProjects /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -126,9 +127,9 @@ class mod_project_universal extends ModeleNumRefProjects } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index dd70a49f3e1..28b458732ab 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -438,7 +438,7 @@ class doc_generic_task_odt extends ModelePDFTask // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, ); complete_substitutions_array($substitutionarray, $langs, $object); diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index eb8928d3b8f..0e7b416d72e 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -35,11 +35,12 @@ class mod_task_simple extends ModeleNumRefTask var $prefix='TK'; var $error=''; var $nom = "Simple"; + var $name = "Simple"; - /** + /** * Return description of numbering module - * + * * @return string Text with description */ function info() @@ -49,9 +50,9 @@ class mod_task_simple extends ModeleNumRefTask } - /** + /** * Return an example of numbering module values - * + * * @return string Example */ function getExample() @@ -62,7 +63,7 @@ class mod_task_simple extends ModeleNumRefTask /** Test si les numeros deja en vigueur dans la base ne provoquent pas de * de conflits qui empechera cette numerotation de fonctionner. - * + * * @return boolean false si conflit, true si ok */ function canBeActivated() @@ -98,7 +99,7 @@ class mod_task_simple extends ModeleNumRefTask /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Task $task Object Task * @return string Value if OK, 0 if KO @@ -130,7 +131,7 @@ class mod_task_simple extends ModeleNumRefTask //$yymm = strftime("%y%m",time()); $yymm = strftime("%y%m",$date); - + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is else $num = sprintf("%04s",$max+1); @@ -139,9 +140,9 @@ class mod_task_simple extends ModeleNumRefTask } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Task $task Object task * @return string Next not used reference diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php index 1e99f904116..529814079c1 100644 --- a/htdocs/core/modules/project/task/mod_task_universal.php +++ b/htdocs/core/modules/project/task/mod_task_universal.php @@ -33,11 +33,12 @@ class mod_task_universal extends ModeleNumRefTask var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $error = ''; var $nom = 'Universal'; + var $name = 'Universal'; /** * Renvoi la description du modele de numerotation - * + * * @return string Texte descripif */ function info() @@ -78,7 +79,7 @@ class mod_task_universal extends ModeleNumRefTask /** * Renvoi un exemple de numerotation - * + * * @return string Example */ function getExample() @@ -99,7 +100,7 @@ class mod_task_universal extends ModeleNumRefTask /** * Return next value - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Value if OK, 0 if KO @@ -126,9 +127,9 @@ class mod_task_universal extends ModeleNumRefTask } - /** + /** * Return next reference not yet used as a reference - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Next not used reference diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index f216d69a0fd..4b662e19564 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -311,7 +311,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales // Make substitution $substitutionarray=array( - '__FROM_NAME__' => $this->emetteur->nom, + '__FROM_NAME__' => $this->emetteur->name, '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, @@ -518,7 +518,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales } $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - + if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 1b042f3a0d6..1cafa394e66 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -730,7 +730,7 @@ class pdf_azur extends ModelePDFPropales if (! empty($conf->global->FACTURE_CHQ_NUMBER)) { $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE); - + if ($conf->global->FACTURE_CHQ_NUMBER > 0) { $account = new Account($this->db); @@ -1328,12 +1328,12 @@ class pdf_azur extends ModelePDFPropales { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->client->nom; + else $socname = $object->client->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); + $carac_client_name=$outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target'); diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 88b6e65bf01..c24070c2e23 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -30,12 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codeclient_elephant - * \brief Class to manage third party code with elephant rule + * Class to manage third party code with elephant rule */ class mod_codeclient_elephant extends ModeleThirdPartyCode { var $nom='Elephant'; // Nom du modele + var $name='Elephant'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 27155847bf0..94c9c04d2e2 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -39,6 +39,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode */ var $nom='Leopard'; // Nom du modele + var $name='Leopard'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 4c735930820..88ec1a6e8db 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -28,12 +28,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codeclient_monkey - * \brief Classe permettant la gestion monkey des codes tiers + * Classe permettant la gestion monkey des codes tiers */ class mod_codeclient_monkey extends ModeleThirdPartyCode { var $nom='Monkey'; // Nom du modele + var $name='Monkey'; // Nom du modele var $code_modifiable; // Code modifiable var $code_modifiable_invalide; // Code modifiable si il est invalide var $code_modifiable_null; // Code modifiables si il est null @@ -52,6 +52,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode function __construct() { $this->nom = "Monkey"; + $this->name = "Monkey"; $this->version = "dolibarr"; $this->code_null = 1; $this->code_modifiable = 1; diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 57d8f0c20a6..1efc062ab2c 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -32,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' class mod_codecompta_aquarium extends ModeleAccountancyCode { var $nom='Aquarium'; - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $name='Aquarium'; + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $prefixcustomeraccountancycode; var $prefixsupplieraccountancycode; @@ -73,7 +74,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $texte.= ''; $s1= $form->textwithpicto('',$tooltip,1,1); $s2= $form->textwithpicto('',$tooltip,1,1); - $texte.= ''; $texte.= ''; $texte.= '
'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."
\n"; + $texte.= '
'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."
\n"; $texte.= '		 
'; @@ -109,7 +110,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $i = 0; $this->db = $db; - dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->nom)?$societe->nom:'')); + dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:'')); // Regle gestion compte compta $codetouse=''; diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php index b2240f7a9fc..15099eb0538 100644 --- a/htdocs/core/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -26,13 +26,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codecompta_panicum - * \brief Class to manage accountancy code of thirdparties with Panicum rules + * Class to manage accountancy code of thirdparties with Panicum rules */ class mod_codecompta_panicum extends ModeleAccountancyCode { var $nom='Panicum'; - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $name='Panicum'; + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' /** @@ -51,7 +51,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode */ function info($langs) { - return $langs->trans("ModuleCompanyCode".$this->nom); + return $langs->trans("ModuleCompanyCode".$this->name); } /** diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 9a117ac8435..f1fc05d29db 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -184,7 +184,7 @@ abstract class ModeleThirdPartyCode $langs->load("admin"); $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->nom.'
'; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 54ae66186df..5865d431132 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -1015,12 +1015,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $mysoc->nom; + else $socname = $mysoc->name; $carac_client_name=$outputlangs->convToOutputCharset($socname); } else { - $carac_client_name=$outputlangs->convToOutputCharset($mysoc->nom); + $carac_client_name=$outputlangs->convToOutputCharset($mysoc->name); } $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target'); diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 0770af54520..1b094790195 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -140,24 +140,24 @@ class InterfaceLogevents extends DolibarrTriggers dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("NewGroupCreated",$object->nom); - $desc=$langs->transnoentities("NewGroupCreated",$object->nom); + $text=$langs->transnoentities("NewGroupCreated",$object->name); + $desc=$langs->transnoentities("NewGroupCreated",$object->name); } elseif ($action == 'GROUP_MODIFY') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("GroupModified",$object->nom); - $desc=$langs->transnoentities("GroupModified",$object->nom); + $text=$langs->transnoentities("GroupModified",$object->name); + $desc=$langs->transnoentities("GroupModified",$object->name); } elseif ($action == 'GROUP_DELETE') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("users"); // Initialisation donnees (date,duree,texte,desc) - $text=$langs->transnoentities("GroupDeleted",$object->nom); - $desc=$langs->transnoentities("GroupDeleted",$object->nom); + $text=$langs->transnoentities("GroupDeleted",$object->name); + $desc=$langs->transnoentities("GroupDeleted",$object->name); } // If not found diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 4d2888d8aff..43ea3357a7d 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -79,8 +79,8 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("other"); $object->actiontypecode='AC_OTH_AUTO'; - if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); - $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->nom); + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name); + $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name); if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")"; $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index f219e352c64..d1fda6b793a 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -104,8 +104,6 @@ print_fiche_titre($langs->trans("ECMAutoOrg")); //$head = societe_prepare_head($societe); -//dol_fiche_head($head, 'document', $societe->nom); - /* * Confirmation de la suppression d'une ligne produit @@ -113,7 +111,7 @@ print_fiche_titre($langs->trans("ECMAutoOrg")); if ($_GET['action'] == 'delete_file') { print $form->formconfirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile'); - + } // Construit liste des fichiers diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 188127f0304..e3cb8305562 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -44,8 +44,6 @@ llxHeader('',$langs->trans("Shipment"),$helpurl); print_fiche_titre($langs->trans("SendingsArea")); -//print ''; -//print '
'; print '
'; @@ -64,7 +62,7 @@ print "

\n"; $clause = " WHERE "; $sql = "SELECT e.rowid, e.ref"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", c.ref as commande_ref, c.rowid as commande_id"; $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'"; @@ -101,7 +99,7 @@ if ($resql) print $shipment->getNomUrl(1); print ""; print ''; - print ''.$obj->nom.''; + print ''.$obj->name.''; print ''; print ''; if ($obj->commande_id) print ''.$obj->commande_ref.''; @@ -116,7 +114,7 @@ if ($resql) /* * Commandes a traiter */ -$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -151,7 +149,7 @@ if ($resql) print $orderstatic->getNomUrl(1); print ''; print ''; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->id=$obj->socid; print $companystatic->getNomUrl(1,'customer',32); print ''; @@ -169,7 +167,7 @@ print '
'; /* * Commandes en traitement */ -$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -202,7 +200,7 @@ if ( $resql ) print $orderstatic->getNomUrl(1); print ''; print ''; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->id=$obj->socid; print $companystatic->getNomUrl(1,'customer'); print ''; @@ -224,7 +222,7 @@ else dol_print_error($db); * Last shipments */ $sql = "SELECT e.rowid, e.ref"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= ", c.ref as commande_ref, c.rowid as commande_id"; $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')"; @@ -255,7 +253,7 @@ if ($resql) $obj = $db->fetch_object($resql); print ''.img_object($langs->trans("ShowSending"),"sending").' '; print $obj->ref.''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''; if ($obj->commande_id) { @@ -274,7 +272,6 @@ if ($resql) else dol_print_error($db); -//print ''; print '
'; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 4e1adf7221e..4cd62249545 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -125,7 +125,7 @@ if ($resql) } print_liste_field_titre($langs->trans("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); print "\n"; - + // Lignes des champs de filtre print ''; print ''; @@ -151,9 +151,9 @@ if ($resql) print ''; print ''.$langs->trans("All").' / '.$langs->trans("None").''; print ''; - + print "\n"; - + $var=True; while ($i < min($num,$limit)) @@ -171,7 +171,7 @@ if ($resql) print ''; $companystatic->id=$objp->socid; $companystatic->ref=$objp->socname; - $companystatic->nom=$objp->socname; + $companystatic->name=$objp->socname; print $companystatic->getNomUrl(1); print ''; // Date delivery planed diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 70d2745ab4c..4edd52809df 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref)) // Client print "".$langs->trans("Customer").""; print ''; - print ''.$soc->nom.''; + print ''.$soc->name.''; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 4dfb8489c9c..b3858c5f4aa 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -71,7 +71,7 @@ llxHeader('', $langs->trans("Intervention")); $sql = "SELECT"; $sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,"; $sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,"; -$sql.= " s.nom, s.rowid as socid, s.client"; +$sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s"; if (! $user->rights->societe->client->voir && empty($socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -160,7 +160,7 @@ if ($result) print $interventionstatic->getNomUrl(1); print "\n"; print ''; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->id=$objp->socid; $companystatic->client=$objp->client; print $companystatic->getNomUrl(1,'',44); diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php index fc891af53a3..a6695dc694d 100644 --- a/htdocs/fourn/ajax/getSupplierPrices.php +++ b/htdocs/fourn/ajax/getSupplierPrices.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ /** @@ -49,7 +48,7 @@ if (! empty($idprod)) $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn,"; $sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,"; - $sql.= " s.nom"; + $sql.= " s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc"; @@ -75,7 +74,7 @@ if (! empty($idprod)) $price = $objp->fprice * (1 - $objp->remise_percent / 100); $unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100); - $title = $objp->nom.' - '.$objp->ref_fourn.' - '; + $title = $objp->name.' - '.$objp->ref_fourn.' - '; if ($objp->quantity == 1) { diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 71942a27f97..35620bf91fb 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -184,7 +184,7 @@ class Fournisseur extends Societe $arr = array(); - $sql = "SELECT s.rowid, s.nom"; + $sql = "SELECT s.rowid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -196,16 +196,14 @@ class Fournisseur extends Societe if ($resql) { while ($obj=$this->db->fetch_object($resql)) - { - $arr[$obj->rowid] = stripslashes($obj->nom); - } - + { + $arr[$obj->rowid] = $obj->name; + } } else { dol_print_error($this->db); - $this->error=$this->db->error(); - + $this->error=$this->db->lasterror(); } return $arr; } diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index fd430ba4508..0f04ee91eaa 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -204,7 +204,7 @@ else if (! empty($conf->fournisseur->enabled)) { - $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -233,7 +233,7 @@ if (! empty($conf->fournisseur->enabled)) print ""; print ''; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; $i++; } } @@ -300,7 +300,7 @@ print ''; */ $max=5; -$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -353,7 +353,7 @@ if ($resql) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; print ''.dol_print_date($db->jdate($obj->tms),'day').''; print ''.$commandestatic->LibStatut($obj->fk_statut,5).''; print ''; @@ -369,7 +369,7 @@ else dol_print_error($db); * Orders to process */ /* - $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid"; $sql.=" FROM ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -421,7 +421,7 @@ print ''; print ''; -print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; +print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 37f2384b4b1..a2aa48351b0 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -66,7 +66,7 @@ if ($socid > 0) { $fourn = new Fournisseur($db); $fourn->fetch($socid); - $title .= ' ('.$fourn->nom.')'; + $title .= ' ('.$fourn->name.')'; } llxHeader('',$title); @@ -85,7 +85,7 @@ $offset = $conf->liste_limit * $page ; * Mode Liste */ -$sql = "SELECT s.rowid as socid, s.nom, cf.date_commande as dc,"; +$sql = "SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,"; $sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,"; $sql.= " u.login"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,"; @@ -216,7 +216,7 @@ if ($resql) // Company print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print $obj->nom.''."\n"; + print $obj->name.''."\n"; // Author $userstatic->id=$obj->fk_user_author; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 4b2c61c02a5..a80cb00f2d3 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -88,7 +88,7 @@ if (! $sortorder) $sortorder="ASC"; if ($user->rights->fournisseur->facture->lire) { - $sql = "SELECT s.rowid as socid, s.nom,"; + $sql = "SELECT s.rowid as socid, s.nom as name,"; $sql.= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,"; $sql.= " f.datef as df, f.date_lim_reglement as datelimite, "; $sql.= " f.paye as paye, f.rowid as facid, f.fk_statut"; @@ -144,7 +144,7 @@ if ($user->rights->fournisseur->facture->lire) $sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'"; } - $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom"; + $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.=$db->order($sortfield,$sortorder); if (! in_array("f.ref_supplier",explode(',',$sortfield))) $sql.= ", f.ref_supplier DESC"; @@ -173,7 +173,7 @@ if ($user->rights->fournisseur->facture->lire) if (! empty($late)) $param.='&late='.urlencode($late); $urlsource=str_replace('&','&',$param); - $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->nom):$langs->trans("BillsSuppliersUnpaid")); + $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->name):$langs->trans("BillsSuppliersUnpaid")); if ($option == 'late') $titre.=' ('.$langs->trans("Late").')'; else $titre.=' ('.$langs->trans("All").')'; @@ -250,7 +250,7 @@ if ($user->rights->fournisseur->facture->lire) print ''; $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; print $companystatic->getNomUrl(1,'supplier',32); print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 673ac3fea6f..e490c727a30 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -106,7 +106,7 @@ $formfile = new FormFile($db); llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores'); -$sql = "SELECT s.rowid as socid, s.nom, "; +$sql = "SELECT s.rowid as socid, s.nom as name, "; $sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,"; $sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -202,7 +202,7 @@ if ($resql) if (GETPOST("search_montant_ttc")) $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc")); if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre")); - print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print '
'; print ''; print ''; @@ -279,7 +279,7 @@ if ($resql) print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 302570330b7..831749b1904 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -249,7 +249,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $datefacture=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture); - $sql = 'SELECT s.nom, s.rowid as socid,'; + $sql = 'SELECT s.nom as name, s.rowid as socid,'; $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total'; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f'; @@ -274,14 +274,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; print ''; - print ''; + print ''; print '
'.dol_trunc($obj->libelle,36).''; $supplierstatic->id=$obj->socid; - $supplierstatic->nom=$obj->nom; + $supplierstatic->name=$obj->name; print $supplierstatic->getNomUrl(1,'',12); print ''.price($obj->total_ht).''.price($obj->total_ttc).'
'; print ''; print ''; print '\n"; print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index f0f825d3ff7..9da28281779 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -106,8 +106,8 @@ if (! empty($conf->fournisseur->enabled)) { $langs->load("orders"); - $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc"; - $sql.= ", s.nom, s.rowid as socid"; + $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc,"; + $sql.= " s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; @@ -141,7 +141,7 @@ if (! empty($conf->fournisseur->enabled)) print ''; print ''; @@ -164,7 +164,7 @@ if (! empty($conf->fournisseur->enabled)) if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire) { $sql = "SELECT ff.ref_supplier, ff.rowid, ff.total_ttc, ff.type"; - $sql.= ", s.nom, s.rowid as socid"; + $sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; @@ -199,7 +199,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''; print ''; @@ -233,7 +233,7 @@ print '
'; * List last modified supliers */ $max=10; -$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; +$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; $sql.= ", st.libelle as stcomm"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; @@ -267,7 +267,7 @@ if ($resql) print "
"; print '\n"; + print " socid."\">".$obj->name."\n"; print ''; print ''; print "\n"; diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index e3c7effebbf..d3f7e55c199 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -79,7 +79,7 @@ $thirdpartystatic=new Societe($db); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$langs->trans("ThirdParty"),$help_url); -$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; +$sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; $sql.= "code_fournisseur, code_compta_fournisseur"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -199,7 +199,7 @@ if ($resql) $var=!$var; $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->name=$obj->name; $thirdpartystatic->status=$obj->status; print ""; diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 684985ed261..824919400a2 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -234,7 +234,7 @@ if ($result > 0) * Liste des factures */ $allow_delete = 1 ; - $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid'; + $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s'; $sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid'; $sql .= ' AND pf.fk_paiementfourn = '.$object->id; @@ -274,7 +274,7 @@ if ($result > 0) // Ref supplier print '\n"; // Third party - print ''; + print ''; // Expected to pay print ''; // Status diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 89c3928f134..a7ab0d0576f 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -88,7 +88,7 @@ if ($fourn_id) $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,"; $sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,"; -$sql.= " s.rowid as socid, s.nom"; +$sql.= " s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product"; @@ -108,7 +108,7 @@ if ($sref) } if ($snom) { - $sql .= natural_search('p.label', $snom); + $sql .= natural_search('s.nom', $snom); } if($catid) { @@ -136,7 +136,7 @@ if ($resql) exit; } - if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->nom); + if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->name); else $texte = $langs->trans("List"); llxHeader("","",$texte); @@ -212,7 +212,7 @@ if ($resql) print ''."\n"; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->id=$objp->socid; print '"; if ($agentid > 0) { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print "\n"; } diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index c0f7e41b97e..fbc947a7cc9 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -161,7 +161,7 @@ print "
'.$langs->trans('Payment').'
'.$langs->trans('Company').''; $supplierstatic->id=$obj->socid; - $supplierstatic->name=$obj->nom; + $supplierstatic->name=$obj->name; print $supplierstatic->getNomUrl(1,'supplier'); print '
'.$langs->trans('Date').''; @@ -460,7 +460,7 @@ if (empty($action)) $search_company=GETPOST('search_company'); $sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,'; - $sql.= ' s.rowid as socid, s.nom,'; + $sql.= ' s.rowid as socid, s.nom as name,'; $sql.= ' c.libelle as paiement_type,'; $sql.= ' ba.rowid as bid, ba.label,'; if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,'; @@ -565,7 +565,7 @@ if (empty($action)) print ''.dol_print_date($db->jdate($objp->dp),'day')."'; - if ($objp->socid) print ''.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->nom,32).''; + if ($objp->socid) print ''.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).''; else print ' '; print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=0; print $companystatic->getNomUrl(1,'',16); print ''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=0; print $companystatic->getNomUrl(1,'',16); print '
'.img_object($langs->trans("ShowSupplier"),"company").''; - print " socid."\">".$obj->nom."'.$obj->code_fournisseur.' '.dol_print_date($db->jdate($obj->tms),'day').'
'.$objp->ref_supplier."'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.img_object($langs->trans('ShowCompany'),'company').' '.$objp->name.''.price($objp->total_ttc).''.$objp->label.''; if ($companystatic->id > 0) print $companystatic->getNomUrl(1,'supplier'); diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 119a4980a78..5ff23b45ec0 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -780,7 +780,7 @@ class Holiday extends CommonObject $groupe = $objet->value; // On liste les groupes de Dolibarr - $sql = "SELECT u.rowid, u.nom"; + $sql = "SELECT u.rowid, u.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u"; $sql.= " ORDER BY u.rowid"; @@ -798,9 +798,9 @@ class Holiday extends CommonObject while ($obj = $this->db->fetch_object($result)) { if($groupe==$obj->rowid) { - $selectGroup.= ''."\n"; + $selectGroup.= ''."\n"; } else { - $selectGroup.= ''."\n"; + $selectGroup.= ''."\n"; } } $selectGroup.= ''."\n"; @@ -820,7 +820,7 @@ class Holiday extends CommonObject /** * Met à jour une option du module Holiday Payés * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @param string $value vrai si mise à jour OK sinon faux * @return boolean ok or ko */ @@ -842,7 +842,7 @@ class Holiday extends CommonObject /** * Retourne la valeur d'un paramètre de configuration * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @return string retourne la valeur du paramètre */ function getConfCP($name) @@ -955,7 +955,7 @@ class Holiday extends CommonObject /** * Retourne un checked si vrai * - * @param string $name nom du paramètre de configuration + * @param string $name name du paramètre de configuration * @return string retourne checked si > 0 */ function getCheckOption($name) { diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 7f9c4130284..772ab34c291 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -268,7 +268,7 @@ if ($action == 'create') } print ''; print ''; - print ''; + print ''; print '
'.$langs->trans("Customer").''.$soc->nom.''.$soc->name.''; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index df43f39ff2e..3dd0fcd0b49 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -106,7 +106,7 @@ print "
"; print ''; $sql = "SELECT"; -if ($agentid > 0) $sql.= " s.rowid as socid, s.nom, s.code_client, s.client,"; +if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,"; $sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; @@ -201,7 +201,7 @@ if ($result) print "
".$companystatic->getNomUrl(1,'customer')."
"; print ''; $sql = "SELECT"; -$sql.= " s.rowid as socid, s.nom, s.code_client, s.client,"; +$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; if ($client) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; @@ -258,7 +258,7 @@ if ($result) } else { $companystatic->id=$objp->socid; - $companystatic->nom=$objp->nom; + $companystatic->name=$objp->name; $companystatic->client=$objp->client; print "".$companystatic->getNomUrl(1,'customer')."\n"; } diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 0e6734c0916..46cf4245b60 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->facture->lire) { - $sql = "SELECT s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut,"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,"; @@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref)) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->datef),'day').""; diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index c1ceb4faa8e..bcc1146c714 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -392,7 +392,7 @@ class Opensurveysondage extends CommonObject function fetch_lines() { $ret=array(); - $sql = "SELECT id_users, nom, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; + $sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'"; $resql=$this->db->query($sql); @@ -403,7 +403,7 @@ class Opensurveysondage extends CommonObject while ($i < $num) { $obj=$this->db->fetch_object($resql); - $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->nom, 'reponses'=>$obj->reponses); + $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses); $ret[]=$tmp; $i++; diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php index fec8174a7ef..7096ae7ad99 100644 --- a/htdocs/opensurvey/exportcsv.php +++ b/htdocs/opensurvey/exportcsv.php @@ -82,7 +82,7 @@ if (strpos($object->sujet,'@') !== false) } -$sql ='SELECT nom, reponses'; +$sql ='SELECT nom as name, reponses'; $sql.=' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage='" . $db->escape($numsondage) . "'"; $sql.=" ORDER BY id_users"; @@ -95,8 +95,8 @@ if ($resql) { $obj=$db->fetch_object($resql); - // Le nom de l'utilisateur - $nombase=str_replace("°","'",$obj->nom); + // Le name de l'utilisateur + $nombase=str_replace("°","'",$obj->name); $input.=$nombase.';'; //affichage des resultats diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php index 9b9f2e9ef8c..1b39391b67c 100644 --- a/htdocs/opensurvey/public/studs.php +++ b/htdocs/opensurvey/public/studs.php @@ -113,7 +113,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $nom=substr(GETPOST("nom"),0,64); // Check if vote already exists - $sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users"; + $sql = 'SELECT id_users, nom as name'; + $sql.= ' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs'; + $sql.= ' WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users"; $resql = $db->query($sql); $num_rows = $db->num_rows($resql); if ($num_rows > 0) @@ -389,7 +391,7 @@ else $sumfor = array(); $sumagainst = array(); $compteur = 0; -$sql ="SELECT id_users, nom, id_sondage, reponses"; +$sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; $resql=$db->query($sql); @@ -406,7 +408,7 @@ while ($compteur < $num) $ensemblereponses = $obj->reponses; // ligne d'un usager pré-authentifié - $mod_ok = (in_array($obj->nom, $listofvoters)); + $mod_ok = (in_array($obj->name, $listofvoters)); if (!$mod_ok && !$object->allow_spy) { $compteur++; @@ -416,7 +418,7 @@ while ($compteur < $num) print ''."\n"; // Name - print ''.dol_htmlentities($obj->nom).''."\n"; + print ''.dol_htmlentities($obj->name).''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 3bfd3209343..226bc0c0465 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -83,7 +83,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $nom=substr(GETPOST("nom"),0,64); // Check if vote already exists - $sql = 'SELECT id_users, nom'; + $sql = 'SELECT id_users, nom as name'; $sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs'; $sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."'"; $sql.= ' ORDER BY id_users'; @@ -283,7 +283,7 @@ for ($i = 0; $i < $nblignes; $i++) // Loop on each answer $compteur = 0; - $sql ="SELECT id_users, nom, id_sondage, reponses"; + $sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; $resql=$db->query($sql); @@ -341,7 +341,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) // Clean current answer to remove deleted columns $compteur = 0; - $sql ="SELECT id_users, nom, id_sondage, reponses"; + $sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; dol_syslog('sql='.$sql); @@ -756,7 +756,7 @@ else $sumfor = array(); $sumagainst = array(); $compteur = 0; -$sql ="SELECT id_users, nom, id_sondage, reponses"; +$sql ="SELECT id_users, nom as name, id_sondage, reponses"; $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'"; dol_syslog('sql='.$sql); @@ -780,7 +780,7 @@ while ($compteur < $num) } // Name - print ''.dol_htmlentities($obj->nom).''."\n"; + print ''.dol_htmlentities($obj->name).''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 09bacc3764f..78c500c7551 100644 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -281,7 +281,7 @@ function html_print_paybox_footer($fromcompany,$langs) print '

'."\n"; print '
'."\n"; - print $fromcompany->nom.'
'; + print $fromcompany->name.'
'; print $line1.'
'; print $line2; print '
'."\n"; diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index cc678fce011..c1440d80245 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -154,7 +154,7 @@ function html_print_paypal_footer($fromcompany,$langs) print '

'."\n"; print '
'."\n"; - print $fromcompany->nom.'
'; + print $fromcompany->name.'
'; print $line1.'
'; print $line2; print '
'."\n"; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index e79ffcf13c6..7ecc390516d 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -48,7 +48,7 @@ $select_pricing_rules=array( 'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level 'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer') // Different price for each customer ); -if ($conf->global->MAIN_FEATURES_LEVEL==2) +if ($conf->global->MAIN_FEATURES_LEVEL==2) { $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity'); $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity'); @@ -125,7 +125,7 @@ if ($action == 'pricingrule') else { $multirule=explode('&',$princingrules); - foreach($multirule as $rulesselected) + foreach($multirule as $rulesselected) { $res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity); } @@ -137,8 +137,8 @@ if ($action == 'pricingrule') $res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity); } } - - } + + } } else if ($action == 'sousproduits') { @@ -262,7 +262,7 @@ foreach ($dirproduct as $dirroot) $var = !$var; print ''."\n"; - print ''.$modCodeProduct->nom.''."\n"; + print ''.$modCodeProduct->name.''."\n"; print ''.$modCodeProduct->info($langs).''."\n"; print ''.$modCodeProduct->getExample($langs).''."\n"; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index bf96d63459e..472b9ce4a45 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -118,7 +118,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,"; $sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowOrder"),"order").' '; print $objp->ref; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->date_commande)).""; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 93c880695d3..73de0374ebe 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -110,7 +110,7 @@ if ($id > 0 || ! empty($ref)) print ""; print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " c.rowid, c.total_ht as total_ht, c.ref,"; $sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref)) print ""; print ''.$commandestatic->getNomUrl(1)."\n"; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ''.dol_print_date($db->jdate($objp->date_commande)).""; print "".$objp->qty."\n"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 6c73d0183fa..189ead2eaa2 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -124,7 +124,7 @@ if ($id > 0 || ! empty($ref)) $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as rowid, c.date_contrat, c.statut as statut,"; - $sql.= " s.nom, s.rowid as socid, s.code_client"; + $sql.= " s.nom as name, s.rowid as socid, s.code_client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; @@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowContract"),"contract").' '; print $objp->rowid; print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->date_contrat)).""; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1959d53035e..39768262f10 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->facture->lire) { - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.facnumber, f.total as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; @@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref)) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ''; print dol_print_date($db->jdate($objp->datef),'day').""; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 1b07ce3d1ba..d8e30bdae6a 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,"; + $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -172,7 +172,7 @@ if ($id > 0 || ! empty($ref)) $supplierinvoicestatic->ref=$objp->facnumber; print $supplierinvoicestatic->getNomUrl(1); print "\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; print ""; print dol_print_date($db->jdate($objp->datef)).""; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 3368efa2b56..566961d9c5f 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $sql = "SELECT DISTINCT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,"; + $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,"; $sql.= "p.datep, p.fk_statut as statut, d.qty"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -161,7 +161,7 @@ if ($id > 0 || ! empty($ref)) print ''.img_object($langs->trans("ShowPropal"),"propal").' '; print $objp->ref; print ''."\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print ''; print dol_print_date($db->jdate($objp->datep)).""; print "".$objp->qty."\n"; diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 07aa68a7a98..71fe1407a2d 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -77,7 +77,7 @@ if (!$sortfield) $sortfield = 'cf.date_creation'; $offset = $conf->liste_limit * $page ; -$sql = 'SELECT s.rowid as socid, s.nom, cf.date_creation as dc,'; +$sql = 'SELECT s.rowid as socid, s.nom as name, cf.date_creation as dc,'; $sql.= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,'; $sql.= ' u.login'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf'; @@ -273,7 +273,7 @@ if ($resql) print ''. ''. img_object($langs->trans('ShowCompany'), 'company'). ' '. - $obj->nom . ''; + $obj->name . ''; // Author $userstatic->id = $obj->fk_user_author; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index bf9951129ad..915d4ef69ef 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -349,7 +349,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var=!$var; - print ''.$module->nom."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; @@ -450,7 +450,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var=!$var; - print ''.$module->nom."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 7e324841af2..d9fb4b4dce9 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -103,7 +103,7 @@ print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right" print "\n"; $sql = "SELECT count(p.rowid) as nb"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -127,7 +127,7 @@ if ( $resql ) if ($obj->socid) { $socstatic->id=$obj->socid; - $socstatic->nom=$obj->nom; + $socstatic->name=$obj->name; print $socstatic->getNomUrl(1); } else diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 2a427558eb4..b4260e8ea91 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -39,7 +39,7 @@ if ($socid > 0) { $soc = new Societe($db); $soc->fetch($socid); - $title .= ' ('.$soc->nom.')'; + $title .= ' ('.$soc->name.')'; } if (!$user->rights->projet->lire) accessforbidden(); @@ -78,7 +78,7 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$min $sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat"; $sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end"; -$sql.= ", s.nom, s.rowid as socid"; +$sql.= ", s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; @@ -181,7 +181,7 @@ if ($resql) if ($objp->socid) { $socstatic->id=$objp->socid; - $socstatic->nom=$objp->nom; + $socstatic->name=$objp->name; print $socstatic->getNomUrl(1); } else diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index b1680d2803e..f17a9d9f298 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -84,7 +84,7 @@ if ($action == 'updateoptions') setEventMessage($langs->trans("Error"), 'errors'); } } - + if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT')) { $contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha'); @@ -344,7 +344,7 @@ foreach ($dirsociete as $dirroot) $var = !$var; print ''."\n"; - print ''.$modCodeTiers->nom.''."\n"; + print ''.$modCodeTiers->name.''."\n"; print ''.$modCodeTiers->info($langs).''."\n"; print ''.$modCodeTiers->getExample($langs).''."\n"; @@ -420,7 +420,7 @@ foreach ($dirsociete as $dirroot) $var = !$var; print ''; - print ''.$modCodeCompta->nom."\n"; + print ''.$modCodeCompta->name."\n"; print $modCodeCompta->info($langs); print ''; print ''.$modCodeCompta->getExample($langs)."\n"; @@ -569,7 +569,7 @@ foreach ($dirsociete as $dirroot) } $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1); - + print ''; print $form->textwithpicto('',$htmltooltip,1,0); print ''; @@ -632,19 +632,19 @@ while ($i < $nbofloop) if ($profid[$i][1]!='-') { $var = !$var; - + print ''; print ''.$profid[$i][0]."\n"; print $profid[$i][1]; print ''; - + $idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE'; $idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY'; $idprof_invoice_mandatory ='SOCIETE_IDPROF'.($i+1).'_INVOICE_MANDATORY'; $verif=(empty($conf->global->$idprof_unique)?false:true); $mandatory=(empty($conf->global->$idprof_mandatory)?false:true); $invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true); - + if ($verif) { print ''; @@ -657,7 +657,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + if ($mandatory) { print ''; @@ -670,7 +670,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + if ($invoice_mandatory) { print ''; @@ -683,7 +683,7 @@ while ($i < $nbofloop) print img_picto($langs->trans("Disabled"),'switch_off'); print ''; } - + print "\n"; } $i++; diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 63f5214b319..b94262bbb52 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -305,7 +305,7 @@ abstract class ActionsCardCommon if ($result >= 0) { - header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->nom.""); + header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->name.""); exit; } else diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index ec16128fb8a..f08a4a2455c 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -112,7 +112,7 @@ class Address if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { - $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->nom); + $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name); } $this->db->rollback(); @@ -176,7 +176,7 @@ class Address $this->fax = preg_replace("/\./","",$this->fax); $this->note = trim($this->note); - $result = $this->verify(); // Verifie que nom et label obligatoire + $result = $this->verify(); // Verifie que name et label obligatoire if ($result >= 0) { @@ -236,7 +236,7 @@ class Address { global $langs, $conf; - $sql = 'SELECT rowid, nom, client, fournisseur'; + $sql = 'SELECT rowid, nom as name, client, fournisseur'; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe'; $sql .= ' WHERE rowid = '.$socid; @@ -247,7 +247,7 @@ class Address { $obj = $this->db->fetch_object($resqlsoc); - $this->socname = $obj->nom; + $this->socname = $obj->name; $this->socid = $obj->rowid; $this->id = $obj->rowid; $this->client = $obj->client; @@ -440,7 +440,7 @@ class Address */ function info($id) { - $sql = "SELECT s.rowid, s.nom, datec as date_creation, tms as date_modification,"; + $sql = "SELECT s.rowid, s.nom as name, datec as date_creation, tms as date_modification,"; $sql.= " fk_user_creat, fk_user_modif"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.rowid = ".$id; @@ -465,7 +465,7 @@ class Address $muser->fetch($obj->fk_user_modif); $this->user_modification = $muser; } - $this->ref = $obj->nom; + $this->ref = $obj->name; $this->date_creation = $this->db->jdate($obj->date_creation); $this->date_modification = $this->db->jdate($obj->date_modification); } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index e446d5a9e76..6d80189c7be 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -624,7 +624,7 @@ class Societe extends CommonObject // Clean parameters $this->id = $id; $this->name = $this->name?trim($this->name):trim($this->nom); - $this->nom = trim($this->nom); // TODO obsolete + $this->nom = $this->name; // For backward compatibility $this->ref_ext = trim($this->ref_ext); $this->address = $this->address?trim($this->address):trim($this->address); $this->zip = $this->zip?trim($this->zip):trim($this->zip); diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 1832e7851ea..a1042087faf 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -51,13 +51,12 @@ $pagenext = $page + 1; /* - * Mode Liste - * + * View */ llxHeader(); -$sql = "SELECT s.nom, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid"; +$sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,"; $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; $sql.= " ".MAIN_DB_PREFIX."notify_def as n,"; @@ -94,7 +93,7 @@ if ($result) $var=!$var; print ""; - print "socid."\">".$obj->nom."\n"; + print "socid."\">".$obj->name."\n"; print "".dolGetFirstLastname($obj->firstname, $obj->lastname)."\n"; print "".$obj->titre."\n"; print "\n"; diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 3b6be065879..e096f8fc470 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2012 Florian Henry * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2014 Alexis Algoud - * + * * 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 * the Free Software Foundation; either version 3 of the License, or @@ -41,6 +41,7 @@ class UserGroup extends CommonObject var $id; // Group id var $entity; // Entity of group var $nom; // Name of group + var $name; // Name of group // deprecated var $globalgroup; // Global group var $note; // Note on group var $datec; // Creation date of group @@ -69,7 +70,7 @@ class UserGroup extends CommonObject * Charge un objet group avec toutes ces caracteristiques (excpet ->members array) * * @param int $id id du groupe a charger - * @param string $groupname nom du groupe a charger + * @param string $groupname name du groupe a charger * @return int <0 if KO, >0 if OK */ function fetch($id='', $groupname='') @@ -99,7 +100,7 @@ class UserGroup extends CommonObject $this->ref = $obj->rowid; $this->entity = $obj->entity; $this->name = $obj->name; - $this->nom = $obj->name; //Deprecated + $this->nom = $obj->name; // Deprecated $this->note = $obj->note; $this->datec = $obj->datec; $this->datem = $obj->datem; @@ -113,8 +114,8 @@ class UserGroup extends CommonObject $extrafields=new ExtraFields($this->db); $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); $this->fetch_optionals($this->id,$extralabels); - - + + // Sav current LDAP Current DN //$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0); } @@ -626,8 +627,8 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; $this->db->rollback(); return -1; } // End call triggers } - - + + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('groupdao')); $parameters=array(); @@ -644,10 +645,10 @@ class UserGroup extends CommonObject } } else if ($reshook < 0) $error++; - + if ($error > 0) { $error++; $this->db->rollback(); return -1; } else $this->db->commit(); - + return $this->id; } else @@ -679,7 +680,7 @@ class UserGroup extends CommonObject $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."usergroup SET "; - $sql.= " nom = '" . $this->db->escape($this->nom) . "'"; + $sql.= " nom = '" . $this->db->escape($this->name) . "'"; $sql.= ", entity = " . $this->db->escape($entity); $sql.= ", note = '" . $this->db->escape($this->note) . "'"; $sql.= " WHERE rowid = " . $this->id; @@ -695,7 +696,7 @@ class UserGroup extends CommonObject if ($result < 0) { $error++; } // End call triggers } - + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('groupdao')); $parameters=array(); @@ -712,7 +713,7 @@ class UserGroup extends CommonObject } } else if ($reshook < 0) $error++; - + if (! $error) { $this->db->commit(); @@ -767,8 +768,8 @@ class UserGroup extends CommonObject $info["objectclass"]=explode(',',$conf->global->LDAP_GROUP_OBJECT_CLASS); // Champs - if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom; - //if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->nom; + if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->name; + //if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name; if ($this->note && ! empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note; if (! empty($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)) { @@ -805,7 +806,7 @@ class UserGroup extends CommonObject $this->ref = 'SPECIMEN'; $this->specimen=1; - $this->nom='DOLIBARR GROUP SPECIMEN'; + $this->name='DOLIBARR GROUP SPECIMEN'; $this->note='This is a note'; $this->datec=time(); $this->datem=time(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 4bf4cb35ad9..a1930f7c027 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -95,12 +95,13 @@ if ($action == 'add') setEventMessage($langs->trans("NameNotDefined"), 'errors'); $action="create"; // Go back to create page } else { - $object->nom = trim($_POST["nom"]); + $object->nom = trim($_POST["nom"]); // For backward compatibility + $object->name = trim($_POST["nom"]); $object->note = trim($_POST["note"]); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); - + if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0; else $object->entity = $_POST["entity"]; @@ -120,7 +121,7 @@ if ($action == 'add') $db->rollback(); $langs->load("errors"); - setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->nom), 'errors'); + setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->name), 'errors'); $action="create"; // Go back to create page } } @@ -176,7 +177,8 @@ if ($action == 'update') $object->oldcopy=dol_clone($object); - $object->nom = trim($_POST["group"]); + $object->name = trim($_POST["group"]); + $object->nom = $this->name; // For backward compatibility $object->note = dol_htmlcleanlastbr($_POST["note"]); // Fill array 'array_options' with data from add form @@ -251,7 +253,7 @@ if ($action == 'create') $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); print "\n"; - + // Other attributes $parameters=array('object' => $object, 'colspan' => ' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -259,7 +261,7 @@ if ($action == 'create') { print $object->showOptionals($extrafields,'edit'); } - + print "\n"; print '

'; @@ -331,7 +333,7 @@ else print ''.$langs->trans("Note").''; print ''.dol_htmlentitiesbr($object->note).' '; print "\n"; - + // Other attributes $parameters=array('colspan' => ' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -339,7 +341,7 @@ else { print $object->showOptionals($extrafields); } - + print "\n"; print ''; @@ -531,7 +533,7 @@ else { print $object->showOptionals($extrafields,'edit'); } - + print "\n"; print '

'; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 547a89d3451..00af5b0e6d2 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -57,7 +57,7 @@ llxHeader(); print_fiche_titre($langs->trans("ListOfGroups")); -$sql = "SELECT g.rowid, g.nom, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; +$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid"; if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) @@ -101,7 +101,7 @@ if ($resql) $var=!$var; print ""; - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index c3e147620c2..eaee979e802 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -104,7 +104,7 @@ print ''; // Name print ''.$langs->trans("Name").''; -print ''.$fgroup->nom; +print ''.$fgroup->name; if (!$fgroup->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 5c52fa80a50..a910753c643 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -199,7 +199,7 @@ if ($id) // Nom print ''.$langs->trans("Name").''; - print ''.$fgroup->nom.''; + print ''.$fgroup->name.''; if (! $fgroup->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index c888dcdf632..c9b3693f1ac 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -200,7 +200,7 @@ if ($canreadperms) { $max=5; - $sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec"; + $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity))) { @@ -230,7 +230,7 @@ if ($canreadperms) $var=!$var; print ""; - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.''; if (! $obj->entity) { print img_picto($langs->trans("GlobalGroup"),'redstar'); diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 30b0c9b3a8e..ac1ebc9e1c5 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -73,7 +73,7 @@ $sql.= " u.tms as datem,"; $sql.= " u.datelastlogin,"; $sql.= " u.ldap_sid, u.statut, u.entity,"; $sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,"; -$sql.= " s.nom, s.canvas"; +$sql.= " s.nom as name, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid"; @@ -161,7 +161,7 @@ if ($result) if ($obj->fk_societe) { $companystatic->id=$obj->fk_societe; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index c6bed990c14..93406276ead 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -136,19 +136,20 @@ if ($result >= 0) { $group = new UserGroup($db); $group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]); - $group->nom = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME]; + $group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME]; + $group->nom = $group->name; // For backward compatibility $group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION]; $group->entity = $conf->entity; //print_r($ldapgroup); if($group->id > 0) { // Group update - print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom; + print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name; $res=$group->update(); if ($res > 0) { - print ' --> Updated group id='.$group->id.' name='.$group->nom; + print ' --> Updated group id='.$group->id.' name='.$group->name; } else { @@ -157,12 +158,12 @@ if ($result >= 0) } print "\n"; } else { // Group creation - print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom; + print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name; $res=$group->create(); if ($res > 0) { - print ' --> Created group id='.$group->id.' name='.$group->nom; + print ' --> Created group id='.$group->id.' name='.$group->name; } else { diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index f9db37ab79e..b43b9d230b3 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -530,7 +530,33 @@ class AdherentTest extends PHPUnit_Framework_TestCase print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0); - return $result; + return $localobject; } + + /** + * testAdherentTypeDelete + * + * @param Adherent $localobject Member instance + * @return void + * + * @depends testAdherentDelete + * The depends says test is run only if previous is ok + */ + public function testAdherentTypeDelete($localobject) + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $localobjectat=new AdherentType($this->savdb); + $result=$localobjectat->fetch($localobject->typeid); + $result=$localobjectat->delete(); + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($result, 0); + + return $localobject->id; + } } From 5601c979ab66333c9cfe8e67d53cb63795e6a718 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Oct 2014 17:29:04 +0200 Subject: [PATCH 03/10] New: Can search list of thirdparties from web service on part of name. --- ChangeLog | 1 + htdocs/webservices/server_thirdparty.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d93f5199c40..929981d4ae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ For developers: - New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card. - New: renamed table llx_c_pays to llx_c_country & libelle field to label. - New: Added hook "formConfirm" and "doActions" for fichinter card +- New: Can search list of thirdparties from web service on part of name. - Qual: Renamed table llx_c_civilite into llx_c_civility, field civilite into label in the same table, and field civilite into civility in other table. diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index 301511e0115..2d104eb96a1 100644 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -629,7 +629,7 @@ function updateThirdParty($authentication,$thirdparty) * getListOfThirdParties * * @param array $authentication Array of authentication information - * @param array $filterthirdparty Filter fields + * @param array $filterthirdparty Filter fields (key=>value to filer on. For example 'client'=>2, 'supplier'=>1, 'category'=>idcateg, 'name'=>'searchstring', ...) * @return array Array result */ function getListOfThirdParties($authentication,$filterthirdparty) @@ -661,9 +661,10 @@ function getListOfThirdParties($authentication,$filterthirdparty) $sql.=" WHERE entity=".$conf->entity; foreach($filterthirdparty as $key => $val) { - if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val); + if ($key == 'name' && $val != '') $sql.=" AND s.name LIKE '%".$db->escape($val)."%'"; + if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val); if ($key == 'supplier' && $val != '') $sql.=" AND s.fournisseur = ".$db->escape($val); - if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") "; + if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") "; } dol_syslog("Function: getListOfThirdParties", LOG_DEBUG); From 5c5f725a3414ab418882e270a3c3ca248f41e2c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 01:22:17 +0200 Subject: [PATCH 04/10] Fix scrutinizer --- htdocs/comm/action/peruser.php | 10 ++-- htdocs/core/class/mobiledetect.class.php | 46 +++++++++---------- htdocs/core/db/DoliDB.class.php | 14 ++++-- htdocs/core/db/mssql.class.php | 8 +++- htdocs/core/db/mysql.class.php | 2 +- htdocs/core/db/mysqli.class.php | 2 +- htdocs/core/db/pgsql.class.php | 6 +-- htdocs/core/db/sqlite.class.php | 4 +- htdocs/core/lib/functions.lib.php | 5 +- .../core/modules/syslog/mod_syslog_file.php | 2 +- .../modules/syslog/mod_syslog_firephp.php | 4 +- .../core/modules/syslog/mod_syslog_syslog.php | 7 +-- 12 files changed, 59 insertions(+), 51 deletions(-) diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index f20fe750d33..b4c0b4edbfa 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -893,7 +893,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $title1='';$title2=''; if (isset($cases1[$h]) && $cases1[$h] != '') { - $title1=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + //$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events")); $string1=' '; $style1='peruser_notbusy'; foreach($cases1[$h] as $id => $ev) @@ -903,7 +904,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & } if (isset($cases2[$h]) && $cases2[$h] != '') { - $title2=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + //$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); + if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events")); $string2=' '; $style2='peruser_notbusy'; foreach($cases2[$h] as $id => $ev) @@ -919,7 +921,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & { $ids=array_keys($cases1[$h]); $output = array_slice($cases1[$h], 0, 1); - if ($output[0]['string']) $title1.=' - '.$output[0]['string']; + if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string']; if ($output[0]['color']) $color1 = $output[0]['color']; } else if (count($cases1[$h]) > 1) $color1='222222'; @@ -928,7 +930,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & { $ids=array_keys($cases2[$h]); $output = array_slice($cases2[$h], 0, 1); - if ($output[0]['string']) $title2.=' - '.$output[0]['string']; + if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string']; if ($output[0]['color']) $color2 = $output[0]['color']; } else if (count($cases2[$h]) > 1) $color2='222222'; diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php index 107a13f47e3..c39111d04be 100644 --- a/htdocs/core/class/mobiledetect.class.php +++ b/htdocs/core/class/mobiledetect.class.php @@ -1073,39 +1073,37 @@ class MobileDetect /** * Check the version of the given property in the User-Agent. - * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) + * Will return a string or float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * - * @param string $propertyName The name of the property. See self::getProperties() array - * keys for all possible properties. - * @param string $type Either self::VERSION_TYPE_STRING to get a string value or - * self::VERSION_TYPE_FLOAT indicating a float value. This parameter - * is optional and defaults to self::VERSION_TYPE_STRING. Passing an - * invalid parameter will default to the this type as well. + * @param string $propertyName The name of the property. See self::getProperties() array keys for all possible properties (Ex: 'iPad', 'Android', ...). + * @param string $type Either self::VERSION_TYPE_STRING to get a string value or + * self::VERSION_TYPE_FLOAT indicating a float value. This parameter + * is optional and defaults to self::VERSION_TYPE_STRING. Passing an + * invalid parameter will default to this type as well. * - * @return string|float The version of the property we are trying to extract. + * @return string|float|boolean The version of the property we are trying to extract. */ public function version($propertyName, $type = self::VERSION_TYPE_STRING) { - if (empty($propertyName)) { - return false; - } + if (empty($propertyName)) return false; //set the $type to the default if we don't recognize the type - if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) { + if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) + { $type = self::VERSION_TYPE_STRING; } $properties = self::getProperties(); // Check if the property exists in the properties array. - if (array_key_exists($propertyName, $properties)) { - + if (array_key_exists($propertyName, $properties)) + { // Prepare the pattern to be matched. // Make sure we always deal with an array (string is converted). $properties[$propertyName] = (array) $properties[$propertyName]; - foreach ($properties[$propertyName] as $propertyMatchString) { - + foreach ($properties[$propertyName] as $propertyMatchString) + { $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString); // Escape the special character which is the delimiter. @@ -1114,14 +1112,13 @@ class MobileDetect // Identify and extract the version. preg_match('/'.$propertyPattern.'/is', $this->userAgent, $match); - if (!empty($match[1])) { + if (!empty($match[1])) + { $version = ( $type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1] ); return $version; } - } - } return false; @@ -1130,7 +1127,7 @@ class MobileDetect /** * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants. * - * @return string One of the self::MOBILE_GRADE_* constants. + * @return string One of the self::MOBILE_GRADE_* constants. */ public function mobileGrade() { @@ -1210,7 +1207,8 @@ class MobileDetect // @reference: http://my.opera.com/community/openweb/idopera/ $this->version('Opera', self::VERSION_TYPE_FLOAT)>=10 && !$isMobile - ){ + ) + { return self::MOBILE_GRADE_A; } @@ -1231,7 +1229,8 @@ class MobileDetect // @todo: report this (tested on Nokia N71) $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11 && $this->is('SymbianOS') - ){ + ) + { return self::MOBILE_GRADE_B; } @@ -1241,7 +1240,8 @@ class MobileDetect // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT)<=5.2 - ){ + ) + { return self::MOBILE_GRADE_C; } diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 59fee975e38..dc4b127ffaa 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -137,8 +137,12 @@ abstract class DoliDB implements Database { $this->transaction_opened=0; dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG); + return 1; + } + else + { + return 0; } - return $ret; } else { @@ -248,7 +252,7 @@ abstract class DoliDB implements Database /** * Return last error label * - * @return string lasterror + * @return string Last error */ function lasterror() { @@ -260,9 +264,9 @@ abstract class DoliDB implements Database * 19700101020000 -> 3600 with TZ+1 and gmt=0 * 19700101020000 -> 7200 whaterver is TZ if gmt=1 * - * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) - * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return date Date TMS + * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) + * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ + * @return timestamp|string Date TMS */ function jdate($string, $gm=false) { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 09885257ef6..c823fdafe49 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -255,8 +255,12 @@ class DoliDBMssql extends DoliDB { $this->transaction_opened=0; dol_syslog("COMMIT Transaction",LOG_DEBUG); + return 1; + } + else + { + return 0; } - return $ret; } else { @@ -672,7 +676,7 @@ class DoliDBMssql extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database,$table='') { diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index 5be76d6d5d7..a52283ef32e 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -585,7 +585,7 @@ class DoliDBMysql extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 31cad578ce8..4a2ded2d022 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -590,7 +590,7 @@ class DoliDBMysqli extends DoliDB * * @param string $database Name of database * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 25263deee46..81b80a9f724 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -846,8 +846,8 @@ class DoliDBPgsql extends DoliDB * List tables into a database * * @param string $database Name of database - * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @param string $table Name of table filter ('xxx%') + * @return array List of tables in an array */ function DDLListTables($database, $table='') { @@ -860,7 +860,7 @@ class DoliDBPgsql extends DoliDB { $listtables[] = $row[0]; } - return $listtables; + return $listtables; } /** diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index dd040a9b199..dc364081e24 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -737,8 +737,8 @@ class DoliDBSqlite extends DoliDB * List tables into a database * * @param string $database Name of database - * @param string $table Nmae of table filter ('xxx%') - * @return resource Resource + * @param string $table Name of table filter ('xxx%') + * @return array List of tables in an array */ function DDLListTables($database, $table='') { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index ad87d0f2644..4dece372561 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1026,7 +1026,7 @@ function dol_getdate($timestamp,$fast=false) * @param int $year Year * @param mixed $gm True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ * @param int $check 0=No check on parameters (Can use day 32, etc...) - * @return int Date as a timestamp, '' if error + * @return timestamp|string Date as a timestamp, '' if error * @see dol_print_date, dol_stringtotime, dol_getdate */ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) @@ -1075,6 +1075,7 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) $dt->setDate($year,$month,$day); $dt->setTime((int) $hour, (int) $minute, (int) $second); $date=$dt->getTimestamp(); // should include daylight saving time + return $date; } else { @@ -1092,8 +1093,8 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) { $date=mktime($hour,$minute,$second,$month,$day,$year); }*/ + return ''; } - return $date; } diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php index ddb30df4e45..331b7331194 100644 --- a/htdocs/core/modules/syslog/mod_syslog_file.php +++ b/htdocs/core/modules/syslog/mod_syslog_file.php @@ -49,7 +49,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface */ public function isActive() { - return 1; + return true; } /** diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php index 8ff2a52fa05..31a3fb13431 100644 --- a/htdocs/core/modules/syslog/mod_syslog_firephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php @@ -53,7 +53,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface restore_include_path(); if ($res) { - return 1; + return true; } } catch(Exception $e) @@ -61,7 +61,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface print ''."\n"; } - return -1; + return false; } ///** diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php index 9b0d854e2e8..58ac241695c 100644 --- a/htdocs/core/modules/syslog/mod_syslog_syslog.php +++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php @@ -47,12 +47,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface public function isActive() { // This function does not exists on some ISP (Ex: Free in France) - if (!function_exists('openlog')) - { - return 0; - } + if (!function_exists('openlog')) return false; - return 1; + return true; } /** From c51b964b1966e1a6aa2b1bd8f3f4592897efb9a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 03:44:20 +0200 Subject: [PATCH 05/10] Fix: Pb when showing availability --- htdocs/comm/action/card.php | 27 ++++++++++++++++++++++++--- htdocs/langs/en_US/agenda.lang | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 2b59b6cf622..74762b40c63 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -679,8 +679,15 @@ if ($action == 'create') if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); - print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); print ''; // Realised by @@ -922,8 +929,15 @@ if ($id > 0) } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); - print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); print ''; // Realised by @@ -1085,8 +1099,15 @@ if ($id > 0) } $_SESSION['assignedtouser']=dol_json_encode($listofuserid); } + else + { + if (!empty($_SESSION['assignedtouser'])) + { + $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); + } + } print $form->select_dolusers_forevent('view','assignedtouser',1); - print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody print ' '; // Done by diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index dd793c7bfdd..8c4fdabce7d 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -89,4 +89,4 @@ ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range AddEvent=Create event -MyAvailability=Ma disponibilité \ No newline at end of file +MyAvailability=My availability \ No newline at end of file From bb852592e65dda61f53a0c9eb53203453cdfbcee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 04:49:46 +0200 Subject: [PATCH 06/10] Fix: Restore broken feature. One hook = One call of function per module. --- htdocs/core/class/hookmanager.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index babddd9a2fe..4f7044e3d1f 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -157,8 +157,6 @@ class HookManager { if (! empty($modules)) { - $modulealreadyexecuted[$context]=array(); // Filter by context - foreach($modules as $module => $actionclassinstance) { //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."
\n"; @@ -167,8 +165,8 @@ class HookManager // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; // test to avoid to run twice a hook, when a module implements several active contexts - if (in_array($module,$modulealreadyexecuted[$context])) continue; - $modulealreadyexecuted[$context][$module]=$module; // Use the $currentcontext in method for avoid to run twice + if (in_array($module,$modulealreadyexecuted)) continue; + $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; $parameters['currentcontext'] = $context; // Hooks that must return int (hooks with type 'addreplace') From 85f0d6c3ea885feed77e856fead69258bf611277 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 04:51:34 +0200 Subject: [PATCH 07/10] Fix: Edition of event --- htdocs/comm/action/card.php | 109 +++++++++--------- htdocs/comm/action/class/actioncomm.class.php | 17 +-- 2 files changed, 65 insertions(+), 61 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 74762b40c63..5f663d076ec 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -170,7 +170,7 @@ if ($action == 'add') } // Initialisation objet cactioncomm - if (! GETPOST('actioncode') > 0) + if (! GETPOST('actioncode') > 0) // actioncode is id { $error++; $donotclearsession=1; $action = 'create'; @@ -178,62 +178,63 @@ if ($action == 'add') } else { - $result=$cactioncomm->fetch(GETPOST('actioncode')); + $object->type_code = GETPOST('actioncode'); } - // Initialisation objet actioncomm - $object->type_id = $cactioncomm->id; - $object->type_code = $cactioncomm->code; - $object->priority = GETPOST("priority")?GETPOST("priority"):0; - $object->fulldayevent = (! empty($fulldayevent)?1:0); - $object->location = GETPOST("location"); - $object->label = trim(GETPOST('label')); - $object->fk_element = GETPOST("fk_element"); - $object->elementtype = GETPOST("elementtype"); - if (! GETPOST('label')) + if (! $error) { - if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs)) + // Initialisation objet actioncomm + $object->priority = GETPOST("priority")?GETPOST("priority"):0; + $object->fulldayevent = (! empty($fulldayevent)?1:0); + $object->location = GETPOST("location"); + $object->label = trim(GETPOST('label')); + $object->fk_element = GETPOST("fk_element"); + $object->elementtype = GETPOST("elementtype"); + if (! GETPOST('label')) { - $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs)); - } - else - { - if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code) + if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs)) { - $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n"; + $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs)); } - else $object->label = $cactioncomm->libelle; + else + { + if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code) + { + $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n"; + } + else $object->label = $cactioncomm->libelle; + } + } + $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0; + $object->datep = $datep; + $object->datef = $datef; + $object->percentage = $percentage; + $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; + + $listofuserid=array(); + if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']); + $i=0; + foreach($listofuserid as $key => $value) + { + if ($i == 0) // First entry + { + $usertodo=new User($db); + if ($value['id'] > 0) + { + $usertodo->fetch($value['id']); + $object->userownerid = $usertodo->id; + } + $object->usertodo = $usertodo; + $object->transparency = (GETPOST("transparency")=='on'?1:0); + } + + $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0)); + + $i++; } } - $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0; - $object->datep = $datep; - $object->datef = $datef; - $object->percentage = $percentage; - $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; - $listofuserid=array(); - if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']); - $i=0; - foreach($listofuserid as $key => $value) - { - if ($i == 0) // First entry - { - $usertodo=new User($db); - if ($value['id'] > 0) - { - $usertodo->fetch($value['id']); - $object->userownerid = $usertodo->id; - } - $object->usertodo = $usertodo; - $object->transparency = (GETPOST("transparency")=='on'?1:0); - } - - $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0)); - - $i++; - } - - if (! empty($conf->global->AGENDA_ENABLE_DONEBY)) + if (! $error && ! empty($conf->global->AGENDA_ENABLE_DONEBY)) { $userdone=new User($db); if ($_POST["doneby"] > 0) @@ -250,10 +251,10 @@ if ($action == 'add') if (GETPOST('socid','int') > 0) { - $societe = new Societe($db); - $societe->fetch(GETPOST('socid','int')); - $object->societe = $societe; // deprecated - $object->thirdparty = $societe; + $object->socid=GETPOST('socid','int'); + $object->fetch_thirdparty(); + + $object->societe = $object->thirdparty; // For backward compatibility } // Special for module webcal and phenix @@ -607,6 +608,7 @@ if ($action == 'create') print ''; print ''; if ($backtopage) print ''; + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); else print_fiche_titre($langs->trans("AddAnAction")); @@ -620,7 +622,6 @@ if ($action == 'create') $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); print ''; } - else print ''; // Title print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; @@ -864,6 +865,7 @@ if ($id > 0) print ''; print ''; if ($backtopage) print ''; + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action'); @@ -879,7 +881,6 @@ if ($id > 0) $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); print ''; } - else print ''; // Title print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 692ce2058d3..1d99a8eec34 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -108,7 +108,8 @@ class ActionComm extends CommonObject } /** - * Add an action/event into database + * Add an action/event into database. + * $this->type_id OR $this->type_code must be set. * * @param User $user Object user making action * @param int $notrigger 1 = disable triggers, 0 = enable triggers @@ -144,24 +145,26 @@ class ActionComm extends CommonObject $userownerid=isset($this->usertodo->id)?$this->usertodo->id:$this->userownerid; // For backward compatibility $userdoneid=isset($this->userdone->id)?$this->userdone->id:$this->userdoneid; // For backward compatibility - if (! $this->type_id && $this->type_code) + if (! $this->type_id || ! $this->type_code) { + $key=empty($this->type_id)?$this->type_code:$this->type_id; + // Get id from code $cactioncomm=new CActionComm($this->db); - $result=$cactioncomm->fetch($this->type_code); + $result=$cactioncomm->fetch($key); if ($result > 0) { $this->type_id=$cactioncomm->id; - $this->code=$cactioncomm->code; + $this->type_code=$cactioncomm->code; } else if ($result == 0) { - $this->error='Failed to get record with code '.$this->type_code.' from dictionary "type of events"'; + $this->error='Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"'; return -1; } else - { + { $this->error=$cactioncomm->error; return -1; } @@ -201,7 +204,7 @@ class ActionComm extends CommonObject $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").","; $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; // deprecated $sql.= (isset($this->type_id)?$this->type_id:"null").","; - $sql.= (isset($this->code)?" '".$this->code."'":"null").","; + $sql.= (isset($this->type_code)?" '".$this->type_code."'":"null").","; $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").","; $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").","; $sql.= " '".$this->db->escape($this->note)."',"; From 81c28f528ded96a684ab3ad2475a1981bddf1871 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:13:09 +0200 Subject: [PATCH 08/10] Fix translation --- htdocs/langs/en_US/agenda.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 8c4fdabce7d..cb19170dab3 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -88,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Create event +AddEvent=Add event MyAvailability=My availability \ No newline at end of file From 3b6c533b859427a4f8c5b33ee49d371fe861109b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:13:46 +0200 Subject: [PATCH 09/10] Fix translation --- htdocs/fichinter/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index bcc50d32aca..1cf9ce563ed 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry @@ -1692,8 +1692,8 @@ else if ($id > 0 || ! empty($ref)) $langs->load("bills"); if ($object->statut < 2) { - if ($user->rights->facture->creer) print '
'.$langs->trans("CreateBill").'
'; - else print '
'.$langs->trans("CreateBill").'
'; + if ($user->rights->facture->creer) print '
'.$langs->trans("AddBill").'
'; + else print '
'.$langs->trans("AddBill").'
'; } if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED)) From 968b021985b262aef7f2d9b9e76dc473759c69c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Oct 2014 05:37:01 +0200 Subject: [PATCH 10/10] Fix trad and sql error --- .../deplacement/class/deplacement.class.php | 2 +- htdocs/langs/en_US/holiday.lang | 126 +++++++++--------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 48d8c05ff0c..4eab354577a 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -231,7 +231,7 @@ class Deplacement extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."deplacement"; $sql.= " WHERE entity IN (".getEntity('deplacement').")"; if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'"; - else $sql.= " AND id = ".$id; + else $sql.= " AND rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $result = $this->db->query($sql); diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index da03299e0da..c25abf6449c 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Holidays -CPTitreMenu=Holidays +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Monthly statement -MenuAddCP=Apply for holidays -NotActiveModCP=You must enable the module holidays to view this page. -NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . -NoCPforUser=You don't have a demand for holidays. -AddCP=Apply for holidays +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request Employe=Employee DateDebCP=Start date DateFinCP=End date @@ -18,24 +18,24 @@ ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator -ListeCP=List of holidays +ListeCP=List of leaves ReviewedByCP=Will be reviewed by DescCP=Description -SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. -MenuConfCP=Edit balance of holidays -UpdateAllCP=Update the holidays -SoldeCPUser=Holidays balance is %s days. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=An SQL error occurred during the creation: -ErrorIDFicheCP=An error has occurred, the request for holidays does not exist. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Return to previous page -ErrorUserViewCP=You are not authorized to read this request for holidays. -InfosCP=Information of the demand of holidays +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Information Workflow RequestByCP=Requested by -TitreRequestCP=Sheet of holidays -NbUseDaysCP=Number of days of holidays consumed +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed EditCP=Edit DeleteCP=Delete ActionValidCP=Validate @@ -43,26 +43,26 @@ ActionRefuseCP=Refuse ActionCancelCP=Cancel StatutCP=Status SendToValidationCP=Send to validation -TitleDeleteCP=Delete the request of holidays -ConfirmDeleteCP=Confirm the deletion of this request for holidays? -ErrorCantDeleteCP=Error you don't have the right to delete this holiday request. -CantCreateCP=You don't have the right to apply for holidays. -InvalidValidatorCP=You must choose an approbator to your holiday request. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. UpdateButtonCP=Update -CantUpdate=You cannot update this request of holidays. +CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. ErrorDureeCP=Your request for holidays does not contain working day. TitleValidCP=Approve the request holidays -ConfirmValidCP=Are you sure you want to approve the holiday request? +ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved -TitleToValidCP=Send request holidays -ConfirmToValidCP=Are you sure you want to send the request of holidays? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? TitleRefuseCP=Refuse the request holidays -ConfirmRefuseCP=Are you sure you want to refuse the request of holidays? +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. TitleCancelCP=Cancel the request holidays -ConfirmCancelCP=Are you sure you want to cancel the request of holidays? +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal DateCancelCP=Date of cancellation @@ -72,8 +72,8 @@ MotifCP=Reason UserCP=User ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of holidays -LogCP=Log of updates of holidays +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance @@ -81,33 +81,33 @@ NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. UserName=Name Employee=Employee -FirstDayOfHoliday=First day of holiday -LastDayOfHoliday=Last day of holiday +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Holidays cancelation +HolidaysCancelation=Leave request cancelation ## Configuration du Module ## ConfCP=Configuration of holidays module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve holidays +GroupToValidateCP=Group with the ability to approve vacation ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last updated automatically of holidays +LastUpdateCP=Last automatic update of vacation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. AddCPforUsers=Please add the balance of holidays of users by clicking here. DelayForSubmitCP=Deadline to apply for holidays AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance -nbUserCP=Number of users supported in the module holidays -nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken -nbHolidayEveryMonthCP=Number of holidays added every month -Module27130Name= Management of holidays -Module27130Desc= Management of holidays -TitleOptionMainCP=Main settings of holidays -TitleOptionEventCP=Settings of holidays related to events +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of vacation days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of Leave request +TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events CreateEventCP=Create @@ -127,23 +127,23 @@ UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days -TitleAdminCP=Configuration of Holidays +TitleAdminCP=Configuration of Leaves #Messages Hello=Hello -HolidaysToValidate=Validate holidays -HolidaysToValidateBody=Below is a request for holidays to validate -HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days. -HolidaysValidated=Validated holidays -HolidaysValidatedBody=Your request for holidays for %s to %s has been validated. -HolidaysRefused=Denied holidays -HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled holidays -HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. -Permission20000=Read you own holidays -Permission20001=Create/modify your holidays -Permission20002=Create/modify holidays for everybody -Permission20003=Delete holidays requests -Permission20004=Setup users holidays -Permission20005=Review log of modified holidays -Permission20006=Read holidays monthly report +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report