From 9d582a53cac663fca6f4a1643ca59544cb613b7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Nov 2018 11:28:28 +0100 Subject: [PATCH 1/3] Fix compatibility with new mysql versions --- htdocs/install/mysql/tables/llx_product.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 22006040327..edfb6567726 100755 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -31,7 +31,7 @@ create table llx_product datec datetime, tms timestamp, - virtual tinyint DEFAULT 0 NOT NULL, -- Not used. Used by external modules. Value 0 for physical product, 1 for virtual product + `virtual` tinyint DEFAULT 0 NOT NULL, -- Not used. Used by external modules. Value 0 for physical product, 1 for virtual product fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id label varchar(255) NOT NULL, From 89ab80e598c1b0570f869ee8229b6cc73ba0a0a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 10 Jan 2020 14:41:58 +0100 Subject: [PATCH 2/3] Fix typo --- htdocs/langs/en_US/agenda.lang | 2 +- htdocs/langs/en_US/banks.lang | 2 +- htdocs/langs/en_US/main.lang | 2 +- htdocs/langs/en_US/orders.lang | 2 +- htdocs/langs/en_US/projects.lang | 2 +- htdocs/langs/en_US/propal.lang | 2 +- htdocs/langs/en_US/ticket.lang | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 6e5415067f1..5e56ca9a875 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted ShipmentValidatedInDolibarr=Shipment %s validated ShipmentClassifyClosedInDolibarr=Shipment %s classified billed -ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened +ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status ShipmentDeletedInDolibarr=Shipment %s deleted OrderCreatedInDolibarr=Order %s created diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 44f80c7c3b7..c160b4ae1d2 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -154,7 +154,7 @@ RejectCheck=Check returned ConfirmRejectCheck=Are you sure you want to mark this check as rejected? RejectCheckDate=Date the check was returned CheckRejected=Check returned -CheckRejectedAndInvoicesReopened=Check returned and invoices reopened +CheckRejectedAndInvoicesReopened=Check returned and invoices re-open BankAccountModelModule=Document templates for bank accounts DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only. DocumentModelBan=Template to print a page with BAN information. diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index d30a2d5a613..bfc702426a2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -471,7 +471,7 @@ TotalDuration=Total duration Summary=Summary DolibarrStateBoard=Database Statistics DolibarrWorkBoard=Open Items -NoOpenedElementToProcess=No opened element to process +NoOpenedElementToProcess=No open element to process Available=Available NotYetAvailable=Not yet available NotAvailable=Not available diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 3d22b338166..558076ba11d 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -69,7 +69,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order -OrderReopened= Order %s Reopened +OrderReopened= Order %s re-open AddOrder=Create order AddPurchaseOrder=Create purchase order AddToDraftOrders=Add to draft order diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 79b152e0bdc..dd81928c134 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -77,7 +77,7 @@ MyProjectsArea=My projects Area DurationEffective=Effective duration ProgressDeclared=Declared progress TaskProgressSummary=Task progress -CurentlyOpenedTasks=Curently opened tasks +CurentlyOpenedTasks=Curently open tasks TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression ProgressCalculated=Calculated progress diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index b6a7df10aca..ca88cd480d5 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -28,7 +28,7 @@ ShowPropal=Show proposal PropalsDraft=Drafts PropalsOpened=Open PropalStatusDraft=Draft (needs to be validated) -PropalStatusValidated=Validated (proposal is opened) +PropalStatusValidated=Validated (proposal is open) PropalStatusSigned=Signed (needs billing) PropalStatusNotSigned=Not signed (closed) PropalStatusBilled=Billed diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index a565ecb59b8..f29c2f4a5ba 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -241,7 +241,7 @@ NoLogForThisTicket=No log for this ticket yet TicketLogAssignedTo=Ticket %s assigned to %s TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s TicketLogClosedBy=Ticket %s closed by %s -TicketLogReopen=Ticket %s re-opened +TicketLogReopen=Ticket %s re-open # # Public pages From c028819cab8e109291e24962d19ce36e2e3e2053 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 10 Jan 2020 19:35:49 +0100 Subject: [PATCH 3/3] FIX clone of purchase order --- htdocs/fourn/class/fournisseur.commande.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b69818bbdb1..fef9c091247 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -191,7 +191,7 @@ class CommandeFournisseur extends CommonOrder $this->extraparams = (array) json_decode($obj->extraparams, true); $this->db->free($resql); - + // Retreive all extrafield // fetch optionals attributes and labels require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); @@ -951,6 +951,7 @@ class CommandeFournisseur extends CommonOrder $this->lines[$i]->remise_percent, 'HT', 0, + $this->lines[$i]->product_type, $this->lines[$i]->info_bits ); if ($result < 0)