diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 66f19044cee..5821d721314 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(); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 9bf0cce30c1..974ef427c29 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); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c7e6efc1a11..5c19e054fd0 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); } 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') { 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)