From 10496d9f6a962bec2ffb253a7f70c0b4786ac488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 4 Oct 2024 17:27:19 +0200 Subject: [PATCH 1/3] fix phpstan (#31272) * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan --- htdocs/opensurvey/lib/opensurvey.lib.php | 5 +++-- htdocs/public/agenda/agendaexport.php | 19 +++++++++++++------ htdocs/public/bookcal/index.php | 4 ++-- htdocs/public/company/new.php | 4 ++-- htdocs/public/demo/index.php | 10 +++++++--- htdocs/public/donations/donateurs_code.php | 13 +++++++++---- .../public/eventorganization/attendee_new.php | 4 ++-- .../eventorganization/subscriptionok.php | 4 ++-- htdocs/public/members/new.php | 4 ++-- htdocs/public/members/public_card.php | 11 ++++++++--- htdocs/public/members/public_list.php | 11 ++++++++--- htdocs/public/partnership/new.php | 4 ++-- htdocs/public/project/index.php | 4 ++-- htdocs/public/project/new.php | 4 ++-- htdocs/public/project/suggestbooth.php | 4 ++-- htdocs/public/project/suggestconference.php | 4 ++-- phpstan.neon.dist | 1 - 17 files changed, 68 insertions(+), 42 deletions(-) diff --git a/htdocs/opensurvey/lib/opensurvey.lib.php b/htdocs/opensurvey/lib/opensurvey.lib.php index bb1173479e8..6ec2ee54605 100644 --- a/htdocs/opensurvey/lib/opensurvey.lib.php +++ b/htdocs/opensurvey/lib/opensurvey.lib.php @@ -2,6 +2,7 @@ /* Copyright (C) 2013 Laurent Destailleur * Copyright (C) 2014 Marcos García * Copyright (C) 2024 MDW + * Copyright (C) 2024 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,8 +70,8 @@ function opensurvey_prepare_head(Opensurveysondage $object) * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @param string $numsondage Num survey * @return void */ diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index 180780ace21..9a7af93cbe4 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -1,5 +1,6 @@ + * Copyright (C) 2024 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,9 +58,15 @@ if (!defined('NOIPCHECK')) { /** * Header function * + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ -function llxHeaderVierge() +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) { print 'Export agenda cal'; } @@ -166,7 +173,7 @@ if (!getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) { top_httphead(); - llxHeaderVierge(); + llxHeaderVierge(""); print '
Module Agenda was not configured properly.
'; llxFooterVierge(); exit; @@ -179,7 +186,7 @@ $reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $acti if ($reshook < 0) { top_httphead(); - llxHeaderVierge(); + llxHeaderVierge(""); if (!empty($hookmanager->errors) && is_array($hookmanager->errors)) { print '
'.implode('
', $hookmanager->errors).'
'; } else { @@ -193,7 +200,7 @@ if ($reshook < 0) { top_httphead(); - llxHeaderVierge(); + llxHeaderVierge(""); print '
Bad value for key.
'; llxFooterVierge(); exit; @@ -268,7 +275,7 @@ if ($shortfilename == 'dolibarrcalendar') { top_httphead(); - llxHeaderVierge(); + llxHeaderVierge(""); print '
'.$langs->trans("ErrorWrongValueForParameterX", 'format').'
'; llxFooterVierge(); exit; @@ -393,6 +400,6 @@ if ($format == 'rss') { top_httphead(); -llxHeaderVierge(); +llxHeaderVierge(""); print '
'.$agenda->error.'
'; llxFooterVierge(); diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php index 94787bca2ff..374554ffcfa 100644 --- a/htdocs/public/bookcal/index.php +++ b/htdocs/public/bookcal/index.php @@ -125,8 +125,8 @@ $errmsg = ''; * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php index bbc30eb0bd9..7a3622d62b8 100644 --- a/htdocs/public/company/new.php +++ b/htdocs/public/company/new.php @@ -106,8 +106,8 @@ $extrafields->fetch_name_optionals_label($objectsoc->table_element); // fetch op * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 0e57672aa9c..9e113d9125d 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -471,11 +471,15 @@ $db->close(); /** * Show header for demo * - * @param string $title Title - * @param string $head Head string + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ -function llxHeaderVierge($title, $head = "") +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) { top_httphead(); diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 509eb553288..96bca9bd84e 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -1,6 +1,6 @@ - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018-2024 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,11 +34,16 @@ if (!defined('NOIPCHECK')) { // C'est un wrapper, donc header vierge /** - * Header function * + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ -function llxHeaderVierge() +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) { print 'List of donators'; } @@ -69,7 +74,7 @@ $langs->load("donations"); * View */ -llxHeaderVierge(); +llxHeaderVierge(""); $sql = "SELECT d.datedon as datedon, d.lastname, d.firstname, d.amount, d.public, d.societe"; $sql .= " FROM ".MAIN_DB_PREFIX."don as d"; diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php index 580b48896dd..f983652d561 100644 --- a/htdocs/public/eventorganization/attendee_new.php +++ b/htdocs/public/eventorganization/attendee_new.php @@ -164,8 +164,8 @@ $extrafields->fetch_name_optionals_label($object->table_element); // fetch optio * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php index aa35ab13119..014b59d1984 100644 --- a/htdocs/public/eventorganization/subscriptionok.php +++ b/htdocs/public/eventorganization/subscriptionok.php @@ -89,8 +89,8 @@ if (empty($conf->eventorganization->enabled)) { * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 1e0e31a847a..7ce84502a9b 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -108,8 +108,8 @@ $user->loadDefaultValues(); * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 2862d9004b0..a00be39a2d5 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -4,6 +4,7 @@ * Copyright (C) 2007-2012 Laurent Destailleur * Copyright (C) 2012 Regis Houssin * Copyright (C) 2018 Alexandre Spangaro + * Copyright (C) 2024 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -143,11 +144,15 @@ $db->close(); /** * Show header for card member * - * @param string $title Title - * @param string $head More info into header + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ -function llxHeaderVierge($title, $head = "") +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) { top_htmlhead($head, $title); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 74bfe4e6d74..97061659a70 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -3,6 +3,7 @@ * Copyright (C) 2002-2003 Jean-Louis Bergamo * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2024 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,11 +60,15 @@ $langs->loadLangs(array("main", "members", "companies", "other")); /** * Show header for member list * - * @param string $title Title - * @param string $head More info into header + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ -function llxHeaderVierge($title, $head = "") +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) { top_htmlhead($head, $title); diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php index 25d44c2f851..da85456f3ad 100644 --- a/htdocs/public/partnership/new.php +++ b/htdocs/public/partnership/new.php @@ -96,8 +96,8 @@ $user->loadDefaultValues(); * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php index 4aacb470889..829296e605e 100644 --- a/htdocs/public/project/index.php +++ b/htdocs/public/project/index.php @@ -104,8 +104,8 @@ if (empty($conf->project->enabled)) { * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php index 94a8fa24dd2..4d1c514d3c7 100644 --- a/htdocs/public/project/new.php +++ b/htdocs/public/project/new.php @@ -94,8 +94,8 @@ if (empty($conf->project->enabled)) { * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index bff61f10190..d699dffc091 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -118,8 +118,8 @@ if (empty($conf->eventorganization->enabled)) { * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 9ec617983cb..17387bb8f98 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -119,8 +119,8 @@ if (empty($conf->eventorganization->enabled)) { * @param string $head Head array * @param int $disablejs More content into html header * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files + * @param string[]|string $arrayofjs Array of complementary js files + * @param string[]|string $arrayofcss Array of complementary css files * @return void */ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = []) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 95d74648bdb..a04c5ab4ba9 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -47,7 +47,6 @@ parameters: reportMagicProperties: false treatPhpDocTypesAsCertain: false ignoreErrors: - - '#Function llxHeaderVierge invoked with 0 parameters, 1-6 required#' - '#Offset .* (?:isset\(\)) always exists and is not nullable#' - '#(?:Variable \$(?:_(?:FILES|POST|SERVER)|array_propal_object|baseUri|current_fiscal_period|d(?:b_create_(?:database|user)|olibarr_main_(?:db_prefix|url_root)|raftchecked)|erreur_ajout_date|isImageValid|keyforstripeterminalbank|(?:lo|mar)gin|max|n(?:ewProperty|um)|p(?:ermsgroupbyentitypluszero|ro(?:gressCalculated|parrayofkeyval)|ublic)|t(?:(?:itl|otal_tim)e|va_tx)|var)) in isset\(\) always exists and is not nullable#' - '#(?:Property CommonOrderLine::\$multicurrency_subprice \(float\) on left side of \?\?|isset\(\)) is not nullable#' From a340018cecab266ad8b795e46d4991c24c943184 Mon Sep 17 00:00:00 2001 From: sonikf <93765174+sonikf@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:35:23 +0300 Subject: [PATCH 2/3] New: Hide Down payment invoice mask when condition is met (#31270) --- htdocs/core/modules/facture/mod_facture_mercure.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 3c5334bfa03..40dc1034642 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -7,6 +7,7 @@ * Copyright (C) 2022 Anthony Berton * Copyright (C) 2024 Frédéric France * Copyright (C) 2024 MDW + * Copyright (C) 2024 Nick Fragoulis * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -102,9 +103,11 @@ class mod_facture_mercure extends ModeleNumRefFactures } // Prefix setting of deposit - $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):'; - $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1, '', 0, 3, 'tooltipdownpaymentmercure').''; - $texte .= ''; + if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) { + $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):'; + $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1, '', 0, 3, 'tooltipdownpaymentmercure').''; + $texte .= ''; + } $texte .= ''; $texte .= ''; @@ -155,7 +158,7 @@ class mod_facture_mercure extends ModeleNumRefFactures $mask = getDolGlobalString('FACTURE_MERCURE_MASK_REPLACEMENT', getDolGlobalString('FACTURE_MERCURE_MASK_INVOICE')); } elseif (is_object($invoice) && $invoice->type == 2) { $mask = getDolGlobalString('FACTURE_MERCURE_MASK_CREDIT'); - } elseif (is_object($invoice) && $invoice->type == 3) { + } elseif (is_object($invoice) && $invoice->type == 3 && !getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) { $mask = getDolGlobalString('FACTURE_MERCURE_MASK_DEPOSIT'); } else { $mask = getDolGlobalString('FACTURE_MERCURE_MASK_INVOICE'); From 8444883574f30099b4c98c0dc32095565334a357 Mon Sep 17 00:00:00 2001 From: sonikf <93765174+sonikf@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:36:11 +0300 Subject: [PATCH 3/3] Fix translation (#31275) * Fix translation * Fix translation * Fix translation * Fix translation --- htdocs/langs/en_US/admin.lang | 18 +++++++++--------- htdocs/langs/en_US/mails.lang | 2 +- htdocs/langs/en_US/stocks.lang | 2 +- htdocs/langs/en_US/website.lang | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index d8b86c9cc10..2d556f8d6c3 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1431,7 +1431,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists. AddAdressInList=Display Customer/Vendor address into combo lists.
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.
Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. -FieldEdition=Edition of field %s +FieldEdition=Modification of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) GetBarCode=Get barcode NumberingModules=Numbering models @@ -1808,15 +1808,15 @@ FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts ##### FCKeditor ##### AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: -FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements -FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements -FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services) -FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...). +FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements +FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements +FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services) +FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...). FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. -FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing) -FCKeditorForUserSignature=WYSIWYG creation/edition of user signature -FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing) -FCKeditorForTicket=WYSIWYG creation/edition for tickets +FCKeditorForMailing= WYSIWYG creation/modification for mass eMailings (Tools->eMailing) +FCKeditorForUserSignature=WYSIWYG creation/modification of user signature +FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->eMailing) +FCKeditorForTicket=WYSIWYG creation/modification for tickets ##### Stock ##### StockSetup=Stock module setup IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup. diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 39c3febe387..da701a26533 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -199,6 +199,6 @@ ModelTemplate=Email template YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI TitleOfMailHolder=Title of the e-mail goes here ContentOfMailHolder=Content of email goes here... -LastNews=Last News +LastNews=Latest News ListProducts= List of products PasswordReset=Password reset diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index bd87a858099..400a39ec951 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -227,7 +227,7 @@ ApplyPMP=Apply PMP FlushInventory=Flush inventory ConfirmFlushInventory=Do you confirm this action? InventoryFlushed=Inventory flushed -ExitEditMode=Exit edition +ExitEditMode=Exit edit mode inventoryDeleteLine=Delete line RegulateStock=Regulate Stock ListInventory=List diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 25a049843ee..24c3e4b7927 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -95,8 +95,8 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party YouMustDefineTheHomePage=You must first define the default Home page -OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that the inline editor may not works correctty when used on a grabbed external page. -OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site +OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that the inline editor might not work correctly when used on a grabbed external page. +OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site GrabImagesInto=Grab also images found into css and page. ImagesShouldBeSavedInto=Images should be saved into directory WebsiteRootOfImages=Root directory for website images