lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-03 19:05:25 +02:00
commit c4c8ffd675
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/files.lib.php
View File

@ -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 $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 // Wrapping for export module
else if ($modulepart == 'export') else if ($modulepart == 'export')
{ {

3
htdocs/langs/en_US/suppliers.lang
View File

@ -3,6 +3,7 @@ Suppliers=Suppliers
AddSupplier=Create a supplier AddSupplier=Create a supplier
SupplierRemoved=Supplier removed SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice SuppliersInvoice=Suppliers invoice
ShowSupplierInvoice=Show Supplier Invoice
NewSupplier=New supplier NewSupplier=New supplier
History=History History=History
ListOfSuppliers=List of suppliers ListOfSuppliers=List of suppliers
@ -43,4 +44,4 @@ ListOfSupplierOrders=List of supplier orders
MenuOrdersSupplierToBill=Supplier orders to invoice MenuOrdersSupplierToBill=Supplier orders to invoice
NbDaysToDelivery=Delivery delay in days NbDaysToDelivery=Delivery delay in days
DescNbDaysToDelivery=The biggest deliver delay of the products from this order 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) 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)