Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/admin/system/database-tables.php

@@ -21,7 +21,7 @@
 
 /**
  *	\file       htdocs/admin/system/database-tables.php
- *	\brief      Page d'infos des tables de la base
+ *	\brief      Page with information on database tables
  */
 
 require '../../main.inc.php';
@@ -134,7 +134,7 @@
 				print '<td align="right">'.$obj->Auto_increment.'</td>';
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
-				if (isset($obj->Collation) && ($obj->Collation == "utf8mb4_general_ci" || $obj->Collation == "utf8mb4_unicode_ci"))
+				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci"))))
 				{
 				    print '<br><a class="reposition" href="database-tables.php?action=convertutf8&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' UTF8</a>';
 				}

htdocs/install/mysql/migration/repair.sql

@@ -205,8 +205,6 @@ CREATE TABLE tmp_user as (select * from llx_user);
 UPDATE llx_user SET fk_user = NULL where fk_user NOT IN (select rowid from tmp_user);
 
 
-update llx_user set fk_user = null where fk_user not in (select rowid from llx_user);
-
 
 UPDATE llx_product SET canvas = NULL where canvas = 'default@product';
 UPDATE llx_product SET canvas = NULL where canvas = 'service@product';

htdocs/langs/ar_EG/admin.lang

@@ -19,6 +19,7 @@ DolibarrSetup=تثبيت أو ترقية البرنامج
 InternalUsers=مستخدمون داخليون
 ExternalUsers=مستخدمون خارجيون
 FormToTestFileUploadForm=نموذج تجربة رفع الملفات (تبعا للتنصيب)
+FeatureAvailableOnlyOnStable=الميزة متوفرة فقط في الإصدارات الثابتة الرسمية
 Module700Name=تبرعات
 Module1780Name=الأوسمة/التصنيفات
 Permission81=قراءة أوامر الشراء

htdocs/langs/ar_SA/accountancy.lang

@@ -107,7 +107,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Journalize transactions in Ledger
+WriteBookKeeping=Register transactions in Ledger
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -165,8 +165,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_INTRA=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT_EXPORT=Accounting account by default for the sold products export out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the sold products export out of EEC (used if not defined in the product sheet)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 
@@ -177,6 +177,7 @@ LabelAccount=حساب التسمية
 LabelOperation=Label operation
 Sens=السيناتور
 LetteringCode=Lettering code
+Lettering=Lettering
 Codejournal=دفتر اليومية
 JournalLabel=Journal label
 NumPiece=Piece number
@@ -288,8 +289,10 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
+Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -299,8 +302,12 @@ DefaultBindingDesc=This page can be used to set a default account to use to link
 DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 Options=الخيارات
 OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year

htdocs/langs/ar_SA/admin.lang

@@ -71,7 +71,9 @@ UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=الجافا سكربت معطل
@@ -468,6 +470,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -989,7 +992,6 @@ Port=الميناء
 VirtualServerName=اسم الخادم الافتراضي
 OS=نظام التشغيل
 PhpWebLink=Php ربط الشبكة
-Browser=المتصفح
 Server=الخادم
 Database=قاعدة بيانات
 DatabaseServer=قاعدة بيانات المضيف
@@ -1077,7 +1079,7 @@ SystemInfoDesc=نظام المعلومات المتنوعة المعلومات 
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
 AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
@@ -1237,8 +1239,6 @@ BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة ال
 BillsPDFModules=فاتورة نماذج الوثائق
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-CreditNote=علما الائتمان
-CreditNotes=ويلاحظ الائتمان
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
 SuggestedPaymentModesIfNotDefinedInInvoice=واقترح على طريقة دفع الفواتير تلقائيا اذا لم تعرف للفاتورة
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -1828,7 +1828,9 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
 DateLastCollectResult=Date latest collect tried
 DateLastcollectResultOk=Date latest collect successfull
 LastResult=Latest result
@@ -1849,7 +1851,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty2=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty4=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1882,3 +1884,10 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+IFTTTSetup=IFTTT module setup
+IFTTT_SERVICE_KEY=IFTTT Service key
+IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
+IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
+UrlForIFTTT=URL endpoint for IFTTT
+YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
+EndPointFor=End point for %s : %s

htdocs/langs/ar_SA/agenda.lang

@@ -38,6 +38,7 @@ ActionsEvents=الأحداث التي سيقوم دوليبار بإنشاء أ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=تم إنشاء الطرف الثالث %s
+COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=العقد%s  تم التأكد من صلاحيته
 CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=الإقتراح%sتم توقعية
@@ -95,6 +96,7 @@ PROJECT_MODIFYInDolibarr=المشروع %s تم تعديلة
 PROJECT_DELETEInDolibarr=المشروع %s تم حذفة
 TICKET_CREATEInDolibarr=Ticket %s created
 TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
 TICKET_CLOSEInDolibarr=Ticket %s closed
 TICKET_DELETEInDolibarr=Ticket %s deleted
 ##### End agenda events #####

htdocs/langs/ar_SA/banks.lang

@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=البنك
-MenuBankCash=Bank | Cash
+MenuBankCash=Banks | Cash
 MenuVariousPayment=مدفوعات متنوعة
 MenuNewVariousPayment=مدفوعات متنوعة جديدة
 BankName=اسم المصرف
 FinancialAccount=الحساب
 BankAccount=الحساب المصرفي
 BankAccounts=الحسابات المصرفية
-BankAccountsAndGateways=Bank | Gateways
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=عرض الحساب
 AccountRef=مرجع الحساب المالي
 AccountLabel=بطاقة الحساب المالي
@@ -30,7 +30,7 @@ AllTime=من البداية
 Reconciliation=التسوية
 RIB=رقم الحساب المصرفي
 IBAN=عدد إيبان
-BIC=بيك / سويفت عدد
+BIC=BIC/SWIFT code
 SwiftValid=بيك / سويفت صالحة
 SwiftVNotalid=بيك / سويفت غير صالح
 IbanValid=بان صالحة
@@ -42,11 +42,11 @@ AccountStatementShort=بيان
 AccountStatements=كشوفات الحساب
 LastAccountStatements=كشوفات الحساب الأخيرة
 IOMonthlyReporting=تقارير شهرية
-BankAccountDomiciliation=عنوان الحساب
+BankAccountDomiciliation=Bank address
 BankAccountCountry=بلد حساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان مالك الحساب
-RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -98,14 +98,14 @@ BankLineConciliated=تم تسوية القيد
 Reconciled=تمت تسويتة
 NotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
-SupplierInvoicePayment=دفع المورد
+SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=دفع الاشتراك
 WithdrawalPayment=سحب المدفوعات
 SocialContributionPayment=مدفوعات الضرائب الاجتماعية / المالية
 BankTransfer=حوالة مصرفية
 BankTransfers=حوالات المصرفية
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
@@ -136,7 +136,7 @@ BankTransactionLine=قيد البنك
 AllAccounts=All bank and cash accounts
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
-FutureTransaction=Transaction in future. No way to reconcile.
+FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
@@ -156,12 +156,14 @@ CheckRejectedAndInvoicesReopened=تم ارجاع الشيك وإعادة فتح
 BankAccountModelModule=نماذج مستندات للحسابات البنكية
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=نموذج لطباعة صفحة تحتوي على معلومات BAN .
-NewVariousPayment=مدفوعات متنوعة جديدة
-VariousPayment=مدفوعات متنوعة
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
 VariousPayments=مدفوعات متنوعة
-ShowVariousPayment=عرض الدفعات المتنوعة
-AddVariousPayment=إضافة دفعات متنوعة
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence