| ';
print $langs->trans('SupplierCode').' | ';
print $object->code_fournisseur;
if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')';
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
new file mode 100644
index 00000000000..7f390973ec2
--- /dev/null
+++ b/htdocs/societe/website.php
@@ -0,0 +1,184 @@
+
+ * Copyright (C) 2005 Brice Davoleau
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2006-2015 Laurent Destailleur
+ * Copyright (C) 2007 Patrick Raguin
+ * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2015 Marcos García
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/societe/website.php
+ * \ingroup societe
+ * \brief Page of web sites accounts
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$langs->load("companies");
+
+$search_status=GETPOST('search_status');
+
+// Security check
+$id = GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe', $socid, '&societe');
+
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='a.login';
+if (! $sortorder) $sortorder='ASC';
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('websitethirdparty'));
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+ // Cancel
+ if (GETPOST('cancel','alpha') && ! empty($backtopage))
+ {
+ header("Location: ".$backtopage);
+ exit;
+ }
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+ {
+ $actioncode='';
+ $search_agenda_label='';
+ }
+}
+
+
+
+/*
+ * View
+ */
+
+$contactstatic = new Contact($db);
+
+$form = new Form($db);
+
+if ($id > 0)
+{
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+ $langs->load("companies");
+
+
+ $object = new Societe($db);
+ $result = $object->fetch($id);
+
+ $title=$langs->trans("WebisteAccounts");
+ llxHeader('',$title);
+
+ $head = societe_prepare_head($object);
+
+ dol_fiche_head($head, 'websites', $langs->trans("ThirdParty"), -1, 'company');
+
+ $linkback = ''.$langs->trans("BackToList").'';
+
+ dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+ print '';
+
+ print ' ';
+
+ print ' ';
+
+ // Prefix
+ if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+ {
+ print '| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ';
+ }
+
+ if ($object->client)
+ {
+ print '| ';
+ print $langs->trans('CustomerCode').' | ';
+ print $object->code_client;
+ if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')';
+ print ' | ';
+ }
+
+ if ($object->fournisseur)
+ {
+ print '| ';
+ print $langs->trans('SupplierCode').' | ';
+ print $object->code_fournisseur;
+ if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')';
+ print ' | ';
+ }
+
+ print ' ';
+
+ print '
';
+
+ $param='&id='.$id;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+
+ print_barre_liste($langs->trans("WebsiteAccounts"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
+
+
+
+
+
+
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index 6a20b34d302..bac39e67d87 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -34,7 +34,7 @@ CKEDITOR.editorConfig = function( config )
[
['Templates','NewPage'],
['Save'],
- ['Source','Maximize','Preview'],
+ ['Maximize','Preview'],
['PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'], // 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
['CreateDiv','ShowBlocks'],
@@ -46,7 +46,8 @@ CKEDITOR.editorConfig = function( config )
['Link','Unlink','Anchor'],
['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
['Styles','Format','Font','FontSize'],
- ['TextColor','BGColor']
+ ['TextColor','BGColor'],
+ ['Source']
];
// Used for mailing fields
diff --git a/htdocs/theme/eldy/img/object_movement.png b/htdocs/theme/eldy/img/object_movement.png
new file mode 100644
index 00000000000..aec344a3f8d
Binary files /dev/null and b/htdocs/theme/eldy/img/object_movement.png differ
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 6677e240a04..0f26169adf3 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -312,18 +312,14 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
$resql=$db->query($sql);
if ($resql)
{
- $var=true;
$num = $db->num_rows($resql);
- if ($num > 0)
- {
- print '';
+ print '';
- print '';
- print ' | ';
- print ' ';
- }
+ print '';
+ print ' | ';
+ print ' ';
$i = 0;
while ($i < $num && $i < $MAXLIST)
@@ -343,7 +339,8 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
}
$db->free($resql);
- if ($num > 0) print " ";
+ if ($num <= 0) print ''.$langs->trans("None").'';
+ print " | ";
}
else
{
@@ -369,18 +366,14 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
$resql=$db->query($sql);
if ($resql)
{
- $var=true;
$num = $db->num_rows($resql);
- if ($num > 0)
- {
- print '';
+ print '';
- print '';
- print ' | ';
- print ' ';
- }
+ print '';
+ print ' | ';
+ print ' ';
$i = 0;
while ($i < $num && $i < $MAXLIST)
@@ -402,7 +395,8 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
}
$db->free($resql);
- if ($num > 0) print " ";
+ if ($num <= 0) print ''.$langs->trans("None").'';
+ print " | ";
}
else
{
@@ -428,18 +422,14 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
$resql=$db->query($sql);
if ($resql)
{
- $var=true;
$num = $db->num_rows($resql);
- if ($num > 0)
- {
- print '';
+ print '';
- print '';
- print ' | ';
- print ' ';
- }
+ print '';
+ print ' | ';
+ print ' ';
$i = 0;
while ($i < $num && $i < $MAXLIST)
@@ -460,7 +450,8 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
}
$db->free($resql);
- if ($num > 0) print " ";
+ if ($num <= 0) print ''.$langs->trans("None").'';
+ print " | ";
}
else
{
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 106fa322cf1..a62ac060d74 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -46,7 +46,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
$id = GETPOST('id','int');
$action = GETPOST('action','alpha');
@@ -370,9 +369,6 @@ if (empty($reshook)) {
$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth'), GETPOST('dateemploymentday'), GETPOST('dateemploymentyear'));
$object->dateemployment = $dateemployment;
- $object->default_range = GETPOST('default_range');
- $object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
-
if (! empty($conf->multicompany->enabled))
{
if (! empty($_POST["superadmin"]))
@@ -1126,20 +1122,6 @@ if ($action == 'create' || $action == 'adduserldap')
}
*/
- if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
- {
- print '| '.$langs->trans("DefaultCategoryCar").' | ';
- print '';
- print $form->selectExpenseCategories($object->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1);
- print ' | ';
-
- print '| '.$langs->trans("DefaultRangeNumber").' | ';
- print '';
- $maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat);
- print $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
- print ' | ';
- }
-
// Other attributes
$parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -1540,19 +1522,6 @@ else
print ''.dol_print_date($object->datepreviouslogin,"dayhour").' | ';
print " |
\n";
- if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
- {
- print '