Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql

htdocs/langs/en_US/admin.lang

@@ -707,6 +707,20 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsUsed=Use third tax
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Management
 LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
 LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
@@ -1310,6 +1324,7 @@ AccountancyCodeBuy=Purchase account. code
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
 PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (manage into Configuration->Dictionnary->llx_c_actioncomm)
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ##### Point Of Sales (CashDesk) #####

htdocs/langs/en_US/agenda.lang

@@ -7,7 +7,7 @@ Agendas= Agendas
 Calendar= Calendar
 Calendars= Calendars
 LocalAgenda=Local calendar
-AffectedTo= Affected to
+AffectedTo= Assigned to
 DoneBy= Done by
 Events= Events
 MyEvents=My events
@@ -22,7 +22,7 @@ MenuToDoMyActions= My incomplete events
 MenuDoneMyActions= My terminated events
 ListOfEvents= List of Dolibarr events
 ActionsAskedBy=Events reported by
-ActionsToDoBy=Events affected to
+ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
@@ -59,9 +59,9 @@ DateActionDoneEnd= Real end date
 DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, affected to or done by user <b>%s</b>.
+AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
 AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts

htdocs/langs/en_US/commercial.lang

@@ -31,7 +31,7 @@ SalesRepresentativeFollowUp=Sales representative (follow-up)
 SalesRepresentativeSignature=Sales representative (signature)
 CommercialInterlocutor=Commercial interlocutor
 ErrorWrongCode=Wrong code
-NoSalesRepresentativeAffected=No particular sales representative affected
+NoSalesRepresentativeAffected=No particular sales representative assigned
 ShowCustomer=Show customer
 ShowProspect=Show prospect
 ListOfProspects=List of prospects
@@ -52,7 +52,7 @@ StatusActionToDo=To do
 StatusActionDone=Complete
 MyActionsAsked=Events I have recorded
 MyActionsToDo=Events I have to do
-MyActionsDone=Events affected to me
+MyActionsDone=Events assigned to me
 StatusActionInProcess=In process
 TasksHistoryForThisContact=Events for this contact
 LastProspectDoNotContact=Do not contact
@@ -63,7 +63,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event affected to
+ActionAffectedTo=Event assigned to
 ActionDoneBy=Event done by
 ActionUserAsk=Reported by
 ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
@@ -81,6 +81,8 @@ ActionAC_SHIP=Send shipping by mail
 ActionAC_SUP_ORD=Send supplier order by mail
 ActionAC_SUP_INV=Send supplier invoice by mail
 ActionAC_OTH=Other
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
 Stats=Sales statistics
 CAOrder=Sales volume (validated orders)
 FromTo=from %s to %s

htdocs/langs/en_US/propal.lang

@@ -61,7 +61,7 @@ FileUploaded=The file was successfully uploaded
 AssociatedDocuments=Documents associated with the proposal:
 ErrorCantOpenDir=Can't open directory
 DatePropal=Date of proposal
-DateEndPropal=Date end validity
+DateEndPropal=Validity ending date
 DateEndPropalShort=Date end
 ValidityDuration=Validity duration
 CloseAs=Close with status

htdocs/langs/en_US/users.lang

@@ -61,7 +61,7 @@ LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
 ShowUser=Show user
-NonAffectedUsers=Non affected users
+NonAffectedUsers=Non assigned users
 UserModified=User modified successfully
 GroupModified=Group modified successfully
 PhotoFile=Photo file

htdocs/langs/en_US/withdrawals.lang

@@ -81,6 +81,9 @@ WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your cou
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as payed to allow to manage withdrawal before.
 DoStandingOrdersBeforePayments=This tabs allows you to request for a standing order. Once it will be finished, you can type the payment to close the invoice.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also create payments onto invoices and will classify them to paid
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank