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

remove superfluous spaces

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-08-12 19:59:39 +02:00
parent 62db9a4022
commit 6113b536a0
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/accountancy/admin/importaccounts.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com> /* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2017 Alexandre Spangaro <aspangaro@zendsi.com> * Copyright (C) 2013-2017 Alexandre Spangaro <aspangaro@zendsi.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/accountancy/admin/importaccounts.php * \file htdocs/accountancy/admin/importaccounts.php
* \ingroup Advanced accountancy * \ingroup Advanced accountancy
* \brief Page import accounting account * \brief Page import accounting account
*/ */
@ -83,7 +83,7 @@ if ($_POST["action"] == 'import') {
$accounting->pcg_type = $monType; $accounting->pcg_type = $monType;
$accounting->pcg_subtype = $monSubType; $accounting->pcg_subtype = $monSubType;
$accounting->active = 1; $accounting->active = 1;
$result = $accounting->create($user); $result = $accounting->create($user);
if ($result > 0) { if ($result > 0) {
setEventMessages($langs->trans("AccountingAccountAdd"), null, 'mesgs'); setEventMessages($langs->trans("AccountingAccountAdd"), null, 'mesgs');
@ -101,7 +101,7 @@ if ($_POST["action"] == 'import') {
print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>'; print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
} }
// list accounting account from product // list accounting account from product
$sql = "(SELECT p.rowid as product_id, p.accountancy_code_sell as accounting "; $sql = "(SELECT p.rowid as product_id, p.accountancy_code_sell as accounting ";
$sql .= " FROM " . MAIN_DB_PREFIX . "product as p "; $sql .= " FROM " . MAIN_DB_PREFIX . "product as p ";
@ -172,9 +172,9 @@ if ($result) {
print '</tr>'; print '</tr>';
$i ++; $i ++;
} }
print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Import") . '"></td></tr>'; print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Import") . '"></td></tr>';
print '</table>'; print '</table>';
print '</form>'; print '</form>';
} else { } else {

5
htdocs/comm/action/class/actioncomm.class.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2011-2017 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2017 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
@ -1223,7 +1223,7 @@ class ActionComm extends CommonObject
if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id)) if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id))
$option = 'nolink'; $option = 'nolink';
$label = $this->label; $label = $this->label;
if (empty($label)) $label=$this->libelle; // For backward compatibility if (empty($label)) $label=$this->libelle; // For backward compatibility
@ -1679,4 +1679,3 @@ class ActionComm extends CommonObject
} }
} }

8
htdocs/core/js/blockUI.js
View File

@ -41,7 +41,7 @@ $(document).ready(function() {
'-moz-border-radius': '10px', '-moz-border-radius': '10px',
'border-radius': '10px' 'border-radius': '10px'
}, },
// styles applied when using $.growlUI // styles applied when using $.growlUI
dolEventErrorCSS: { dolEventErrorCSS: {
width: '350px', width: '350px',
@ -60,7 +60,7 @@ $(document).ready(function() {
} }
};*/ };*/
$.dolEventValid = function(title, message, timeout, onClose) { $.dolEventValid = function(title, message, timeout, onClose) {
var $m = $('<div class="dolEventValid"></div>'); var $m = $('<div class="dolEventValid"></div>');
if (title) $m.append('<h1>'+title+'</h1>'); if (title) $m.append('<h1>'+title+'</h1>');
@ -73,7 +73,7 @@ $(document).ready(function() {
css: $.blockUI.events.dolEventValidCSS css: $.blockUI.events.dolEventValidCSS
}); });
}; };
$.dolEventError = function(title, message, timeout, onClose) { $.dolEventError = function(title, message, timeout, onClose) {
var $m = $('<div class="dolEventError"></div>'); var $m = $('<div class="dolEventError"></div>');
if (title) $m.append('<h1>'+title+'</h1>'); if (title) $m.append('<h1>'+title+'</h1>');
@ -87,7 +87,7 @@ $(document).ready(function() {
}); });
$('.dolEventError').click($.unblockUI); $('.dolEventError').click($.unblockUI);
}; };
$.pleaseBePatient = function(message) { $.pleaseBePatient = function(message) {
$.blockUI({ $.blockUI({
message: message, message: message,

6
htdocs/core/tpl/advtarget.tpl.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
* To change this license header, choose License Headers in Project Properties. * To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
@ -36,8 +36,8 @@ print '<script type="text/javascript" language="javascript">
}); });
}); });
</script>'; </script>';
print_fiche_titre($langs->trans("AdvTgtTitle")); print_fiche_titre($langs->trans("AdvTgtTitle"));
print '<div class="tabBar">' . "\n"; print '<div class="tabBar">' . "\n";

2
htdocs/resource/list.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2013-2014 Jean-François Ferry <jfefe@aternatik.fr> /* Copyright (C) 2013-2014 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or