From 47e6ebcb8fb17132dadec4806449983cb6aa73ea Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 10 Oct 2020 08:31:07 +0200
Subject: [PATCH 1/2] expose mariaddb port on docker-compose

---
 build/docker/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index efdc95d2858..7e4ceda902e 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -12,8 +12,11 @@ services:
         environment:
             MYSQL_ROOT_PASSWORD: root
             MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
         networks:
             - internal-pod
+            - external-pod
 
     phpmyadmin:
         image: phpmyadmin/phpmyadmin

From 705b02960804c80a5b64bb7d57bd52ad8374a634 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 10 Oct 2020 10:22:58 +0200
Subject: [PATCH 2/2] fix return on filtered page when modify accountancy code

---
 htdocs/accountancy/admin/account.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 0ac79bcc3aa..866f2787943 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -481,11 +481,11 @@ if ($resql)
 		// Action
 		print '<td class="center">';
 		if ($user->rights->accounting->chartofaccount) {
-			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_delete();
 			print '</a>';
 		}