From a019996bc8bbcaefb48e893336b23e7b9faa68ac Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Sun, 13 Jun 2021 17:36:51 +0200 Subject: [PATCH 1/5] Fix create image thumbs on php 8.0 --- htdocs/core/lib/images.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 0a0ebe3ce02..bdc00ffb2ac 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img)) { + if (!is_resource($img) && !$img instanceof \GdImage) { dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); return 0; } From fe06e76e2f266829435bcbdb62861f7ec751189e Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:21:16 +0200 Subject: [PATCH 2/5] Update ChangeLog --- ChangeLog | 67 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7464b0f68d3..95a4a7a3ae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,17 +39,12 @@ NEW: Add import profile to import BOM NEW: Add link picto to the stock movement on the detail of production NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members NEW: Add bulk action Validate and Set to billed on order list. -NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared. -NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared. -NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP to define list of IPs that are local IPs -NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field NEW: Add possibility to exports userGroups fields on user exports NEW: Add price min and price min including tax into product export NEW: Can search on lots or serials into the quick search bar NEW: Add support for Friday as a non working day NEW: Add a total in page of margin by user NEW: Add the total of margin in invoice list -NEW: Can set a Warehouse on a Thirdparty NEW: auto notification with module Notification can use templated emails NEW: Bank Entries : display user linked to a salary or a taxes NEW: Can clone a cron job @@ -67,7 +62,7 @@ NEW: Choose lines to use while creating intervention card from origin NEW: Columns shipment method, payment mode, payment term in proposal and order list NEW: Conf for default actioncomm status NEW: customer ref for product customer prices -NEW: date and user signature on proposal (Issue 16062) +NEW: date and user signature on proposal (Issue 16062) #16980 NEW: Dictionary for availability - Add a column position NEW: Can set a user related to a social contribution NEW: ICS Direct debit can be set with a different value for each bank account @@ -93,9 +88,7 @@ NEW: Update the list of taxes available by default for France NEW: Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording NEW: VAT report - Optimisation & collapse by rate -NEW: When we add contacts/users to a project, ask to also affect them on tasks. NEW: When a doc file is shared, link is visible from the main page of doc. -NEW: Add option in Workflow module to set a shipment as closed. NEW: #16378 More E-Mail Contact substitution Values for better salutation NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page @@ -108,30 +101,38 @@ NEW: #17292 default subscription amount by adherent type NEW: Option to automatically create a login/user when a new subscription of a member is done online NEW: option to select membership type on the online payment page for membership subscription or renewal - Projects + Projects/Tasks NEW: option to automatically close an open project when all its tasks are done (=progress 100%) -NEW: Can show the project ref into PDF documents +NEW: can show the project ref into PDF documents +NEW: when we add contacts/users to a project, ask to also affect them on tasks Proposals NEW: add bulk action to set a commercial proposal to status "Refused" -NEW: Can set a warehouse in a proposal +NEW: can set a warehouse in a proposal + + Shipment +NEW: add option in Workflow module to set a shipment as closed TakePOS -NEW: TAKEPOS delayed payment in TakePOS -NEW: TAKEPOS display date range if exist in TakePOS -NEW: TAKEPOS display resiliate status in TakePOS for member -NEW: TAKEPOS Edit sales lines rights in TakePOS -NEW: TAKEPOS Option for TakePOS to show the total price without tax -NEW: TAKEPOS More permission in TakePOS (Can edit added line, can modify once order sent to kitchen) +NEW: delayed payment in TakePOS #14456? +NEW: display date range if exist in TakePOS +NEW: display resiliate status in TakePOS for member +NEW: edit sales lines rights in TakePOS +NEW: option for TakePOS to show the total price without tax +NEW: more permissions in TakePOS (can edit added line, can modify once order sent to kitchen) + + Third-Parties +NEW: Can set a Warehouse on a Thirdparty Tickets -NEW: Add captcha on public page to create a ticket -NEW: Can use captcha on public page to create a ticket -NEW: Can set if a ticket group is visible on public interface or not +NEW: can use captcha on public page to create a ticket #16347 +NEW: can set if a ticket group is visible on public interface or not Warehouse NEW: Can make massive stock transfers from a CSV file NEW: Stock movement list - Add more complete date field +NEW: Can set a Warehouse on a Thirdparty +NEW: can set a warehouse in a proposal Website Module NEW: #17113 Can upload a favicon in website module @@ -145,6 +146,12 @@ NEW: start new experimental module Partnership Management NEW: start new experimental module Knowledge Management NEW: start new experimental module Workstations Management + new Options +NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared +NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared +NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP to define list of IPs that are local IPs +NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field + For developers: --------------- @@ -165,8 +172,6 @@ NEW: Support sepa_debit in stripe paymentmethods list NEW: Update doleditor.class.php for easily activate SCAYT NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked() NEW: Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked() -NEW: API Add option $includeifobjectisused to get a product -NEW: API Get the list of product ids only NEW: Can set a target image in dolcropresize function. NEW: Can set a label as placeholder for combo lists. NEW: Add pagination on Get Products response API @@ -175,20 +180,24 @@ NEW: Extrafields of documents lines are inside the lines, not any more on separa NEW: unit selection on object edit line NEW: #13739 #17390 Product API route added to get product stock and product with or without variants + APIs +NEW: API Add option $includeifobjectisused to get a product +NEW: API Get the list of product ids only + WARNING: Following changes may create regressions for some external modules, but were necessary to make Dolibarr better: * Module SimplePOS is deprecated. If you need a POS module, please use the module TakePOS. -* The ICS value for direct debit or credit transfer is now store on each bank account instead of into the global setup. +* The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup. * API /setup/shipment_methods has been replaced with API /setup/shipping_methods -* Field "total" renamed into to "total_ht" for table llx_facture, llx_facture_rec for better field name consistency -* Field "tva" renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency -* Field "total" renamed into "total_ttc" for table lx_propal, llx_supplier_proposal for better field name consistency -* If your database is PostgreSql, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT) -* If your database is MySql or MariaDB, you need at least version 5.1 +* Field "total" renamed into "total_ht" for table llx_facture, llx_facture_rec for better field name consistency +* Field "tva" renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency +* Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency +* If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT) +* If your database is MySQL or MariaDB, you need at least version 5.1 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules -* Remove deprecated subtituion key __REFCLIENT__ (Replaced with __REF_CLIENT__) +* removed deprecated subtituion key __REFCLIENT__ (replaced with __REF_CLIENT__) ***** ChangeLog for 13.0.3 compared to 13.0.2 ***** From 5f1f61c38ba22624801b7f764604c059b6319fb1 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:45:09 +0200 Subject: [PATCH 3/5] Update README.md --- README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 736925bec72..ad349f713c1 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) - Barcodes - Batches / Lots / Serials - Product Variants -- Bill of Materials +- Bill of Materials (BOM) - Manufacturing Orders Customer/Sales Management @@ -124,9 +124,10 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) Supplier/Purchase Management - Suppliers/Vendors + Contacts - Supplier (price) requests -- Purchase Order management +- Purchase Orders management - Delivery/Receiption - Supplier Invoices/credit notes and payment management +- INCOTERMS Finance / Accounting - Invoices / Payments @@ -138,25 +139,24 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) - Margins - Reports - + Collaboration - Shared calendar/agenda (with ical and vcal export for third party tools integration) - Projects & Tasks management - Ticket System +- Surveys + HR - Employee's leave requests management - Expense reports - Recruitment management - Timesheets -- (around 100 modules available by default, 1000+ on the addon market place) - ### Other application/modules - Electronic Document Management (EDM) - Bookmarks management - Reporting -- Surveys - Data export/import - Barcodes - Margin calculations @@ -165,8 +165,12 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) - Mass emailing - RSS integration - Skype integration +- Social platforms linking - Payment platforms integration (PayPal, Stripe, Paybox...) -- +- Email-Collector + +(around 100 modules available by default, 1000+ on the addon market place) + ### Other general features From ba4f7a66d3fdaa50ba8dbda2fb72af7e61de9366 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:55:29 +0200 Subject: [PATCH 4/5] Update bom_agenda.php --- htdocs/bom/bom_agenda.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php index 0f18c39d2af..bf65f40fe13 100644 --- a/htdocs/bom/bom_agenda.php +++ b/htdocs/bom/bom_agenda.php @@ -126,7 +126,7 @@ $form = new Form($db); if ($object->id > 0) { $title = $langs->trans("Agenda"); //if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; - $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda'; + $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda'; llxHeader('', $title, $help_url); if (!empty($conf->notification->enabled)) { From 03fbd68da46cacb3f0f2ff0bb53643521189144f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 14 Jun 2021 14:05:48 +0200 Subject: [PATCH 5/5] Update images.lib.php --- htdocs/core/lib/images.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index bdc00ffb2ac..0ccb6a415fc 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img) && !$img instanceof \GdImage) { + if (!is_resource($img) && !($img instanceof \GdImage)) { dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); return 0; }