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

Comment

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-02 12:55:00 +02:00
parent 52523effc8
commit c62687d198
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/translation/txpull.sh
View File

@ -26,7 +26,6 @@ fi
if [ "x$1" = "xall" ] if [ "x$1" = "xall" ]
then then
cd htdocs/lang
for dir in `find htdocs/langs/* -type d` for dir in `find htdocs/langs/* -type d`
do do
fic=`basename $dir` fic=`basename $dir`

2
htdocs/admin/supplier_order.php
View File

@ -185,7 +185,7 @@ else if ($action == 'set_SUPPLIER_ORDER_OTHER')
// TODO We add/delete permission until permission can have a condition on a global var // TODO We add/delete permission until permission can have a condition on a global var
$r_id = 1190; $r_id = 1190;
$entity = $conf->entity; $entity = $conf->entity;
$r_desc='Permission for second approval'; $r_desc=$langs->trans("Permission1190");
$r_modul='fournisseur'; $r_modul='fournisseur';
$r_type='w'; $r_type='w';
$r_perms='commande'; $r_perms='commande';

2
htdocs/product/class/product.class.php
View File

@ -1583,7 +1583,7 @@ class Product extends CommonObject
$this->db->free($resql); $this->db->free($resql);
// Retrieve all extrafield for thirdparty // Retreive all extrafield for current object
// fetch optionals attributes and labels // fetch optionals attributes and labels
require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
$extrafields=new ExtraFields($this->db); $extrafields=new ExtraFields($this->db);