From 6c8293612d807d6eae8b9fd8daa45f7d962d96c1 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 26 Mar 2021 16:41:48 +0100 Subject: [PATCH 01/14] 13.0 --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 371c8be2f5e..18ae79180a0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,10 @@ htdocs/includes/squizlabs/ htdocs/includes/webmozart/ htdocs/.well-known/apple-developer-merchantid-domain-association + +cyberoffice/ +mycyberoffice/ + # Node Modules build/yarn-error.log build/node_modules/ From 1729497d621851330cbb40311bfdc905818763cf Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 20 Apr 2021 13:56:58 +0200 Subject: [PATCH 02/14] FIX Accountancy - Quadra export - wrong data on credit --- htdocs/accountancy/class/accountancyexport.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index e24b1abe8b1..f884add80de 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -555,7 +555,7 @@ class AccountancyExport $Tab['signe_montant'] = '+'; // The amount must be in centimes without decimal points. - $Tab['montant'] = str_pad(abs(($data->debit - $abs->credit) * 100), 12, '0', STR_PAD_LEFT); + $Tab['montant'] = str_pad(abs(($data->debit - $data->credit) * 100), 12, '0', STR_PAD_LEFT); $Tab['contrepartie'] = str_repeat(' ', 8); // Force date format : %d%m%y From 95c7657acef236f85c534f1300cc3a02d733c99f Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 20 Apr 2021 20:21:24 +0200 Subject: [PATCH 03/14] add gitingore for modulebuilders --- htdocs/modulebuilder/template/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/template/.gitignore b/htdocs/modulebuilder/template/.gitignore index 942cb8b03ba..150a55149b6 100644 --- a/htdocs/modulebuilder/template/.gitignore +++ b/htdocs/modulebuilder/template/.gitignore @@ -15,4 +15,6 @@ /.buildpath /.project # Other -*.back \ No newline at end of file +*.back +/.editorconfig +/.gitattributes From b2d6b73125ac16597b6d947519774c9f9bf6f6e2 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 20 Apr 2021 20:23:45 +0200 Subject: [PATCH 04/14] add gitingore for modulebuilders --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 18ae79180a0..371c8be2f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,10 +43,6 @@ htdocs/includes/squizlabs/ htdocs/includes/webmozart/ htdocs/.well-known/apple-developer-merchantid-domain-association - -cyberoffice/ -mycyberoffice/ - # Node Modules build/yarn-error.log build/node_modules/ From a15d58065facaf0ef2cd3e46f6f8222aa48d4a55 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 20 Apr 2021 20:25:51 +0200 Subject: [PATCH 05/14] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 371c8be2f5e..a008514f2ee 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,6 @@ yarn.lock package-lock.json doc/install.lock + +/htdocs/cyber* +/htdocs/mycyber* From efcc5e714a23eb4fe5a799ac7b2d2ea046014143 Mon Sep 17 00:00:00 2001 From: ksar <35605507+ksar-ksar@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:49:37 +0200 Subject: [PATCH 06/14] FIX #17363 --- htdocs/admin/payment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 925c8fd6ff4..61f935572d2 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -184,7 +184,7 @@ foreach ($dirmodels as $reldir) { print img_picto($langs->trans("Activated"), 'switch_on'); } else { - print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; + print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; } print ''; From 196ebbb8e8d3edf924bcefbd280f6b670a4de03f Mon Sep 17 00:00:00 2001 From: Indelog Date: Thu, 22 Apr 2021 19:18:47 +0200 Subject: [PATCH 07/14] Fix : empty email on public membership form We can validate the public membership form whith an empty email when `$conf->global->ADHERENT_MAIL_REQUIRED` is set. This fix it. --- htdocs/public/members/new.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 1946125dbc2..f850cdff35c 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -208,9 +208,12 @@ if (empty($reshook) && $action == 'add') { $error++; $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n"; } - if (GETPOST("email") && !isValidEmail(GETPOST("email"))) { + if ($conf->global->ADHERENT_MAIL_REQUIRED && empty(GETPOST('email'))) { + $error++; + $errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."
\n"; + } elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) { ++ $langs->load('errors'); $error++; - $langs->load("errors"); $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."
\n"; } $birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]); @@ -586,7 +589,7 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) { print ''; } // EMail -print ''.$langs->trans("Email").' *'."\n"; +print ''.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' *' : '').''."\n"; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { print ''.$langs->trans("Login").' *'."\n"; From e7a4699bd930c54372497f70bc3430d1d3f1c5c7 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 22 Apr 2021 17:26:46 +0000 Subject: [PATCH 08/14] Fixing style errors. --- htdocs/public/members/new.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index f850cdff35c..3d0ecc6fd16 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -212,7 +212,7 @@ if (empty($reshook) && $action == 'add') { $error++; $errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."
\n"; } elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) { -+ $langs->load('errors'); + + $langs->load('errors'); $error++; $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."
\n"; } From 8b49585b64137442fddeba4f51b7b43776236833 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 24 Apr 2021 18:21:36 +0200 Subject: [PATCH 09/14] fix: return invoice id when create from order --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4ae9fe197fe..8d0e2bb8b47 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1387,7 +1387,7 @@ class Facture extends CommonInvoice if (!$error) { - return 1; + return $ret; } else return -1; } else return -1; } From e229348e2c52eec63e7a599658158a4a0e409e99 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 24 Apr 2021 18:24:25 +0200 Subject: [PATCH 10/14] .gitignre --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index a008514f2ee..371c8be2f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,3 @@ yarn.lock package-lock.json doc/install.lock - -/htdocs/cyber* -/htdocs/mycyber* From bc924ca00ee4fd76270876a130df1a492d09700a Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sat, 24 Apr 2021 18:27:43 +0200 Subject: [PATCH 11/14] .gitignre --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 8d0e2bb8b47..4ae9fe197fe 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1387,7 +1387,7 @@ class Facture extends CommonInvoice if (!$error) { - return $ret; + return 1; } else return -1; } else return -1; } From 09d68dd7a649a4d8e84461ac24c852393d0feb15 Mon Sep 17 00:00:00 2001 From: jpb Date: Mon, 26 Apr 2021 17:00:53 +0200 Subject: [PATCH 12/14] fix the productCombination class on updatePrice --- htdocs/variants/class/ProductCombination.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php index 9152336bbe4..d01fd5c37c7 100644 --- a/htdocs/variants/class/ProductCombination.class.php +++ b/htdocs/variants/class/ProductCombination.class.php @@ -534,7 +534,7 @@ class ProductCombination $new_price += $variation_price; } - $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq); + $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(),$parent->default_vat_code); } } } else { From 8d07b43ccd9f19b3ea47d0fe7212e0b8049e274f Mon Sep 17 00:00:00 2001 From: jpb Date: Mon, 26 Apr 2021 17:05:21 +0200 Subject: [PATCH 13/14] space stickler --- htdocs/variants/class/ProductCombination.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php index d01fd5c37c7..51499ead88d 100644 --- a/htdocs/variants/class/ProductCombination.class.php +++ b/htdocs/variants/class/ProductCombination.class.php @@ -534,7 +534,7 @@ class ProductCombination $new_price += $variation_price; } - $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(),$parent->default_vat_code); + $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(), $parent->default_vat_code); } } } else { From a8136a00b1933b8891e3e28b416767aedabccde3 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 26 Apr 2021 15:07:41 +0000 Subject: [PATCH 14/14] Fixing style errors. --- htdocs/variants/class/ProductCombination.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php index 51499ead88d..bc479b68653 100644 --- a/htdocs/variants/class/ProductCombination.class.php +++ b/htdocs/variants/class/ProductCombination.class.php @@ -534,7 +534,7 @@ class ProductCombination $new_price += $variation_price; } - $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(), $parent->default_vat_code); + $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq, 0, array(), $parent->default_vat_code); } } } else {