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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-04-02 11:21:11 +02:00
commit 663a3bd45c
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/rpm/dolibarr_generic.spec
View File

@ -305,6 +305,11 @@ done >>%{name}.lang
%post %post
echo Run post script of packager dolibarr_generic.spec echo Run post script of packager dolibarr_generic.spec
echo Detected constant fedora=0%{?fedora}
echo Detected constant rhel_version=0%{?rhel_version}
echo Detected constant centos_version=0%{?centos_version}
echo Detected constant mdkversion=0%{?mdkversion}
echo Detected constant suse_version=0%{?suse_version}
# Define vars # Define vars
export docdir="/var/lib/dolibarr/documents" export docdir="/var/lib/dolibarr/documents"
@ -465,9 +470,12 @@ echo Restart mysql server
%else %else
%if 0%{?suse_version} %if 0%{?suse_version}
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /sbin/service mysqld restart
else #/etc/init.d/mysqld restart
fi
if [ -f /etc/init.d/mysql ]; then
/sbin/service mysql restart /sbin/service mysql restart
#/etc/init.d/mysql restart
fi fi
%else %else
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then

5
build/rpm/dolibarr_opensuse.spec
View File

@ -289,8 +289,9 @@ fi
# Restart mysql # Restart mysql
echo Restart mysql echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /sbin/service mysqld restart
else fi
if [ -f /etc/init.d/mysql ]; then
/sbin/service mysql restart /sbin/service mysql restart
fi fi

14
htdocs/categories/class/categorie.class.php
View File

@ -292,6 +292,20 @@ class Categorie
$this->db->begin(); $this->db->begin();
/* FIX #1317 : Check for child cat and move up 1 level*/
if (! $error)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."categorie";
$sql.= " SET fk_parent = ".$this->fk_parent;
$sql.= " WHERE fk_parent = ".$this->id;
if (!$this->db->query($sql))
{
$this->error=$this->db->lasterror();
dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
$error++;
}
}
if (! $error) if (! $error)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_societe"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_societe";

5
htdocs/core/lib/company.lib.php
View File

@ -775,15 +775,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
<div id="dialog" title="<?php echo dol_escape_htmltag($langs->trans('Address')); ?>" style="display: none;"></div> <div id="dialog" title="<?php echo dol_escape_htmltag($langs->trans('Address')); ?>" style="display: none;"></div>
<?php <?php
print '<script type="text/javascript"> print '<script type="text/javascript">
$("#dialog").dialog() function copyToClipboard (text) {
function copyToClipboard (text) {
text = text.replace(/<br \/>/g,"\n"); text = text.replace(/<br \/>/g,"\n");
var newElem = "<textarea id=\"coords\" style=\"border: none; width: 90%; height: 120px;\">"+text+"</textarea><br/><br/>'.$langs->trans('HelpCopyToClipboard').'"; var newElem = "<textarea id=\"coords\" style=\"border: none; width: 90%; height: 120px;\">"+text+"</textarea><br/><br/>'.$langs->trans('HelpCopyToClipboard').'";
$("#dialog").html(newElem); $("#dialog").html(newElem);
$("#dialog").dialog(); $("#dialog").dialog();
$("#coords").select(); $("#coords").select();
return false; return false;
} }
</script>'; </script>';
return $i; return $i;