From 17f6e5e48c98c0f96178014583bf9bd0e10866a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 2 Oct 2015 16:07:56 +0200 Subject: [PATCH 1/5] Update suppliers.lang --- htdocs/langs/en_US/suppliers.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 85b01c6c25a..46b7eb676d4 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -3,6 +3,7 @@ Suppliers=Suppliers AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice +ShowSupplierInvoice=Show Supplier Invoice NewSupplier=New supplier History=History ListOfSuppliers=List of suppliers @@ -43,4 +44,4 @@ ListOfSupplierOrders=List of supplier orders MenuOrdersSupplierToBill=Supplier orders to invoice NbDaysToDelivery=Delivery delay in days DescNbDaysToDelivery=The biggest deliver delay of the products from this order -UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval) \ No newline at end of file +UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval) From 8a984980caff02581ae1e05880261700ae81a22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 2 Oct 2015 16:16:05 +0200 Subject: [PATCH 2/5] Type (broken facture.php) --- htdocs/compta/facture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e23f1f9414a..7ecafd8732f 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1801,7 +1801,7 @@ if (empty($reshook)) $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); -$formmargin = new FormMargin($this->db); +$formmargin = new FormMargin($db); $bankaccountstatic = new Account($db); if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } From d451051d975b9c95e44f631f478f02808b6fedcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 2 Oct 2015 16:29:54 +0200 Subject: [PATCH 3/5] can't access documents for bank --- htdocs/core/lib/files.lib.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index c1b68d0f1b7..f9b6bbf8b61 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -2145,6 +2145,16 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu $original_file=$conf->banque->dir_output.'/bordereau/'.$original_file; // original_file should contains relative path so include the get_exdir result } + // Wrapping for bank + else if ($modulepart == 'bank') + { + if ($fuser->rights->banque->lire) + { + $accessallowed=1; + } + $original_file=$conf->bank->dir_output.'/'.$original_file; + } + // Wrapping for export module else if ($modulepart == 'export') { From f295b38ccb076f5eacda17486d5935a200190b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 2 Oct 2015 17:05:58 +0200 Subject: [PATCH 4/5] Typo --- htdocs/comm/propal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index e05c5a63dd9..b818e2cf440 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1184,7 +1184,7 @@ $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); $formpropal = new FormPropal($db); -$formmargin = new FormMargin($this->db); +$formmargin = new FormMargin($db); $companystatic = new Societe($db); if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } From f643613d69aa1deed8cab28b33eb5c1f05472a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 2 Oct 2015 17:07:22 +0200 Subject: [PATCH 5/5] Typo --- htdocs/comm/askpricesupplier/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 5b8bd88a920..e9c39c94eeb 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -978,7 +978,7 @@ $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); $formaskpricesupplier = new FormAskPriceSupplier($db); -$formmargin = new FormMargin($this->db); +$formmargin = new FormMargin($db); $companystatic = new Societe($db); $now = dol_now();