From eba4d44c81c4b0f7f7dea8268af519e6566c1902 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 20 Aug 2020 20:24:00 +0200 Subject: [PATCH 01/11] Fix Stripe icon in balance list --- htdocs/societe/paymentmodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 0de15ef9481..b29a3073c85 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -1331,7 +1331,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' // List of Stripe payment modes if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $object->fournisseur && !empty($stripesupplieracc)) { - print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, ''); + print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s'); $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc)); print ''."\n"; print ''; From 142ce7c03f810d1fd70aeff8673d2db2f6fe6158 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 04:58:21 +0200 Subject: [PATCH 02/11] Fix Missing language key --- htdocs/product/fournisseurs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 563fb881152..9140de09513 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.cl require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; if (!empty($conf->barcode->enabled)) dol_include_once('/core/class/html.formbarcode.class.php'); // Load translation files required by the page -$langs->loadLangs(array('products', 'suppliers', 'bills', 'margins')); +$langs->loadLangs(array('products', 'suppliers', 'bills', 'margins', 'stocks')); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); From bd5e35c15f91b8ce1993447be2cf9e2f6b74a8cd Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:00:38 +0200 Subject: [PATCH 03/11] Fix Missing language key --- htdocs/langs/en_US/main.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 8f79f9525ec..6d2892cddad 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1071,4 +1071,5 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi NotUsedForThisCustomer=Not used for this customer AmountMustBePositive=Amount must be positive ByStatus=By status -InformationMessage=Information \ No newline at end of file +InformationMessage=Information +Used=Used From 881a9b7c047468b743ce9578038673d3aeb93adc Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:10:19 +0200 Subject: [PATCH 04/11] Fix Missing language key on rights --- htdocs/langs/en_US/admin.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 90b95883673..73991c172cb 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -851,6 +851,7 @@ Permission773=Delete expense reports Permission774=Read all expense reports (even for user not subordinates) Permission775=Approve expense reports Permission776=Pay expense reports +Permission777=Read expense reports of everybody Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses @@ -2011,4 +2012,4 @@ MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values. TemplateAdded=Template added TemplateUpdated=Template updated -TemplateDeleted=Template deleted \ No newline at end of file +TemplateDeleted=Template deleted From 646d5cc9c89f1c4ad9511319d52f7448d5db5747 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:19:57 +0200 Subject: [PATCH 05/11] Fix Missing language key on rights --- htdocs/langs/en_US/admin.lang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 73991c172cb..acfc58b7ad2 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -839,6 +839,10 @@ Permission532=Create/modify services Permission534=Delete services Permission536=See/manage hidden services Permission538=Export services +Permission561=Read bank transfer payment orders +Permission562=Create/modify a bank transfer payment order +Permission563=Send/Transmit bank transfer payment order +Permission564=Record Debits/Rejects of bank transfer payment order Permission650=Read Bills of Materials Permission651=Create/Update Bills of Materials Permission652=Delete Bills of Materials From dd87362ce372a985903e6d0c861b3ec3286d0f78 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:20:53 +0200 Subject: [PATCH 06/11] Fix Missing language key on rights --- htdocs/langs/en_US/admin.lang | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index acfc58b7ad2..1e72900bd12 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -846,6 +846,9 @@ Permission564=Record Debits/Rejects of bank transfer payment order Permission650=Read Bills of Materials Permission651=Create/Update Bills of Materials Permission652=Delete Bills of Materials +Permission660=Read Manufacturing Order +Permission661=Create/Update Manufacturing Order +Permission662=Delete Manufacturing Order Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations From 76315fa6ac559b6ebc6dac89141da9e0142840b3 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:22:31 +0200 Subject: [PATCH 07/11] Fix Missing language key on rights --- htdocs/langs/en_US/admin.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1e72900bd12..af561bf89c1 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -911,6 +911,7 @@ Permission2515=Setup documents directories Permission2801=Use FTP client in read mode (browse and download only) Permission2802=Use FTP client in write mode (delete or upload files) Permission3200=Read archived events and fingerprints +Permission3301=Generate new modules Permission4001=See employees Permission4002=Create employees Permission4003=Delete employees From 065ace5301d32d32519ae3e4604f3b8495787d6d Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 21 Aug 2020 05:26:07 +0200 Subject: [PATCH 08/11] Fix Missing language key on rights --- htdocs/langs/en_US/admin.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index af561bf89c1..341164ee2c7 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -846,9 +846,9 @@ Permission564=Record Debits/Rejects of bank transfer payment order Permission650=Read Bills of Materials Permission651=Create/Update Bills of Materials Permission652=Delete Bills of Materials -Permission660=Read Manufacturing Order -Permission661=Create/Update Manufacturing Order -Permission662=Delete Manufacturing Order +Permission660=Read Manufacturing Order (MO) +Permission661=Create/Update Manufacturing Order (MO) +Permission662=Delete Manufacturing Order (MO) Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations From bf28201685a65d70f82be93bf816d6e4d08f76aa Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 23 Aug 2020 07:13:43 +0200 Subject: [PATCH 09/11] Fix Missing language key --- htdocs/core/class/infobox.class.php | 4 ++-- htdocs/langs/en_US/boxes.lang | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index de00ea85e6f..ffba924b1ea 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -41,7 +41,7 @@ class InfoBox { return array( 0 => 'Home', - 27 => 'Accountancy Home' + 27 => 'AccountancyHome' ); } else @@ -74,7 +74,7 @@ class InfoBox 24 => 'expensereportindex', 25 => 'mailingindex', 26 => 'opensurveyindex', - 27 => 'Accountancy Home' + 27 => 'AccountancyHome' ); } } diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index bd62684421a..2405bfd5e64 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -100,3 +100,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined BoxLastCustomerShipments=Last customer shipments BoxTitleLastCustomerShipments=Latest %s customer shipments NoRecordedShipments=No recorded customer shipment +# Pages +AccountancyHome=Accountancy From 9b7691c8d2459717e1ea7f82f95ca1386cb810bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Aug 2020 18:04:02 +0200 Subject: [PATCH 10/11] Update admin.lang --- htdocs/langs/en_US/admin.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 341164ee2c7..72c741c9056 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -839,10 +839,10 @@ Permission532=Create/modify services Permission534=Delete services Permission536=See/manage hidden services Permission538=Export services -Permission561=Read bank transfer payment orders -Permission562=Create/modify a bank transfer payment order -Permission563=Send/Transmit bank transfer payment order -Permission564=Record Debits/Rejects of bank transfer payment order +Permission561=Read payment orders by credit transfer +Permission562=Create/modify payment order by credit transfer +Permission563=Send/Transmit payment order by credit transfer +Permission564=Record Debits/Rejections of credit transfer Permission650=Read Bills of Materials Permission651=Create/Update Bills of Materials Permission652=Delete Bills of Materials From 6685cc5bc8ab4b74669cfedfacbd9f95872a3044 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Aug 2020 18:07:18 +0200 Subject: [PATCH 11/11] Update admin.lang --- htdocs/langs/en_US/admin.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 72c741c9056..482f89b30e7 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -859,6 +859,7 @@ Permission774=Read all expense reports (even for user not subordinates) Permission775=Approve expense reports Permission776=Pay expense reports Permission777=Read expense reports of everybody +Permission778=Create/modify expense reports of everybody Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses