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:
philippe grand 2015-10-03 16:33:16 +02:00
commit 322928fbae
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/askpricesupplier/card.php
View File

@ -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();

2
htdocs/comm/propal.php
View File

@ -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); }

2
htdocs/compta/facture.php
View File

@ -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); }

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
}
// 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')
{

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

@ -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)
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)