Merge remote-tracking branch 'Upstream/develop' into develop-loan

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

htdocs/langs/en_US/admin.lang

@@ -1177,6 +1177,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### AskPriceSupplier #####
+AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierNumberingModules=Price requests suppliers numbering models
+AskPriceSupplierPDFModules=Price requests suppliers documents models
+FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
+WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models

htdocs/langs/en_US/askpricesupplier.lang

@@ -0,0 +1,57 @@
+# Dolibarr language file - Source file is en_US - askpricesupplier
+AskPriceSupplier=Supplier commercial proposals
+askpricesupplierDESC=Manage price requests to suppliers
+askpricesupplierMENU_LEFT_TITLE=Price request supplier
+askpricesupplierMENU_LEFT_TITLE_NEW=New request
+askpricesupplierMENU_LEFT_TITLE_LIST=List
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+LastModifiedRequests=Last %s modified price requests
+RequestsOpened=Opened price requests
+AskPriceSupplierArea=Area price requests suppliers
+Askpricesupplier=Price request supplier
+NewAskPrice=New price request
+NewAsk=New request
+ShowAskpricesupplier=Show price request
+AddAskPriceSupplier=Create a price request
+AskPriceSupplierRefFourn=Supplier ref
+AskPriceSupplierDate=Delivery date
+AskPriceSupplierRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+RelatedAskPriceSupplier=Related price requests suppliers
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
+DateAsk=Date of request
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+AddAsk=Create a request
+AskpricesupplierDraft=Drafts
+AskpricesupplierOpened=Opened
+AskpricesupplierStatusDraft=Draft (needs to be validated)
+AskpricesupplierStatusValidated=Validated (request is open)
+AskpricesupplierStatusOpened=Validated (request is open)
+AskpricesupplierStatusClosed=Closed
+AskpricesupplierStatusSigned=Accepted
+AskpricesupplierStatusNotSigned=Refused
+AskpricesupplierStatusDraftShort=Draft
+AskpricesupplierStatusValidatedShort=Validated
+AskpricesupplierStatusOpenedShort=Opened
+AskpricesupplierStatusClosedShort=Closed
+AskpricesupplierStatusSignedShort=Accepted
+AskpricesupplierStatusNotSignedShort=Refused
+CopyAskFrom=Create price request by copying existing a request
+CreateEmptyAsk=Create blank request
+CloneAsk=Clone price request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+AskPriceSupplierCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request ?
+ActionsOnAskPriceSupplier=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelAskPriceSupplierCreate=Default model creation
+DefaultModelAskPriceSupplierToBill=Default template when closing a price request (accepted)
+DefaultModelAskPriceSupplierClosed=Default template when closing a price request (refused)
+ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs

htdocs/langs/en_US/commercial.lang

@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event owned by
+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%%.

htdocs/langs/en_US/main.lang

@@ -220,6 +220,7 @@ Cards=Cards
 Card=Card
 Now=Now
 Date=Date
+DateAndHour=Date and hour
 DateStart=Date start
 DateEnd=Date end
 DateCreation=Creation date
@@ -296,6 +297,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
 PriceUTTC=U.P.
 Amount=Amount
 AmountInvoice=Invoice amount

htdocs/langs/en_US/other.lang

@@ -60,6 +60,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__

htdocs/langs/en_US/projects.lang

@@ -31,6 +31,8 @@ NoProject=No project defined or owned
 NbOpenTasks=Nb of opened tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
 TimesSpent=Time spent
 RefTask=Ref. task
 LabelTask=Label task
@@ -136,4 +138,5 @@ ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
 InputPerTime=Input per time
-InputPerDay=Input per day 
+InputPerDay=Input per day 
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s