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

Merge remote-tracking branch 'origin/3.5' into 3.6

Browse Source 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
This commit is contained in:
Laurent Destailleur 2014-07-14 23:36:10 +02:00
commit 9acf60d7c5
10 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -155,6 +155,7 @@ Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure
Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages
Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action
Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty
Fix: [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
Fix: Import ProfId1 to siren and ProfId2 to siret
***** ChangeLog for 3.5.3 compared to 3.5.2 *****

4
build/rpm/dolibarr_fedora.spec
View File

@ -333,10 +333,10 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Jun 20 2014 Laurent Destailleur 3.5.4-0.3
* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release
* Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b
* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

4
build/rpm/dolibarr_generic.spec
View File

@ -569,10 +569,10 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Jun 20 2014 Laurent Destailleur 3.5.4-0.3
* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release
* Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b
* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

4
build/rpm/dolibarr_mandriva.spec
View File

@ -338,10 +338,10 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Jun 20 2014 Laurent Destailleur 3.5.4-0.3
* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release
* Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b
* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

4
build/rpm/dolibarr_opensuse.spec
View File

@ -349,10 +349,10 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Jun 20 2014 Laurent Destailleur 3.5.4-0.3
* Wed Jul 2 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release
* Fri May 9 2014 Laurent Destailleur 3.6.0-0.2.b
* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

2
htdocs/commande/orderstoinvoice.php
View File

@ -285,7 +285,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
'HT',
0,
$product_type,
$lines[$i]->rang,
$ii,
$lines[$i]->special_code,
$object->origin,
$lines[$i]->rowid,

4
htdocs/core/class/cookie.class.php
View File

@ -91,7 +91,9 @@ class DolCookie
$num = (count($this->cookiearray) - 2);
for ($f = 0; $f <= $num; $f++)
{
$this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey));
if (!empty($this->myKey)) {
$this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey));
}
}
return(base64_decode($this->myValue));

6
htdocs/core/class/html.formfile.class.php
View File

@ -4,6 +4,7 @@
* Copyright (c) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (c) 2013 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (c) 2014 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -801,10 +802,9 @@ class FormFile
// Preview
if (empty($useinecm))
{
$fileinfo = pathinfo($file['name']);
print '<td align="center">';
$tmp=explode('.',$file['name']);
if (count($tmp) == 3) $minifile=$tmp[0].'_mini.'.$tmp[1].'.'.strtolower($tmp[2]); // Thumbs are created with filename in lower case
else $minifile=$tmp[0].'_mini.'.strtolower($tmp[1]); // Thumbs are created with filename in lower case
$minifile=$fileinfo['filename'].'_mini.'.strtolower($fileinfo['extension']); // Thumbs are created with filename in lower case
if (image_format_supported($file['name']) > 0) print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($relativepath.'thumbs/'.$minifile).'" title="">';
else print '&nbsp;';
print '</td>';

9
htdocs/core/class/html.formprojet.class.php
View File

@ -165,9 +165,10 @@ class FormProjets
* Build Select List of element associable to a project
*
* @param string $table_element Table of the element to update
* @param int $socid socid to filter
* @return string The HTML select list of element
*/
function select_element($table_element)
function select_element($table_element,$socid=0)
{
global $conf;
@ -194,8 +195,8 @@ class FormProjets
$sql.= " FROM ".MAIN_DB_PREFIX.$table_element;
$sql.= " WHERE ".$projectkey." is null";
if (!empty($this->societe->id)) {
$sql.= " AND fk_soc=".$this->societe->id;
if (!empty($socid)) {
$sql.= " AND fk_soc=".$socid;
}
$sql.= ' AND entity='.getEntity('project');
$sql.= " ORDER BY ref DESC";
@ -229,4 +230,4 @@ class FormProjets
}
}
}

10
htdocs/projet/element.php
View File

@ -229,13 +229,11 @@ foreach ($listofreferent as $key => $value)
print_titre($langs->trans($title));
$selectList=$formproject->select_element($tablename);
if ($selectList<0) {
$selectList=$formproject->select_element($tablename,$project->societe->id);
if (!$selectList || ($selectList<0)) {
setEventMessage($formproject->error,'errors');
}
if ($selectList)
{
} else {
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
print '<input type="hidden" name="tablename" value="'.$tablename.'">';
print '<input type="hidden" name="action" value="addelement">';