diff --git a/COPYRIGHT b/COPYRIGHT
index d97b00721dad3dd40b28e71c77864081702179b4..4272219f80b4a5a377b6d500a0ae3fbff3810652 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -9,37 +9,39 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt
Dolibarr uses some external libraries released under different licences. This is compatibility summary:
-Composant Version License Compatible GPL Usage
+Composant Version License Compatible GPL Usage
----------------------------------------------------------------------------
PHP libraries:
-AdoDb-Date 0.21 Modified BSD License Yes Date convertion (not into rpm package)
-CKEditor 3.6.4 LGPL-2.1+ Yes Editor WYSIWYG
-FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management (with FPDF_TPL 1.2)
-GeoIP 2004 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
-NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
-OdtPHP 1.0.1 GPL-2+ Yes Library to build/edit ODT files
-PHPExcel 1.7.6 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
-PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
-TCPDF 5.9.180 LGPL-3+ Yes PDF generation
+AdoDb-Date 0.21 Modified BSD License Yes Date convertion (not into rpm package)
+CKEditor 3.6.4 LGPL-2.1+ Yes Editor WYSIWYG
+FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management (with FPDF_TPL 1.2)
+GeoIP 2004 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
+NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
+OdtPHP 1.0.1 GPL-2+ Yes Library to build/edit ODT files
+PHPExcel 1.7.6 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
+PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
+TCPDF 5.9.180 LGPL-3+ Yes PDF generation
JS libraries:
-jQuery 1.8.2 MIT Licence Yes JS library
-jQuery UI 1.9.1 GPL and MIT Licence Yes JS library plugin UI
-jQuery Timepicker 1.1.0 GPL and MIT Licence Yes JS library Timepicker addon for Datepicker
-jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
-jQuery DataTables 1.9.4 BSD Yes JS library for tables output
-jQuery Flot 0.7 MIT Licence Yes JS library to build graph
-jQuery FileUpload 5.0.3 GPL and MIT Licence Yes JS library to upload files
-jQuery JCrop 0.9.8 GPL and MIT Licence Yes JS library plugin Crop (to crop images)
-jQuery jeditable 1.7.1 GPL and MIT Licence Yes JS library plugin jeditable (to edit in place)
-jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
-jQuery blockUI 2.43 GPL and MIT Licence Yes JS library plugin blockUI (to use ajax popups)
-jQuery jPicker 1.1.00 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
-jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
-jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
-jQuery Mobile 1.3 GPL and MIT Licence Yes JS library for smartphone (not used)
-jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
-JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
+jQuery 1.8.2 MIT Licence Yes JS library
+jQuery UI 1.9.1 GPL and MIT Licence Yes JS library plugin UI
+jQuery blockUI 2.43 GPL and MIT Licence Yes JS library plugin blockUI (to use ajax popups)
+jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
+jQuery DataTables 1.9.4 BSD Yes JS library for tables output
+jQuery FileUpload 5.0.3 GPL and MIT Licence Yes JS library to upload files
+jQuery Flot 0.7 MIT Licence Yes JS library to build graph
+jQuery JCrop 0.9.8 GPL and MIT Licence Yes JS library plugin Crop (to crop images)
+jQuery jeditable 1.7.1 GPL and MIT Licence Yes JS library plugin jeditable (to edit in place)
+jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
+jQuery jPicker 1.1.00 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery jqueryFileTree 1.0.1 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery jquerytreeview 1.4.1 MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
+jQuery Mobile 1.3 GPL and MIT Licence Yes JS library for smartphone (not used)
+jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker 1.1.0 GPL and MIT Licence Yes JS library Timepicker addon for Datepicker
+jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
+JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
For licenses compatibility informations:
http://www.fsf.org/licensing/licenses/index_html
diff --git a/ChangeLog b/ChangeLog
index 722047b75467de53647c8154fba1db8c440985d5..2ef52f1354a76bbe87eb5a3b0ce092a8d0041cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,8 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #816 ] Sales journal does not reflect localtaxes
- Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price
- Fix: Orderstoinvoice didn't act as expected when no order was checked
+- Fix: Bad link to all proposals into Third party card if customer is prospect
+- Fix: [ bug #789 ] VAT not being calculated in POS
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 3538a3908d1de83114fdd5ee68cfc5fe1824a18a..292252c2716e176f7c1f910f463748e063373444 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -118,7 +118,7 @@ class Facturation
}
// Define part of HT, VAT, TTC
- $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',$product->type,0);
+ $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',0,$product->type,0);
// Calcul du total ht sans remise
$total_ht = $resultarray[0];
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 6090e909920dbc170f090464009978933350d7f7..c178c37078b49e1b0394299b73204025ffe4812b 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1,34 +1,34 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
- * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
- * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2010-2011 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
+* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
+* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
+* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
+* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
+* Copyright (C) 2010-2011 Philippe Grand <philippe.grand@atoo-net.com>
+* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+*
+* 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 <http://www.gnu.org/licenses/>.
+*/
/**
* \file htdocs/comm/propal.php
- * \ingroup propale
- * \brief Page of commercial proposals card and list
- */
+* \ingroup propale
+* \brief Page of commercial proposals card and list
+*/
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -54,7 +54,7 @@ $langs->load('orders');
$langs->load('products');
$langs->load("deliveries");
if (! empty($conf->margin->enabled))
- $langs->load('margins');
+ $langs->load('margins');
$error=0;
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('propalcard'));
/*
* Actions
- */
+*/
$parameters=array('socid'=>$socid);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
@@ -201,19 +201,19 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
else if ($action == 'setdate' && $user->rights->propal->creer)
{
- $datep=dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-
- if (empty($datep))
- {
- $error++;
- setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
- }
-
- if (! $error)
- {
- $result=$object->set_date($user,$datep);
- if ($result < 0) dol_print_error($db,$object->error);
- }
+ $datep=dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+
+ if (empty($datep))
+ {
+ $error++;
+ setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
+ }
+
+ if (! $error)
+ {
+ $result=$object->set_date($user,$datep);
+ if ($result < 0) dol_print_error($db,$object->error);
+ }
}
else if ($action == 'setecheance' && $user->rights->propal->creer)
{
@@ -257,7 +257,7 @@ else if ($action == 'add' && $user->rights->propal->creer)
if (empty($datep))
{
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
- $action='create';
+ $action='create';
$error++;
}
if (empty($duration))
@@ -276,123 +276,123 @@ else if ($action == 'add' && $user->rights->propal->creer)
if (! $error)
{
- $db->begin();
-
- // Si on a selectionne une propal a copier, on realise la copie
- if (GETPOST('createmode')=='copy' && GETPOST('copie_propal'))
- {
- if ($object->fetch(GETPOST('copie_propal')) > 0)
- {
- $object->ref = GETPOST('ref');
- $object->datep = $datep;
- $object->date_livraison = $date_delivery;
- $object->availability_id = GETPOST('availability_id');
- $object->demand_reason_id = GETPOST('demand_reason_id');
- $object->fk_delivery_address = GETPOST('fk_address');
- $object->duree_validite = $duration;
- $object->cond_reglement_id = GETPOST('cond_reglement_id');
- $object->mode_reglement_id = GETPOST('mode_reglement_id');
- $object->remise_percent = GETPOST('remise_percent');
- $object->remise_absolue = GETPOST('remise_absolue');
- $object->socid = GETPOST('socid');
- $object->contactid = GETPOST('contactidp');
- $object->fk_project = GETPOST('projectid');
- $object->modelpdf = GETPOST('model');
- $object->author = $user->id; // deprecated
- $object->note = GETPOST('note');
- $object->statut = 0;
-
- $id = $object->create_from($user);
- }
- else
- {
- setEventMessage($langs->trans("ErrorFailedToCopyProposal",GETPOST('copie_propal')), 'errors');
- }
- }
- else
- {
- $object->ref = GETPOST('ref');
- $object->ref_client = GETPOST('ref_client');
- $object->datep = $datep;
- $object->date_livraison = $date_delivery;
- $object->availability_id = GETPOST('availability_id');
- $object->demand_reason_id = GETPOST('demand_reason_id');
- $object->fk_delivery_address = GETPOST('fk_address');
- $object->duree_validite = GETPOST('duree_validite');
- $object->cond_reglement_id = GETPOST('cond_reglement_id');
- $object->mode_reglement_id = GETPOST('mode_reglement_id');
-
- $object->contactid = GETPOST('contactidp');
- $object->fk_project = GETPOST('projectid');
- $object->modelpdf = GETPOST('model');
- $object->author = $user->id; // deprecated
- $object->note = GETPOST('note');
-
- $object->origin = GETPOST('origin');
- $object->origin_id = GETPOST('originid');
-
- for ($i = 1 ; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i++)
- {
- if ($_POST['idprod'.$i])
- {
- $xid = 'idprod'.$i;
- $xqty = 'qty'.$i;
- $xremise = 'remise'.$i;
- $object->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
- }
- }
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
- $id = $object->create($user);
- }
-
- if ($id > 0)
- {
- // Insertion contact par defaut si defini
- if (GETPOST('contactidp'))
- {
- $result=$object->add_contact(GETPOST('contactidp'),'CUSTOMER','external');
- if ($result < 0)
- {
- $error++;
- setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
- }
- }
-
- if (! $error)
- {
- $db->commit();
-
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- // Define output language
- $outputlangs = $langs;
- if (! empty($conf->global->MAIN_MULTILANGS))
- {
- $outputlangs = new Translate("",$conf);
- $newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
- $outputlangs->setDefaultLang($newlang);
- }
- $ret=$object->fetch($id); // Reload to get new records
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
- }
-
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
- exit;
- }
- else
- {
- $db->rollback();
- }
- }
- else
- {
- dol_print_error($db,$object->error);
- $db->rollback();
- exit;
- }
+ $db->begin();
+
+ // Si on a selectionne une propal a copier, on realise la copie
+ if (GETPOST('createmode')=='copy' && GETPOST('copie_propal'))
+ {
+ if ($object->fetch(GETPOST('copie_propal')) > 0)
+ {
+ $object->ref = GETPOST('ref');
+ $object->datep = $datep;
+ $object->date_livraison = $date_delivery;
+ $object->availability_id = GETPOST('availability_id');
+ $object->demand_reason_id = GETPOST('demand_reason_id');
+ $object->fk_delivery_address = GETPOST('fk_address');
+ $object->duree_validite = $duration;
+ $object->cond_reglement_id = GETPOST('cond_reglement_id');
+ $object->mode_reglement_id = GETPOST('mode_reglement_id');
+ $object->remise_percent = GETPOST('remise_percent');
+ $object->remise_absolue = GETPOST('remise_absolue');
+ $object->socid = GETPOST('socid');
+ $object->contactid = GETPOST('contactidp');
+ $object->fk_project = GETPOST('projectid');
+ $object->modelpdf = GETPOST('model');
+ $object->author = $user->id; // deprecated
+ $object->note = GETPOST('note');
+ $object->statut = 0;
+
+ $id = $object->create_from($user);
+ }
+ else
+ {
+ setEventMessage($langs->trans("ErrorFailedToCopyProposal",GETPOST('copie_propal')), 'errors');
+ }
+ }
+ else
+ {
+ $object->ref = GETPOST('ref');
+ $object->ref_client = GETPOST('ref_client');
+ $object->datep = $datep;
+ $object->date_livraison = $date_delivery;
+ $object->availability_id = GETPOST('availability_id');
+ $object->demand_reason_id = GETPOST('demand_reason_id');
+ $object->fk_delivery_address = GETPOST('fk_address');
+ $object->duree_validite = GETPOST('duree_validite');
+ $object->cond_reglement_id = GETPOST('cond_reglement_id');
+ $object->mode_reglement_id = GETPOST('mode_reglement_id');
+
+ $object->contactid = GETPOST('contactidp');
+ $object->fk_project = GETPOST('projectid');
+ $object->modelpdf = GETPOST('model');
+ $object->author = $user->id; // deprecated
+ $object->note = GETPOST('note');
+
+ $object->origin = GETPOST('origin');
+ $object->origin_id = GETPOST('originid');
+
+ for ($i = 1 ; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i++)
+ {
+ if ($_POST['idprod'.$i])
+ {
+ $xid = 'idprod'.$i;
+ $xqty = 'qty'.$i;
+ $xremise = 'remise'.$i;
+ $object->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
+ }
+ }
+
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+ $id = $object->create($user);
+ }
+
+ if ($id > 0)
+ {
+ // Insertion contact par defaut si defini
+ if (GETPOST('contactidp'))
+ {
+ $result=$object->add_contact(GETPOST('contactidp'),'CUSTOMER','external');
+ if ($result < 0)
+ {
+ $error++;
+ setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
+ }
+ }
+
+ if (! $error)
+ {
+ $db->commit();
+
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ {
+ // Define output language
+ $outputlangs = $langs;
+ if (! empty($conf->global->MAIN_MULTILANGS))
+ {
+ $outputlangs = new Translate("",$conf);
+ $newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ $ret=$object->fetch($id); // Reload to get new records
+ propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ }
+
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ exit;
+ }
+ else
+ {
+ $db->rollback();
+ }
+ }
+ else
+ {
+ dol_print_error($db,$object->error);
+ $db->rollback();
+ exit;
+ }
}
}
@@ -432,7 +432,7 @@ else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST(
/*
* Add file in email form
- */
+*/
if (GETPOST('addfile'))
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -447,7 +447,7 @@ if (GETPOST('addfile'))
/*
* Remove file in email form
- */
+*/
if (GETPOST('removedfile'))
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -463,7 +463,7 @@ if (GETPOST('removedfile'))
/*
* Send mail
- */
+*/
if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
{
$langs->load('mails');
@@ -661,7 +661,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
$pu_ttc=0;
$price_min=0;
$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-
+
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
// Ecrase $txtva par celui du produit
@@ -738,18 +738,18 @@ else if ($action == "addline" && $user->rights->propal->creer)
$desc = $prod->description;
}
- $desc=dol_concatdesc($desc,$product_desc);
-
- // Add custom code and origin country into description
- if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
- {
- $tmptxt='(';
- if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
- if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
- if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
- $tmptxt.=')';
- $desc= dol_concatdesc($desc, $tmptxt);
- }
+ $desc=dol_concatdesc($desc,$product_desc);
+
+ // Add custom code and origin country into description
+ if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+ {
+ $tmptxt='(';
+ if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
+ if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
+ if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
+ $tmptxt.=')';
+ $desc= dol_concatdesc($desc, $tmptxt);
+ }
}
$type = $prod->type;
@@ -768,7 +768,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
// Margin
$fournprice=(GETPOST('fournprice')?GETPOST('fournprice'):'');
$buyingprice=(GETPOST('buying_price')?GETPOST('buying_price'):'');
-
+
$date_start=dol_mktime(0, 0, 0, GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
$date_end=dol_mktime(0, 0, 0, GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
@@ -875,7 +875,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
$date_start=dol_mktime(0, 0, 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
$date_end=dol_mktime(0, 0, 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-
+
// Define special_code for special lines
$special_code=0;
if (! GETPOST('qty')) $special_code=3;
@@ -1068,7 +1068,7 @@ else if ($action == 'setmode' && $user->rights->propal->creer)
/*
* Ordonnancement des lignes
- */
+*/
else if ($action == 'up' && $user->rights->propal->creer)
{
@@ -1202,7 +1202,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->
/*
* View
- */
+*/
llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
@@ -1465,7 +1465,7 @@ else
{
/*
* Show object in view mode
- */
+ */
$soc = new Societe($db);
$soc->fetch($object->socid);
@@ -1510,7 +1510,7 @@ else
// Confirm validate proposal
else if ($action == 'validate')
{
- $error=0;
+ $error=0;
// on verifie si l'objet est en numerotation provisoire
$ref = substr($object->ref, 1, 4);
@@ -1519,8 +1519,8 @@ else
$numref = $object->getNextNumRef($soc);
if (empty($numref))
{
- $error++;
- dol_htmloutput_errors($object->error);
+ $error++;
+ dol_htmloutput_errors($object->error);
}
}
else
@@ -1542,8 +1542,8 @@ else
if (! $formconfirm)
{
- $parameters=array('lineid'=>$lineid);
- $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ $parameters=array('lineid'=>$lineid);
+ $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
}
// Print form confirm
@@ -1691,11 +1691,11 @@ else
print '</td><td colspan="3">';
if ($action == 'editconditions')
{
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print '</td>';
print '</tr>';
@@ -1844,54 +1844,54 @@ else
}
// TODO : use showOptionals($extrafields) function
- foreach($extrafields->attribute_label as $key=>$label)
- {
- $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
- if ($extrafields->attribute_type[$key] == 'separate')
- {
- print $extrafields->showSeparator($key);
- }
- else
- {
- print '<tr><td';
- if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
- print '>'.$label.'</td><td colspan="3">';
-
- // Convert date into timestamp format
- if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
- {
- $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
- }
-
- if ($action == 'edit_extras' && $user->rights->propal->creer)
- {
- print $extrafields->showInputField($key,$value);
- }
- else
- {
- print $extrafields->showOutputField($key,$value);
- }
- print '</td></tr>'."\n";
- }
- }
-
- if(count($extrafields->attribute_label) > 0) {
-
- if ($action == 'edit_extras' && $user->rights->propal->creer)
- {
- print '<tr><td></td><td>';
- print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
- print '</form>';
- print '</td></tr>';
-
- }
- else {
- if ($object->statut == 0 && $user->rights->propal->creer)
- {
- print '<tr><td></td><td><a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras">'.img_picto('','edit').' '.$langs->trans('Modify').'</a></td></tr>';
- }
- }
- }
+ foreach($extrafields->attribute_label as $key=>$label)
+ {
+ $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+ if ($extrafields->attribute_type[$key] == 'separate')
+ {
+ print $extrafields->showSeparator($key);
+ }
+ else
+ {
+ print '<tr><td';
+ if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+ print '>'.$label.'</td><td colspan="3">';
+
+ // Convert date into timestamp format
+ if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
+ {
+ $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
+ }
+
+ if ($action == 'edit_extras' && $user->rights->propal->creer)
+ {
+ print $extrafields->showInputField($key,$value);
+ }
+ else
+ {
+ print $extrafields->showOutputField($key,$value);
+ }
+ print '</td></tr>'."\n";
+ }
+ }
+
+ if(count($extrafields->attribute_label) > 0) {
+
+ if ($action == 'edit_extras' && $user->rights->propal->creer)
+ {
+ print '<tr><td></td><td>';
+ print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+ print '</form>';
+ print '</td></tr>';
+
+ }
+ else {
+ if ($object->statut == 0 && $user->rights->propal->creer)
+ {
+ print '<tr><td></td><td><a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras">'.img_picto('','edit').' '.$langs->trans('Modify').'</a></td></tr>';
+ }
+ }
+ }
}
// Amount HT
@@ -1901,9 +1901,9 @@ else
// Margin Infos
if (! empty($conf->margin->enabled)) {
- print '<td valign="top" width="50%" rowspan="4">';
- $object->displayMarginInfos();
- print '</td>';
+ print '<td valign="top" width="50%" rowspan="4">';
+ $object->displayMarginInfos();
+ print '</td>';
}
print '</tr>';
@@ -1953,7 +1953,7 @@ else
/*
* Lines
- */
+ */
if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
{
@@ -2006,18 +2006,18 @@ else
{
/*
* Formulaire cloture (signe ou non)
- */
+ */
$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
$form_close.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$form_close.= '<table class="border" width="100%">';
- $form_close.= '<tr><td width="150" align="left">'.$langs->trans("CloseAs").'</td><td align="left">';
- $form_close.= '<input type="hidden" name="action" value="setstatut">';
- $form_close.= '<select id="statut" name="statut" class="flat">';
- $form_close.= '<option value="0"> </option>';
- $form_close.= '<option value="2">'.$object->labelstatut[2].'</option>';
- $form_close.= '<option value="3">'.$object->labelstatut[3].'</option>';
- $form_close.= '</select>';
- $form_close.= '</td></tr>';
+ $form_close.= '<tr><td width="150" align="left">'.$langs->trans("CloseAs").'</td><td align="left">';
+ $form_close.= '<input type="hidden" name="action" value="setstatut">';
+ $form_close.= '<select id="statut" name="statut" class="flat">';
+ $form_close.= '<option value="0"> </option>';
+ $form_close.= '<option value="2">'.$object->labelstatut[2].'</option>';
+ $form_close.= '<option value="3">'.$object->labelstatut[3].'</option>';
+ $form_close.= '</select>';
+ $form_close.= '</td></tr>';
$form_close.= '<tr><td width="150" align="left">'.$langs->trans('Note').'</td><td align="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
$form_close.= $object->note;
$form_close.= '</textarea></td></tr>';
@@ -2034,7 +2034,7 @@ else
/*
* Boutons Actions
- */
+ */
if ($action != 'presend')
{
print '<div class="tabsAction">';
@@ -2044,8 +2044,8 @@ else
// Validate
if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 && $user->rights->propal->valider)
{
- if (count($object->lines) > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate">'.$langs->trans('Validate').'</a></div>';
- //else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
+ if (count($object->lines) > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate">'.$langs->trans('Validate').'</a></div>';
+ //else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
}
// Edit
@@ -2064,34 +2064,34 @@ else
// Send
if ($object->statut == 1 || $object->statut == 2)
{
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a></div>';
- }
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send)
+ {
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a></div>';
+ }
+ else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
}
- // Create an order
- if (! empty($conf->commande->enabled) && $object->statut == 2 && $user->societe_id == 0)
- {
- if ($user->rights->commande->creer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';
- }
- }
+ // Create an order
+ if (! empty($conf->commande->enabled) && $object->statut == 2 && $user->societe_id == 0)
+ {
+ if ($user->rights->commande->creer)
+ {
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';
+ }
+ }
- // Create contract
- if ($conf->contrat->enabled && $object->statut == 2 && $user->societe_id == 0)
- {
- $langs->load("contracts");
+ // Create contract
+ if ($conf->contrat->enabled && $object->statut == 2 && $user->societe_id == 0)
+ {
+ $langs->load("contracts");
if ($user->rights->contrat->creer)
{
- print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/fiche.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans('AddContract').'</a></div>';
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/fiche.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans('AddContract').'</a></div>';
}
- }
+ }
- // Create an invoice and classify billed
+ // Create an invoice and classify billed
if ($object->statut == 2 && $user->societe_id == 0)
{
if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
@@ -2129,18 +2129,19 @@ else
}
print '</div>';
- print "<br>\n";
}
+ print "<br>\n";
if ($action != 'presend')
{
- print '<table width="100%"><tr><td width="50%" valign="top">';
- print '<a name="builddoc"></a>'; // ancre
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+ //print '<a name="builddoc"></a>'; // ancre
/*
* Documents generes
- */
+ */
$filename=dol_sanitizeFileName($object->ref);
$filedir=$conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2154,54 +2155,60 @@ else
/*
* Linked object block
- */
+ */
$somethingshown=$object->showLinkedObjectBlock();
- print '</td><td valign="top" width="50%">';
+
+
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+ //print '</td><td valign="top" width="50%">';
+
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'propal',$socid);
- print '</td></tr></table>';
+
+ //print '</td></tr></table>';
+ print '</div></div></div>';
}
/*
* Action presend
- *
- */
+ *
+ */
if ($action == 'presend')
{
$ref = dol_sanitizeFileName($object->ref);
- include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref,'/'));
- $file=$fileparams['fullname'];
-
- // Build document if it not exists
- if (! $file || ! is_readable($file))
- {
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
-
- $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
- if ($result <= 0)
- {
- dol_print_error($db,$result);
- exit;
- }
- $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref,'/'));
- $file=$fileparams['fullname'];
- }
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref,'/'));
+ $file=$fileparams['fullname'];
+
+ // Build document if it not exists
+ if (! $file || ! is_readable($file))
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ if ($result <= 0)
+ {
+ dol_print_error($db,$result);
+ exit;
+ }
+ $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref,'/'));
+ $file=$fileparams['fullname'];
+ }
print '<br>';
print_titre($langs->trans('SendPropalByMail'));
@@ -2227,28 +2234,28 @@ else
// Tableau des substitutions
$formmail->substit['__PROPREF__']=$object->ref;
- $formmail->substit['__SIGNATURE__']=$user->signature;
- $formmail->substit['__PERSONALIZED__']='';
- $formmail->substit['__CONTACTCIVNAME__']='';
-
- //Find the good contact adress
- $custcontact='';
- $contactarr=array();
- $contactarr=$object->liste_contact(-1,'external');
-
- if (is_array($contactarr) && count($contactarr)>0) {
- foreach($contactarr as $contact) {
- if ($contact['libelle']==$langs->trans('TypeContact_propal_external_CUSTOMER')) {
- $contactstatic=new Contact($db);
- $contactstatic->fetch($contact['id']);
- $custcontact=$contactstatic->getFullName($langs,1);
- }
- }
-
- if (!empty($custcontact)) {
- $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
- }
- }
+ $formmail->substit['__SIGNATURE__']=$user->signature;
+ $formmail->substit['__PERSONALIZED__']='';
+ $formmail->substit['__CONTACTCIVNAME__']='';
+
+ //Find the good contact adress
+ $custcontact='';
+ $contactarr=array();
+ $contactarr=$object->liste_contact(-1,'external');
+
+ if (is_array($contactarr) && count($contactarr)>0) {
+ foreach($contactarr as $contact) {
+ if ($contact['libelle']==$langs->trans('TypeContact_propal_external_CUSTOMER')) {
+ $contactstatic=new Contact($db);
+ $contactstatic->fetch($contact['id']);
+ $custcontact=$contactstatic->getFullName($langs,1);
+ }
+ }
+
+ if (!empty($custcontact)) {
+ $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+ }
+ }
// Tableau des parametres complementaires
$formmail->param['action']='send';
@@ -2258,10 +2265,10 @@ else
// Init list of files
- if (GETPOST("mode")=='init')
+ if (GETPOST("mode")=='init')
{
$formmail->clear_attached_files();
- $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+ $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
}
$formmail->show_form();
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 1588a0761d3ac433312e13b1b9ad9b95267a81b5..7f92b7e65c0d6d5a6495401cbd9b9a6bccc01cc8 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -269,7 +269,8 @@ if ($socid > 0)
print_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
print '<table class="border" width="100%">';
print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>';
- print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+ print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">';
+ print '<span class="hideonsmartphone"> '.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
print '<tr><td width="38%">'.$langs->trans("VAT").'</td>';
print '<td>';
print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$objsoc);
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 350051705d261f17c8a8fe3eed8b1c9962e2aa04..2a501f10f73f30596a69804cef7079208b454560 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -9,17 +9,17 @@
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- *
+ *
* 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 <http://www.gnu.org/licenses/>.
*/
@@ -272,7 +272,7 @@ else if ($action == 'add' && $user->rights->commande->creer)
{
$object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
}
-
+
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -373,7 +373,7 @@ else if ($action == 'add' && $user->rights->commande->creer)
{
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
+
$object_id = $object->create($user);
// If some invoice's lines already known
@@ -2307,7 +2307,7 @@ else
/*
* Boutons actions
- */
+ */
if ($action != 'presend')
{
if ($user->societe_id == 0 && $action <> 'editline')
@@ -2435,19 +2435,19 @@ else
print '</div>';
}
- print '<br>';
}
+ print '<br>';
if ($action != 'presend')
{
- print '<table width="100%"><tr><td width="50%" valign="top">';
- print '<a name="builddoc"></a>'; // ancre
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+ //print '<a name="builddoc"></a>'; // ancre
/*
* Documents generes
- *
- */
+ */
$comref = dol_sanitizeFileName($object->ref);
$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
$relativepath = $comref.'/'.$comref.'.pdf';
@@ -2461,17 +2461,19 @@ else
/*
* Linked object block
- */
+ */
$somethingshown=$object->showLinkedObjectBlock();
- print '</td><td valign="top" width="50%">';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+ //print '</td><td valign="top" width="50%">';
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'order',$socid);
- print '</td></tr></table>';
+ //print '</td></tr></table>';
+ print '</div></div></div>';
}
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 45678f54fb48673043da5c28e89b70f44d1648ba..7830abef6550be4c9358c0ac38d84ffbee63618f 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -27,7 +27,7 @@
* \brief List of details of bank transactions for an account
*/
-require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -35,7 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
$id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 64e518243386f3f4c3a4ca4c0d7aa7c89bb055ac..ada636adb330517ba37c9c45d99eb2db00b9df8c 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -23,9 +23,12 @@
* \brief Page reporting mensuel Entrees/Sorties d'un compte bancaire
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$id=GETPOST('account');
$ref=GETPOST('ref');
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 31d929dfed537d391970935a632152a80ac676f6..402dbeda0957b3bf462c392c0530775b2a4f35c0 100644
--- a/htdocs/compta/bank/bankid_fr.php
+++ b/htdocs/compta/bank/bankid_fr.php
@@ -24,11 +24,13 @@
* \brief Fiche creation compte bancaire
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
$action=GETPOST('action');
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 7ee5d069e11af5da53ff7108058379985a6a6113..2224627cd94191184bd64522600f2b6f1900cc8c 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -22,7 +22,11 @@
* \brief Page de bilan
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
if (!$user->rights->banque->lire)
accessforbidden();
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index d513c65fb30312bdd1065b5eeb4ce79d7c821b56..e14b3e92df60315269a373be0266b6753d351808 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -23,9 +23,11 @@
* \brief Page de budget
*/
-require 'pre.inc.php';
-
-$langs->load("categories");
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 423abdf9fb989166341824047cdc3729a7846d76..9fcd579bc159bcbbd52cf5d2e98e22fbc3913775 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -23,7 +23,11 @@
* \brief Page ajout de categories bancaires
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
if (!$user->rights->banque->configurer)
accessforbidden();
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index b811e35f7d7a8c8c46a0c5dd5db1df3b2f4e007c..e7d6fbbce9f8b95a297aed5605ef2c2a8e6b273d 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -24,13 +24,15 @@
* \brief Page to create/view a bank account
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("companies");
$action=GETPOST("action");
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index fb4e2a09a868fbff456bce16cbae9d610c417fdb..932acf5dcb5d5bb737a9112e6ef7415e09a05950 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -23,12 +23,13 @@
* \brief Page graph des transactions bancaires
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-
-$langs->load("banks");
+
+$langs->load("banks");
+$langs->load("categories");
$WIDTH=DolGraph::getDefaultGraphSizeForStats('width',768);
$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',200);
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 54f89cd95e6f13d5772802c9c0080bfc69ca98ce..344231cea5d7550be1f88f031164c5e5633a9e8b 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -23,13 +23,14 @@
* \brief Home page of bank module
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id) $socid=$user->societe_id;
@@ -232,20 +233,20 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
// Total
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
-
-
print "</table>";
+print "<br>";
/*
* Boutons d'actions
*/
-print "<br><div class=\"tabsAction\">\n";
-if ($user->rights->banque->configurer) {
+
+print '<div class="tabsAction">'."\n";
+if ($user->rights->banque->configurer)
+{
print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
- print '<a class="butAction" href="categ.php">'.$langs->trans("Rubriques").'</a>';
}
-print "</div>";
+print '</div>';
llxFooter();
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 2a94840e3b73570d4508870c27225c8baeb1615e..a4a871cec93bd875608eb4594d8aaf30c94d7e3d 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -21,11 +21,13 @@
* \brief Onglet info d'une ecriture bancaire
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("companies");
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 58675900a8cae1f5aa4da8c068819700b2f889ef..dcad7cd4f222479e7a073f2f5d643a34378b4fc3 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -25,13 +25,13 @@
* \brief Page to edit a bank transaction record
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("banks");
+$langs->load("categories");
$langs->load("compta");
$langs->load("bills");
-$langs->load("categories");
if (! empty($conf->adherent->enabled)) $langs->load("members");
diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php
deleted file mode 100644
index a507c4c0a715093847b0c559ea2f817909887f0c..0000000000000000000000000000000000000000
--- a/htdocs/compta/bank/pre.inc.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
- * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.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
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/compta/bank/pre.inc.php
- * \ingroup compta
- * \brief Fichier gestionnaire du menu compta banque
- */
-
-require_once realpath(dirname(__FILE__)) . '/../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-
-/**
- * Replace the default llxHeader function
- *
- * @param string $head Optionnal head lines
- * @param string $title HTML title
- * @param string $help_url Link to online url help to show on left menu
- * @param string $target Force target on menu links
- * @param int $disablejs More content into html header
- * @param int $disablehead More content into html header
- * @param array $arrayofjs Array of complementary js files
- * @param array $arrayofcss Array of complementary css files
- * @return none
- */
-function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
- global $db, $user, $conf, $langs;
-
- top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
- top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
- $menu = new Menu();
-
- // Entry for each bank account
- if ($user->rights->banque->lire)
- {
- $sql = "SELECT rowid, label, courant, rappro, courant";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " AND clos = 0";
- $sql.= " ORDER BY label";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $numr = $db->num_rows($resql);
- $i = 0;
-
- if ($numr > 0) $menu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-
- while ($i < $numr)
- {
- $objp = $db->fetch_object($resql);
- $menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
- if ($objp->rappro && $objp->courant != 2 && empty($objp->clos)) // If not cash account and not closed and can be reconciliate
- {
- $menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
- }
- $i++;
- }
- }
- else dol_print_error($db);
- $db->free($resql);
- }
-
- left_menu('', $help_url, '', $menu->liste, 1);
- main_area();
-}
-?>
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 4e8b717201c29edbd59e1c0f5c06d4d8591bee6a..e38ce88633a1b4e057019f7b62e5c67c6b736ad2 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -23,7 +23,7 @@
* \brief Page to reconciliate bank transactions
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -31,8 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
if (! $user->rights->banque->consolidate) accessforbidden();
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index f3603da2d6d2d0677a7616b72310b4f3b7efa80e..adbed8ea74041cb337fb53598409b9c7020b8810 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -23,15 +23,16 @@
* \brief Page d'affichage d'un releve
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-
-$action=GETPOST('action', 'alpha');
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("companies");
-$langs->load("banks");
$langs->load("bills");
+$action=GETPOST('action', 'alpha');
$id=GETPOST('account');
$ref=GETPOST('ref');
$dvid=GETPOST('dvid');
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index f7cbf8f86293f1d6de47a37982fb5351619f2aa6..9117a099fb5c82c4c9373f7eab00570838a66224 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -24,11 +24,14 @@
* \brief List of bank transactions
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id) $socid=$user->societe_id;
@@ -134,9 +137,9 @@ if ($resql)
// Title
$bankcateg=new BankCateg($db);
- if (! empty($_REQUEST["bid"]))
+ if (GETPOST("bid"))
{
- $result=$bankcateg->fetch($_REQUEST["bid"]);
+ $result=$bankcateg->fetch(GETPOST("bid"));
print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
}
else
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index eb39379ace0f9e0bb583120c17dc1c0ce4b7f267..91f05a2fdaa463d7a4919ab6fc1102d976f353e4 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -23,14 +23,16 @@
* \brief Page de detail du budget de tresorerie
*/
-require 'pre.inc.php';
+require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
// Security check
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 2908039a26d7c38aa85e0abfe045d673b7e05923..f770c5bc3712f93bdd3634564da6ddd0c8c07486 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -24,10 +24,12 @@
* \brief Page de saisie d'un virement
*/
-require 'pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
if (! $user->rights->banque->transfer)
accessforbidden();
@@ -36,8 +38,9 @@ $action = GETPOST('action','alpha');
/*
- * Action ajout d'un virement
+ * Actions
*/
+
if ($action == 'add')
{
$langs->load("errors");
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 3cc3677d30137f02ab7a9dff852c5c02cf005f71..53e839e024111f43bc5eefaabae72c02fd0b1e61 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2122,7 +2122,7 @@ if ($action == 'create')
}
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
-
+
//print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea></td></tr>';
// Private note
@@ -3440,12 +3440,13 @@ else if ($id > 0 || ! empty($ref))
print '</div>';
}
}
-
+ print '<br>';
if ($action != 'prerelance' && $action != 'presend')
{
- print '<table width="100%"><tr><td width="50%" valign="top">';
- print '<a name="builddoc"></a>'; // ancre
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+ //print '<a name="builddoc"></a>'; // ancre
/*
* Documents generes
@@ -3456,7 +3457,6 @@ else if ($id > 0 || ! empty($ref))
$genallowed=$user->rights->facture->creer;
$delallowed=$user->rights->facture->supprimer;
- print '<br>';
print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
$somethingshown=$formfile->numoffiles;
@@ -3472,16 +3472,16 @@ else if ($id > 0 || ! empty($ref))
print showPaypalPaymentUrl('invoice',$object->ref);
}
- print '</td><td valign="top" width="50%">';
-
- print '<br>';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+ //print '</td><td valign="top" width="50%">';
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'invoice',$socid);
- print '</td></tr></table>';
+ //print '</td></tr></table>';
+ print '</div></div></div>';
}
else
{
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index 6347a847e36cf1c2ee038bcb0ffaa785302827c0..8a24ab3ce290c0740fd5a12bceaf18d6727b0a46 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -24,14 +24,15 @@
* \brief Page for cheque deposits
*/
-require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load('bills');
-$langs->load('banks');
$langs->load('companies');
$langs->load('compta');
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index b3ccf19ae19277c06e401332179991e0c9b0b7db..cfde42a5cf3a81303d44b7c73498b95e5b2da62c 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -23,11 +23,12 @@
* \brief Home page for cheque receipts
*/
-require 'pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php
index 3f4b1d12cbdedc29db04d2594aa3041ca9faa154..8370bd95551e4808bd99ac0fdfc5b39ce5f95c47 100644
--- a/htdocs/compta/paiement/cheque/liste.php
+++ b/htdocs/compta/paiement/cheque/liste.php
@@ -23,10 +23,12 @@
* \brief Page liste des bordereau de remise de cheque
*/
-require 'pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
// Security check
diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php
deleted file mode 100644
index bc730c9740d5ee0e56cd4789a5a8a9d8c3815cf8..0000000000000000000000000000000000000000
--- a/htdocs/compta/paiement/cheque/pre.inc.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.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
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/compta/paiement/cheque/pre.inc.php
- * \ingroup compta
- * \brief Fichier gestionnaire du menu cheques
- */
-
-require_once realpath(dirname(__FILE__)) . '/../../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-
-/**
- * Replace the default llxHeader function
- *
- * @param string $head Optionnal head lines
- * @param string $title HTML title
- * @param string $help_url Link to online url help to show on left menu
- * @param string $target Force target on menu links
- * @param int $disablejs More content into html header
- * @param int $disablehead More content into html header
- * @param array $arrayofjs Array of complementary js files
- * @param array $arrayofcss Array of complementary css files
- * @return none
- */
-function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
- global $db, $user, $conf, $langs;
-
- top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
- top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
- $menu = new Menu();
-
- // Entry for each bank account
- if ($user->rights->banque->lire)
- {
- $sql = "SELECT rowid, label, courant, rappro, courant";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " AND clos = 0";
- $sql.= " ORDER BY label";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $numr = $db->num_rows($resql);
- $i = 0;
-
- if ($numr > 0) $menu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-
- while ($i < $numr)
- {
- $objp = $db->fetch_object($resql);
- $menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
- if ($objp->rappro && $objp->courant != 2) // If not cash account and can be reconciliate
- {
- $menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
- }
- $i++;
- }
- }
- else dol_print_error($db);
- $db->free($resql);
- }
-
- left_menu('', $help_url, '', $menu->liste, 1);
- main_area();
-}
-
-?>
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index 792fd012fdf3b84ab8c6cf89c39f8445df3db0bf..6448a5b3df5cf793de628852034f6509d71ea36c 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -23,11 +23,14 @@
* \brief Fiche apercu du bon de prelevement
*/
-require '../bank/pre.inc.php';
+require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("bills");
$langs->load("categories");
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index bc69163e00077c173d9cd549b28de709606e4fdc..218d8fb95237c20e9511e430b33a11d9da76f9d4 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -24,11 +24,13 @@
* \brief Page liste des bons de prelevements
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("widthdrawals");
-$langs->load("categories");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 054a73db0623255fc81b6d3ced5c84b666cbafcb..5be91cb8044af7b302acc41ddc2a5bbdc885ce12 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -24,16 +24,18 @@
* \brief Prelevement creation page
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("widthdrawals");
$langs->load("companies");
-$langs->load("banks");
$langs->load("bills");
// Security check
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 3d685d18e940633b6f6a1818335028164df116d5..4d83076c6009960cf8310003c400a14966e3a4dc 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -24,14 +24,16 @@
* \brief Page to list withdraw requests
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("widthdrawals");
$langs->load("companies");
-$langs->load("categories");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0ec6018f9ebcbb2a04a86a4aba504d1198190b03..5271dbd03b433cf193915648e4708b87e2df83ad 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -24,14 +24,16 @@
* \brief Page liste des factures prelevees
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("companies");
-$langs->load("categories");
$langs->load('withdrawals');
// Securite acces client
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index c88df2483a3d52662674973022d2ea65583e4d6b..3cc372094a379f9f4385cdd97f96dbd014dc88db 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -24,13 +24,15 @@
* \brief Withdraw reject
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load('withdrawals');
// Securite acces client
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 28cf71231b561ecad6fa2a2ea3241dbabf7e1238..20e9c09145f017586f759f7e3dd5c565ffe94865 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -23,17 +23,19 @@
* \brief Prelevement statistics
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load("withdrawals");
// Security check
if ($user->societe_id > 0) accessforbidden();
-$langs->load("withdrawals");
-$langs->load("categories");
-
// Get supervariables
$prev_id = GETPOST('id','int');
$page = GETPOST('page','int');
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 895d5b35080ad711bacaae59dcd1b4fdb5ae9ccc..283f0c241833c8b0530fc77e1c32a5e946e575da 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -23,16 +23,19 @@
* \brief Fiche prelevement
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
if (!$user->rights->prelevement->bons->lire)
accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
-$langs->load("categories");
// Security check
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index f685922e167e3589b8d565a124d63fa55dc7b0ae..c1d0a0aaa3fe0a298b114bbc3fff48fd6aca16e3 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -24,14 +24,16 @@
* \brief Prelevement index page
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("withdrawals");
-$langs->load("categories");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index d2c8c71e62a4f7c0cb7f5c9fc3ab38db6569e140..5f7e17fb6799e914c07db6f06a0fed4f170f8d65 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -24,18 +24,21 @@
* \brief card of withdraw line
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id > 0) accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
-$langs->load("categories");
// Get supervariables
$action = GETPOST('action','alpha');
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 0f87e78213daeda38c35e69cb8659b84e89fa749..298effa2b15b9702c0f6e2f3b004f5393090ed66 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -24,17 +24,20 @@
* \brief Prelevement lines
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
// Security check
if ($user->societe_id > 0) accessforbidden();
-$langs->load("categories");
$langs->load('withdrawals');
// Get supervariables
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index 3d49c05026861c307a52bb4bfff9115b3e3ab290..1410b177ff2feaef3727cefa8553332aa0aae0fc 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -23,10 +23,12 @@
* \ingroup prelevement
* \brief Page liste des prelevements
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
$langs->load("withdrawals");
$langs->load("companies");
$langs->load("categories");
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index b22289b5f5020eb9869cb781c0a96ce24aa39a3c..012c236463596ccdf1bf5f3fa33996e31b0fef42 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -24,13 +24,15 @@
* \brief Reject page
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("withdrawals");
$langs->load("companies");
-$langs->load("categories");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index a2edee3061e6d244987d3fe320bfab26766892c4..419fb7eb3e877b140a7266c85ab1ea114455314d 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -24,12 +24,14 @@
* \brief Page de stats des prelevements
*/
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
$langs->load("withdrawals");
$langs->load("companies");
-$langs->load("categories");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 70065d7b7d20e5b6d47579d97da71c05b9df6a30..2ec6539db9eab1ee45d236daa2f1d35cdac9a26f 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.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
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 1f85a99916d6a336f4185a3182d272b28ebb755a..6fbd0a23143e79bdbb8f4bfea54c0c386f74097c 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -115,6 +115,8 @@ class ChargeSociales extends CommonObject
*/
function create($user)
{
+ global $conf;
+
// Nettoyage parametres
$newamount=price2num($this->amount,'MT');
@@ -127,10 +129,11 @@ class ChargeSociales extends CommonObject
$this->db->begin();
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount)";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)";
$sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',";
$sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',";
- $sql.= " ".price2num($newamount);
+ $sql.= " '".price2num($newamount)."',";
+ $sql.= " ".$conf->entity;
$sql.= ")";
dol_syslog(get_class($this)."::create sql=".$sql);
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index ab393c12ba24555bb0891d48d2dd66ae816d5956..34dc0262c2e785c029816afbef13f8f95411620e 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -500,13 +500,13 @@ class Tva extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (datep, datev, amount";
if ($this->note) $sql.=", note";
if ($this->label) $sql.=", label";
- $sql.= ", fk_user_creat, fk_bank";
+ $sql.= ", fk_user_creat, fk_bank, entity";
$sql.= ") ";
$sql.= " VALUES ('".$this->db->idate($this->datep)."',";
$sql.= "'".$this->db->idate($this->datev)."'," . $this->amount;
if ($this->note) $sql.=", '".$this->db->escape($this->note)."'";
if ($this->label) $sql.=", '".$this->db->escape($this->label)."'";
- $sql.=", '".$user->id."', NULL";
+ $sql.=", '".$user->id."', NULL, ".$conf->entity;
$sql.= ")";
dol_syslog("Tva::addPayment sql=".$sql);
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
index c8139c5575fa3937c91085fdd2918d6a5fde3dc8..a95f7b85963d4a3154214d30f027d36532c2c074 100644
--- a/htdocs/compta/tva/fiche.php
+++ b/htdocs/compta/tva/fiche.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.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
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8d2d4a4f5d69611fd6f1cbe9422045eda1f011b4..9f8a2aabf7d88ce07318785f581c3bddb40b8cc4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1418,7 +1418,7 @@ abstract class CommonObject
dol_syslog(get_class($this)."::upate_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
return -2;
}
-
+
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
$sql.= " WHERE rowid =". $this->id;
@@ -1441,7 +1441,7 @@ abstract class CommonObject
/**
* Update public note (kept for backward compatibility)
- *
+ *
* @param string $note New value for note
* @return int <0 if KO, >0 if OK
* @deprecated
@@ -1450,7 +1450,7 @@ abstract class CommonObject
{
return $this->update_note($note,'_public');
}
-
+
/**
* Update total_ht, total_ttc and total_vat for an object (sum of lines)
*
@@ -2702,31 +2702,47 @@ abstract class CommonObject
global $conf,$langs,$hookmanager;
print '<tr class="liste_titre nodrag nodrop">';
- if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
- {
- print '<td align="center" width="5"> </td>';
- }
+
+ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td align="center" width="5"> </td>';
+
+ // Description
print '<td>'.$langs->trans('Description').'</td>';
+
+ // VAT
print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+
+ // Price HT
print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
- if ($conf->global->MAIN_FEATURES_LEVEL > 1)
- print '<td align="right" width="80"> </td>';
+
+ if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<td align="right" width="80"> </td>';
+
+ // Qty
print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
+
+ // Reduction short
print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+
if (! empty($conf->margin->enabled)) {
if ($conf->global->MARGIN_TYPE == "1")
print '<td align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
else
print '<td align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print '<td align="right" width="50">'.$langs->trans('MarginRate').'</td>';
if (! empty($conf->global->DISPLAY_MARK_RATES))
print '<td align="right" width="50">'.$langs->trans('MarkRate').'</td>';
}
+
+ // Total HT
print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
- print '<td width="10"> </td>';
- print '<td width="10"> </td>';
- print '<td nowrap="nowrap"> </td>'; // No width to allow autodim
+
+ print '<td width="10"></td>';
+
+ print '<td width="10"></td>';
+
+ print '<td nowrap="nowrap"></td>'; // No width to allow autodim
+
print "</tr>\n";
$num = count($this->lines);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index e6ef238d5026520563b7bc40019dc6d03cd5f50f..aae14dba217382083fa8118a7ed19d224385acb3 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -627,6 +627,10 @@ class ExtraFields
$formstat = new Form($db);
$showtime = in_array($type,array('datetime')) ? 1 : 0;
+ // Do not show current date when field not required (see select_date() method)
+ if(!$required && $value == '')
+ $value = '-1';
+
$out = $formstat->select_date($value, 'options_'.$key, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1);
//$out='<input type="text" name="options_'.$key.'" size="'.$showsize.'" maxlength="'.$newsize.'" value="'.$value.'"'.($moreparam?$moreparam:'').'>';
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dc9d0ec577322532f7c4974ff35fc26503275cbf..7ea8087613ea75046f5dbd9c70d1a9a2bd4f641b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1188,6 +1188,9 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
if (empty($phone)) { return ''; }
if (empty($country)) $country=$mysoc->country_code;
+ // Short format for small screens
+ if ($conf->dol_optimize_smallscreen) $separ='';
+
$newphone=$phone;
if (strtoupper($country) == "FR")
{
@@ -1213,9 +1216,14 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
}
}
- if (! empty($addlink))
+ if (! empty($addlink)) // Link on phone number + link to add action (if conf->global->AGENDA_ADDACTIONFORPHONE set)
{
- if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')
+ if (! empty($conf->browser)) // If phone, we use link of phone
+ {
+ $newphone ='<a href="tel:'.$phone.'"';
+ $newphone.='>'.$phone.'</a>';
+ }
+ else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') // If click to dial, we use click to dial url
{
if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ac8140a2239464e1e423eb159cee32cc3faf83b4..7f4be0bc8a3369957ab9c5e543e51510835592b0 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -438,7 +438,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Tick to drag and drop
if ($addordertick)
{
- print '<td align="center" class="tdlineupdown"> </td>';
+ print '<td align="center" class="tdlineupdown hideonsmartphone"> </td>';
}
print "</tr>\n";
@@ -459,13 +459,16 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($total>0)
{
- print '<tr class="liste_total"><td class="liste_total">'.$langs->trans("Total").'</td>';
+ print '<tr class="liste_total">';
+ print '<td class="liste_total">'.$langs->trans("Total").'</td>';
if ($showproject) print '<td></td>';
print '<td></td>';
print '<td></td>';
print '<td></td>';
print '<td></td>';
- print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td></tr>';
+ if ($addordertick) print '<td class="hideonsmartphone"></td>';
+ print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td>';
+ print '</tr>';
}
return $inc;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 43c270c188d6241f575be4a7b08d52c8fec4d584..316c4d5b607ce9f9d33536d00e37532227139dd8 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -234,13 +234,62 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
}
}
- /**
- * We update newmenu with entries found into database
- * --------------------------------------------------
- */
+ // We update newmenu with entries found into database
$menuArbo = new Menubase($db,'auguria');
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
+ // We update newmenu for special dynamic menus
+ if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
+ {
+ $sql = "SELECT rowid, label, courant, rappro, courant";
+ $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+ $sql.= " WHERE entity = ".$conf->entity;
+ $sql.= " AND clos = 0";
+ $sql.= " ORDER BY label";
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $numr = $db->num_rows($resql);
+ $i = 0;
+
+ if ($numr > 0) $newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+
+ while ($i < $numr)
+ {
+ $objp = $db->fetch_object($resql);
+ $newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+ if ($objp->rappro && $objp->courant != 2 && empty($objp->clos)) // If not cash account and not closed and can be reconciliate
+ {
+ $newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+ }
+ $i++;
+ }
+ }
+ else dol_print_error($db);
+ $db->free($resql);
+ }
+
+ if ($conf->ftp->enabled && $mainmenu == 'ftp') // Entry for FTP
+ {
+ $MAXFTP=20;
+ $i=1;
+ while ($i <= $MAXFTP)
+ {
+ $paramkey='FTP_NAME_'.$i;
+ //print $paramkey;
+ if (! empty($conf->global->$paramkey))
+ {
+ $link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+
+ $newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+ }
+ $i++;
+ }
+ }
+
+
+ // Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
$menu_array=$newmenu->liste;
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 5fefb32d4a1ab30b9dff395674732d6d83f7a838..d82c488933509b12e35328eff48c33d802799d9a 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -205,12 +205,12 @@ class MenuManager
$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
//var_dump($canonrelurl);
//var_dump($canonnexturl);
- print '<ul>';
+ print '<ul>'."\n";
if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
{
// We add sub entry
- print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
+ print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
}
foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
@@ -220,8 +220,9 @@ class MenuManager
$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
- print '<li'.($val2['level']==0?' data-role="list-divider"':'').'>';
+ print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
if ($relurl2) print '<a href="'.$relurl2.'">';
+ print str_pad('',($val2['level']+1)*12,' ');
print $val2['titre'];
if ($relurl2) print '</a>';
print '</li>'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index cd99f7fe2a5bc6b5b42a77f872f35c6f58fb0122..641925f42a915f523f263529db6b0959411d926d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1161,9 +1161,60 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Add personalized menus and modules menus
$menuArbo = new Menubase($db,'eldy');
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,(empty($user->societe_id)?0:1),'eldy',$tabMenu);
- }
-
+ // We update newmenu for special dynamic menus
+ if ($user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
+ {
+ $sql = "SELECT rowid, label, courant, rappro, courant";
+ $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+ $sql.= " WHERE entity = ".$conf->entity;
+ $sql.= " AND clos = 0";
+ $sql.= " ORDER BY label";
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $numr = $db->num_rows($resql);
+ $i = 0;
+
+ if ($numr > 0) $newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+
+ while ($i < $numr)
+ {
+ $objp = $db->fetch_object($resql);
+ $newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+ if ($objp->rappro && $objp->courant != 2 && empty($objp->clos)) // If not cash account and not closed and can be reconciliate
+ {
+ $newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+ }
+ $i++;
+ }
+ }
+ else dol_print_error($db);
+ $db->free($resql);
+ }
+ if ($conf->ftp->enabled && $mainmenu == 'ftp') // Entry for FTP
+ {
+ $MAXFTP=20;
+ $i=1;
+ while ($i <= $MAXFTP)
+ {
+ $paramkey='FTP_NAME_'.$i;
+ //print $paramkey;
+ if (! empty($conf->global->$paramkey))
+ {
+ $link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+
+ $newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+ }
+ $i++;
+ }
+ }
+
+ }
+
+
+ // Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
$menu_array=$newmenu->liste;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 4530dcd6f8f7bec85a5d1122fbb2510f33c65645..935546ce846a193db6e9cc4946f7dce824e0f1b6 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -159,12 +159,12 @@ class MenuManager
$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
//var_dump($canonrelurl);
//var_dump($canonnexturl);
- print '<ul>';
+ print '<ul>'."\n";
if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
{
// We add sub entry
- print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
+ print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
}
foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
@@ -174,8 +174,9 @@ class MenuManager
$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
- print '<li'.($val2['level']==0?' data-role="list-divider"':'').'>';
+ print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
if ($relurl2) print '<a href="'.$relurl2.'">';
+ print str_pad('',($val2['level']+1)*12,' ');
print $val2['titre'];
if ($relurl2) print '</a>';
print '</li>'."\n";
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 4baa4f51680164ab885bab4d194bc9d21afa474e..e6235572c1affbb740c3399add50efb47e7c8be3 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -102,7 +102,7 @@ class modMargin extends DolibarrModules
'type'=>'left', // This is a Top menu entry
'titre'=>'Margins',
'mainmenu'=>'accountancy',
- 'leftmenu'=>'margins', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
+ 'leftmenu'=>'margins',
'url'=>'/margin/index.php',
'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>100,
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 051f4f98071ea57236d576aa9fddc79d292c7561..059cf7b83d421447968507f9e93a0d28908c3596 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -125,8 +125,8 @@
<?php if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {?>
<td align="right" nowrap="nowrap"><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx).'%'); ?></td>
<?php
- }
- if (! empty($conf->global->DISPLAY_MARK_RATES)) {?>
+ }
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) {?>
<td align="right" nowrap="nowrap"><?php echo price($line->marque_tx).'%'; ?></td>
<?php } } ?>
@@ -152,7 +152,7 @@
</a>
</td>
- <?php if ($num > 1) { ?>
+ <?php if ($num > 1 && empty($conf->browser->phone)) { ?>
<td align="center" class="tdlineupdown">
<?php if ($i > 0) { ?>
<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&rowid='.$line->id; ?>">
@@ -166,10 +166,10 @@
<?php } ?>
</td>
<?php } else { ?>
- <td align="center" class="tdlineupdown"> </td>
+ <td align="center"<?php echo (empty($conf->browser->phone)?' class="tdlineupdown"':''); ?>></td>
<?php } ?>
<?php } else { ?>
- <td colspan="3"> </td>
+ <td colspan="3"></td>
<?php } ?>
</tr>
diff --git a/htdocs/document.php b/htdocs/document.php
index 29d189f9a83d3b7046460d9ab424b9a439390297..2a04ba28a74e3c1437c3bcd849687eaa1b7727ea 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -40,11 +40,17 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
/**
- * Wrapper, donc header vierge
+ * Header empty
*
- * @return null
+ * @return void
*/
function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return void
+ */
+function llxFooter() { }
require 'main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 4e8b9e2b1d82205588218be1ca9b42ea053d5cbd..70fed335c9358ba65da5efff9b9142593224a88c 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1442,7 +1442,9 @@ else if ($id > 0 || ! empty($ref))
if ($action != 'presend')
{
- print '<table width="100%"><tr><td width="50%" valign="top">';
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+
/*
* Built documents
*/
@@ -1464,14 +1466,16 @@ else if ($id > 0 || ! empty($ref))
*/
$somethingshown=$object->showLinkedObjectBlock();
- print '</td><td valign="top" width="50%">';
+ //print '</td><td valign="top" width="50%">';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'fichinter',$socid);
- print "</td><td>";
- print " </td>";
- print "</tr></table>\n";
+
+ print '</div></div></div>';
+ //print "</td></tr></table>\n";
}
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 6d405305d6a3ef6004de5e3cbd7b8130493d6c6a..653397cfaf596da24e9f5b0a0f3fc1e0e994cc73 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
@@ -999,7 +999,7 @@ if ($action=="create")
print '</tr>';
print '</td></tr>';
-
+
print '<tr><td>'.$langs->trans('NotePublic').'</td>';
print '<td>';
$doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
@@ -1016,7 +1016,7 @@ if ($action=="create")
//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
print '</tr>';
-
+
// Other options
$parameters=array();
@@ -1516,7 +1516,7 @@ elseif (! empty($object->id))
$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i);
$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
}
-
+
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
@@ -1671,7 +1671,7 @@ elseif (! empty($object->id))
*/
if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
{
- print '<div class="tabsAction">';
+ print '<div class="tabsAction">';
// Validate
if ($object->statut == 0 && $num > 0)
@@ -1762,9 +1762,12 @@ elseif (! empty($object->id))
print "</div>";
}
+ print "<br>";
+
- print '<table width="100%"><tr><td width="50%" valign="top">';
- print '<a name="builddoc"></a>'; // ancre
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+ //print '<a name="builddoc"></a>'; // ancre
/*
* Documents generes
@@ -1785,7 +1788,8 @@ elseif (! empty($object->id))
*/
$somethingshown=$object->showLinkedObjectBlock();
- print '</td><td valign="top" width="50%">';
+ //print '</td><td valign="top" width="50%">';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
{
@@ -1853,7 +1857,8 @@ elseif (! empty($object->id))
$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
*/
- print '</td></tr></table>';
+ print '</div></div></div>';
+ //print '</td></tr></table>';
}
/*
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 0264b6b3c3a0a7ef0aeb58ff9cc2db9b309b5ca6..6ed624b82fa9ec86f7dd5173cc81e8b67cc98f04 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2054,11 +2054,13 @@ else
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>';
}
print '</div>';
+ print '<br>';
if ($action != 'edit')
{
- print '<table width="100%"><tr><td width="50%" valign="top">';
- print '<a name="builddoc"></a>'; // ancre
+ print '<div class="fichecenter"><div class="fichehalfleft">';
+ //print '<table width="100%"><tr><td width="50%" valign="top">';
+ //print '<a name="builddoc"></a>'; // ancre
/*
* Documents generes
@@ -2072,7 +2074,6 @@ else
$delallowed=$user->rights->fournisseur->facture->supprimer;
$modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
- print '<br>';
print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,0,0,'','','',$societe->default_lang);
$somethingshown=$formfile->numoffiles;
@@ -2081,15 +2082,17 @@ else
*/
$somethingshown=$object->showLinkedObjectBlock();
- print '</td><td valign="top" width="50%">';
- print '<br>';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+ //print '</td><td valign="top" width="50%">';
+ //print '<br>';
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'invoice_supplier',$socid);
- print '</td></tr></table>';
+ print '</div></div></div>';
+ //print '</td></tr></table>';
}
}
/*
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index d376c96c7ff820d43c597deb642a32d266ea92e5..63f98a2be142f77794b2ae090701de2c41500ee2 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -23,7 +23,7 @@
* \author Laurent Destailleur
*/
-require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu
+require('../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php
deleted file mode 100644
index 19a9d2547fba93884fcfee7f361997953dc482e1..0000000000000000000000000000000000000000
--- a/htdocs/ftp/pre.inc.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) 2008-2009 Laurent Destailleur <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/ftp/pre.inc.php
- * \ingroup ftp
- * \brief File to manage left menu for FTP module
- */
-
-require (realpath(dirname(__FILE__)) . "/../main.inc.php");
-
-$user->getrights('ecm');
-
-/**
- * Replace the default llxHeader function
- *
- * @param string $head Optionnal head lines
- * @param string $title HTML title
- * @param string $help_url Link to online url help
- * @param string $morehtml More content into html header
- * @param string $target Force target on menu links
- * @param int $disablejs More content into html header
- * @param int $disablehead More content into html header
- * @param array $arrayofjs Array of complementary js files
- * @param array $arrayofcss Array of complementary css files
- * @return none
- */
-function llxHeader($head = '', $title='', $help_url='', $morehtml='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
- global $conf,$langs,$user;
- $langs->load("ftp");
-
- top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
- top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
- $menu = new Menu();
-
- $MAXFTP=20;
- $i=1;
- while ($i <= $MAXFTP)
- {
- $paramkey='FTP_NAME_'.$i;
- //print $paramkey;
- if (! empty($conf->global->$paramkey))
- {
- $link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
-
- $menu->add($link, dol_trunc($conf->global->$paramkey,24));
- }
- $i++;
- }
-
-
- left_menu($menu->liste, $help_url, $morehtml, '', 1);
- main_area();
-}
-?>
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index d288bd9b97bb84f67a63b4dc21d4e8c26ba35034..c269a148615e45e23347ef1ec3ac09fa11f3bad0 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -278,19 +278,20 @@ if($user->rights->holiday->lire_tous) {
}
// VALIDEUR
-if($user->rights->holiday->lire_tous){
+if($user->rights->holiday->lire_tous)
+{
print '<td class="liste_titre" align="left">';
- // Liste des utiliseurs du groupes Comptabilité
-
- $idGroupValid = $holiday->getConfCP('userGroup');
-
- $validator = new UserGroup($db,$idGroupValid);
- $valideur = $validator->listUsersForGroup();
-
- $form->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
+ $validator = new UserGroup($db);
+ $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+ $valideurobjects = $validator->listUsersForGroup($excludefilter);
+ $valideurarray = array();
+ foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
+ $form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,'');
print '</td>';
-} else {
+}
+else
+{
print '<td class="liste_titre"> </td>';
}
diff --git a/htdocs/includes/jquery/plugins/template/README.md b/htdocs/includes/jquery/plugins/template/README.md
deleted file mode 100644
index 5f9d6e986d9191b4e2ccc0cec61ab7132cf96509..0000000000000000000000000000000000000000
--- a/htdocs/includes/jquery/plugins/template/README.md
+++ /dev/null
@@ -1,346 +0,0 @@
-# JavaScript Templates
-
-## Demo
-[JavaScript Templates Demo](http://blueimp.github.com/JavaScript-Templates/)
-
-## Usage
-
-### Client-side
-Include the (minified) JavaScript Templates script in your HTML markup:
-
-```html
-<script src="tmpl.min.js"></script>
-```
-
-Add a script section with type **"text/x-tmpl"**, a unique **id** property and your template definition as content:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-</script>
-```
-
-**"o"** (the lowercase letter) is a reference to the data parameter of the template function (see the API section on how to modify this identifier).
-
-In your application code, create a JavaScript object to use as data for the template:
-
-```js
-var data = {
- "title": "JavaScript Templates",
- "license": {
- "name": "MIT license",
- "url": "http://www.opensource.org/licenses/MIT"
- },
- "features": [
- "lightweight & fast",
- "powerful",
- "zero dependencies"
- ]
-};
-```
-
-In a real application, this data could be the result of retrieving a [JSON](http://json.org/) resource.
-
-Render the result by calling the **tmpl()** method with the id of the template and the data object as arguments:
-
-```js
-document.getElementById("result").innerHTML = tmpl("tmpl-demo", data);
-```
-
-### Server-side
-
-The following is an example how to use the JavaScript Templates engine on the server-side with [node.js](http://nodejs.org/).
-
-Create a new directory and add the **tmpl.js** file. Or alternatively, install the **blueimp-tmpl** package with [npm](http://npmjs.org/):
-
-```sh
-npm install blueimp-tmpl
-```
-
-Add a file **template.html** with the following content:
-
-```html
-<!DOCTYPE HTML>
-<title>{%=o.title%}</title>
-<h3><a href="{%=o.url%}">{%=o.title%}</a></h3>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-Add a file **server.js** with the following content:
-
-```js
-require("http").createServer(function (req, res) {
- var fs = require("fs"),
- // The tmpl module exports the tmpl() function:
- tmpl = require("./tmpl").tmpl,
- // Use the following version if you installed the package with npm:
- // tmpl = require("blueimp-tmpl").tmpl,
- // Sample data:
- data = {
- "title": "JavaScript Templates",
- "url": "https://github.com/blueimp/JavaScript-Templates",
- "features": [
- "lightweight & fast",
- "powerful",
- "zero dependencies"
- ]
- };
- // Override the template loading method:
- tmpl.load = function (id) {
- var filename = id + ".html";
- console.log("Loading " + filename);
- return fs.readFileSync(filename, "utf8");
- };
- res.writeHead(200, {"Content-Type": "text/x-tmpl"});
- // Render the content:
- res.end(tmpl("template", data));
-}).listen(8080, "localhost");
-console.log("Server running at http://localhost:8080/");
-```
-
-Run the application with the following command:
-
-```sh
-node server.js
-```
-
-## Requirements
-The JavaScript Templates script has zero dependencies.
-
-## API
-
-### tmpl() function
-The **tmpl()** function is added to the global **window** object and can be called as global function:
-
-```js
-var result = tmpl("tmpl-demo", data);
-```
-
-The **tmpl()** function can be called with the id of a template, or with a template string:
-
-```js
-var result = tmpl("<h3>{%=o.title%}</h3>", data);
-```
-
-If called without second argument, **tmpl()** returns a reusable template function:
-
-```js
-var func = tmpl("<h3>{%=o.title%}</h3>");
-document.getElementById("result").innerHTML = func(data);
-```
-
-### Templates cache
-Templates loaded by id are cached in the map **tmpl.cache**:
-
-```js
-var func = tmpl("tmpl-demo"), // Loads and parses the template
- cached = typeof tmpl.cache["tmpl-demo"] === "function", // true
- result = tmpl("tmpl-demo", data); // Uses cached template function
-
-tmpl.cache["tmpl-demo"] = null;
-result = tmpl("tmpl-demo", data); // Loads and parses the template again
-```
-
-### Output encoding
-The method **tmpl.encode** is used to escape HTML special characters in the template output:
-
-```js
-var output = tmpl.encode("<>&\"'\x00"); // Renders "<>&"'"
-```
-
-**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding.
-Strings matched by the regular expression, but not found in the encoding map are removed from the output. This allows for example to automatically trim input values (removing whitespace from the start and end of the string):
-
-```js
-tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g;
-var output = tmpl.encode(" Banana! "); // Renders "Banana" (without whitespace)
-```
-
-### Local helper variables
-The local variables available inside the templates are the following:
-
-* **o**: The data object given as parameter to the template function (see the next section on how to modify the parameter name).
-* **tmpl**: A reference to the **tmpl** function object.
-* **_s**: The string for the rendered result content.
-* **_e**: A reference to the **tmpl.encode** method.
-* **print**: Helper function to add content to the rendered result string.
-* **include**: Helper function to include the return value of a different template in the result.
-
-To introduce additional local helper variables, the string **tmpl.helper** can be extended. The following adds a convenience function for *console.log* and a streaming function, that streams the template rendering result back to the callback argument (note the comma at the beginning of each variable declaration):
-
-```js
-tmpl.helper += ",log=function(){console.log.apply(console, arguments)}" +
- ",st='',stream=function(cb){var l=st.length;st=_s;cb( _s.slice(l));}";
-```
-
-Those new helper functions could be used to stream the template contents to the console output:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-{% stream(log); %}
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-{% stream(log); %}
-<h4>Features</h4>
-<ul>
-{% stream(log); %}
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
- {% stream(log); %}
-{% } %}
-</ul>
-{% stream(log); %}
-</script>
-```
-
-### Template function argument
-The generated template functions accept one argument, which is the data object given to the **tmpl(id, data)** function. This argument is available inside the template definitions as parameter **o** (the lowercase letter).
-
-The argument name can be modified by overriding **tmpl.arg**:
-
-```js
-tmpl.arg = "p";
-
-// Renders "<h3>JavaScript Templates</h3>":
-var result = tmpl("<h3>{%=p.title%}</h3>", {title: "JavaScript Templates"});
-```
-
-### Template parsing
-The template contents are matched and replaced using the regular expression **tmpl.regexp** and the replacement function **tmpl.func**. The replacement function operates based on the [parenthesized submatch strings](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_function_as_a_parameter).
-
-To use different tags for the template syntax, override **tmpl.regexp** with a modified regular expression, by exchanging all occurrences of "**\\{%**" and "**%\\}**", e.g. with "**\\[%**" and "**%\\]**":
-
-```js
-tmpl.regexp = /([\s'\\])(?![^%]*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
-```
-
-By default, the plugin preserves whitespace (newlines, carriage returns, tabs and spaces). To strip unnecessary whitespace, you can override the **tmpl.func** function, e.g. with the following code:
-
-```js
-var originalFunc = tmpl.func;
-tmpl.func = function (s, p1, p2, p3, p4, p5, offset, str) {
- if (p1 && /\s/.test(p1)) {
- if (!offset || /\s/.test(str.charAt(offset - 1)) ||
- /^\s+$/g.test(str.slice(offset))) {
- return '';
- }
- return ' ';
- }
- return originalFunc.apply(tmpl, arguments);
-};
-```
-
-## Templates syntax
-
-### Interpolation
-Print variable with HTML special characters escaped:
-
-```html
-<h3>{%=o.title%}</h3>
-```
-
-Print variable without escaping:
-
-```html
-<h3>{%#o.user_id%}</h3>
-```
-
-Print output of function calls:
-
-```html
-<a href="{%=encodeURI(o.url)%}">Website</a>
-```
-
-Use dot notation to print nested properties:
-
-```html
-<strong>{%=o.author.name%}</strong>
-```
-
-Note that the JavaScript Templates engine prints **falsy** values as empty strings.
-That is, **undefined**, **null**, **false**, **0** and **NaN** will all be converted to **''**.
-To be able to print e.g. the number 0, convert it to a String before using it as an output variable:
-
-```html
-<h3>{%=0+''%}</h3>
-```
-
-### Evaluation
-Use **print(str)** to add escaped content to the output:
-
-```html
-<span>Year: {% var d=new Date(); print(d.getFullYear()); %}</span>
-```
-
-Use **print(str, true)** to add unescaped content to the output:
-
-```html
-<span>{% print("Fast & powerful", true); %}</span>
-```
-
-Use **include(str, obj)** to include content from a different template:
-
-```html
-<div>
-{% include('tmpl-link', {name: "Website", url: "http://example.org"}); %}
-</div>
-```
-
-If else condition:
-
-```html
-{% if (o.author.url) { %}
- <a href="{%=encodeURI(o.author.url)%}">{%=o.author.name%}</a>
-{% } else { %}
- <em>No author url.</em>
-{% } %}
-```
-
-For loop:
-
-```html
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-## Compiled templates
-The JavaScript Templates project comes with a compilation script, that allows you to compile your templates into JavaScript code and combine them with a minimal Templates runtime into one minified JavaScript file.
-
-The compilation script is built for [node.js](http://nodejs.org/) and also requires [UglifyJS](https://github.com/mishoo/UglifyJS).
-To use it, first install both the JavaScript Templates project and UglifyJS via [npm](http://npmjs.org/):
-
-```sh
-npm install uglify-js
-npm install blueimp-tmpl
-```
-
-This will put the executables **uglifyjs** and **tmpl.js** into the folder **node_modules/.bin**. It will also make them available on your PATH if you install the packages globally (by adding the **-g** flag to the install command).
-
-The **tmpl.js** executable accepts the paths to one or multiple template files as command line arguments and prints the generated JavaScript code to the console output. The following command line shows you how to store the generated code in a new JavaScript file that can be included in your project:
-
-```sh
-tmpl.js templates/upload.html templates/download.html > tmpl.min.js
-```
-
-The files given as command line arguments to **tmpl.js** can either be pure template files or HTML documents with embedded template script sections. For the pure template files, the file names (without extension) serve as template ids.
-The generated file can be included in your project as a replacement for the original **tmpl.js** runtime. It provides you with the same API and provides a **tmpl(id, data)** function that accepts the id of one of your templates as first and a data object as optional second parameter.
-
-## License
-The JavaScript Templates script is released under the [MIT license](http://www.opensource.org/licenses/MIT).
diff --git a/htdocs/includes/jquery/plugins/template/compile.js b/htdocs/includes/jquery/plugins/template/compile.js
deleted file mode 100644
index ebca48aab4e4f56898dd58ac3b6e3a4982845849..0000000000000000000000000000000000000000
--- a/htdocs/includes/jquery/plugins/template/compile.js
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env node
-/*
- * JavaScript Templates Compiler 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true */
-/*global require, __dirname, process, console */
-
-(function () {
- "use strict";
- var tmpl = require("./tmpl.js").tmpl,
- fs = require("fs"),
- path = require("path"),
- jsp = require("uglify-js").parser,
- pro = require("uglify-js").uglify,
- // Retrieve the content of the minimal runtime:
- runtime = fs.readFileSync(__dirname + "/runtime.js", "utf8"),
- // A regular expression to parse templates from script tags in a HTML page:
- regexp = /<script( id="([\w\-]+)")? type="text\/x-tmpl"( id="([\w\-]+)")?>([\s\S]+?)<\/script>/gi,
- // A regular expression to match the helper function names:
- helperRegexp = new RegExp(
- tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join("\\s*\\(|") + "\\s*\\("
- ),
- // A list to store the function bodies:
- list = [],
- code,
- ast;
- // Extend the Templating engine with a print method for the generated functions:
- tmpl.print = function (str) {
- // Only add helper functions if they are used inside of the template:
- var helper = helperRegexp.test(str) ? tmpl.helper : "",
- body = str.replace(tmpl.regexp, tmpl.func);
- if (helper || (/_e\s*\(/.test(body))) {
- helper = "_e=tmpl.encode" + helper + ",";
- }
- return "function(" + tmpl.arg + ",tmpl){" +
- ("var " + helper + "_s='" + body + "';return _s;")
- .split("_s+='';").join("") + "}";
- };
- // Loop through the command line arguments:
- process.argv.forEach(function (file, index) {
- var listLength = list.length,
- content,
- result,
- id;
- // Skipt the first two arguments, which are "node" and the script:
- if (index > 1) {
- content = fs.readFileSync(file, "utf8");
- while (true) {
- // Find templates in script tags:
- result = regexp.exec(content);
- if (!result) {
- break;
- }
- id = result[2] || result[4];
- list.push("'" + id + "':" + tmpl.print(result[5]));
- }
- if (listLength === list.length) {
- // No template script tags found, use the complete content:
- id = path.basename(file, path.extname(file));
- list.push("'" + id + "':" + tmpl.print(content));
- }
- }
- });
- // Combine the generated functions as cache of the minimal runtime:
- code = runtime.replace("{}", "{" + list.join(",") + "}");
- // Parse the code and get the initial AST (Abstract Syntac Tree):
- ast = jsp.parse(code);
- // Get a new AST with mangled names:
- ast = pro.ast_mangle(ast);
- // Get an AST with compression optimizations:
- ast = pro.ast_squeeze(ast);
- // Generate the code and print it to the console output:
- console.log(pro.gen_code(ast));
-}());
diff --git a/htdocs/includes/jquery/plugins/template/runtime.js b/htdocs/includes/jquery/plugins/template/runtime.js
deleted file mode 100644
index 4cc0c3c68b10114cbf4198ef6c0951fbed728ce8..0000000000000000000000000000000000000000
--- a/htdocs/includes/jquery/plugins/template/runtime.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * JavaScript Templates Runtime 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint sloppy: true */
-/*global define */
-
-(function ($) {
- var tmpl = function (id, data) {
- var f = tmpl.cache[id];
- return data ? f(data, tmpl) : function (data) {
- return f(data, tmpl);
- };
- };
- tmpl.cache = {};
- tmpl.encReg = /[<>&"'\x00]/g;
- tmpl.encMap = {
- "<" : "<",
- ">" : ">",
- "&" : "&",
- "\"" : """,
- "'" : "'"
- };
- tmpl.encode = function (s) {
- return String(s || "").replace(
- tmpl.encReg,
- function (c) {
- return tmpl.encMap[c] || "";
- }
- );
- };
- if (typeof define === "function" && define.amd) {
- define(function () {
- return tmpl;
- });
- } else {
- $.tmpl = tmpl;
- }
-}(this));
diff --git a/htdocs/includes/jquery/plugins/template/tmpl.js b/htdocs/includes/jquery/plugins/template/tmpl.js
deleted file mode 100644
index c8b4b8658a5ecfaf6d9a7ef4928ea2b26893c4e2..0000000000000000000000000000000000000000
--- a/htdocs/includes/jquery/plugins/template/tmpl.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * JavaScript Templates 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- *
- * Inspired by John Resig's JavaScript Micro-Templating:
- * http://ejohn.org/blog/javascript-micro-templating/
- */
-
-/*jslint evil: true, regexp: true */
-/*global document, define */
-
-(function ($) {
- "use strict";
- var tmpl = function (str, data) {
- var f = !/[^\w\-\.:]/.test(str) ? tmpl.cache[str] = tmpl.cache[str] ||
- tmpl(tmpl.load(str)) :
- new Function(
- tmpl.arg + ',tmpl',
- "var _e=tmpl.encode" + tmpl.helper + ",_s='" +
- str.replace(tmpl.regexp, tmpl.func) +
- "';return _s;"
- );
- return data ? f(data, tmpl) : function (data) {
- return f(data, tmpl);
- };
- };
- tmpl.cache = {};
- tmpl.load = function (id) {
- return document.getElementById(id).innerHTML;
- };
- tmpl.regexp = /([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g;
- tmpl.func = function (s, p1, p2, p3, p4, p5) {
- if (p1) { // whitespace, quote and backspace in interpolation context
- return {
- "\n": "\\n",
- "\r": "\\r",
- "\t": "\\t",
- " " : " "
- }[s] || "\\" + s;
- }
- if (p2) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
- if (p2 === "=") {
- return "'+_e(" + p3 + ")+'";
- }
- return "'+(" + p3 + "||'')+'";
- }
- if (p4) { // evaluation start tag: {%
- return "';";
- }
- if (p5) { // evaluation end tag: %}
- return "_s+='";
- }
- };
- tmpl.encReg = /[<>&"'\x00]/g;
- tmpl.encMap = {
- "<" : "<",
- ">" : ">",
- "&" : "&",
- "\"" : """,
- "'" : "'"
- };
- tmpl.encode = function (s) {
- return String(s || "").replace(
- tmpl.encReg,
- function (c) {
- return tmpl.encMap[c] || "";
- }
- );
- };
- tmpl.arg = "o";
- tmpl.helper = ",print=function(s,e){_s+=e&&(s||'')||_e(s);}" +
- ",include=function(s,d){_s+=tmpl(s,d);}";
- if (typeof define === "function" && define.amd) {
- define(function () {
- return tmpl;
- });
- } else {
- $.tmpl = tmpl;
- }
-}(this));
diff --git a/htdocs/includes/jquery/plugins/template/tmpl.min.js b/htdocs/includes/jquery/plugins/template/tmpl.min.js
deleted file mode 100644
index 065532e7caef25c4ce61920cd03c2f146c259ef2..0000000000000000000000000000000000000000
--- a/htdocs/includes/jquery/plugins/template/tmpl.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"<",">":">","&":"&",'"':""","'":"'"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this);
\ No newline at end of file
diff --git a/htdocs/index.php b/htdocs/index.php
index 29c9ccfb4de3598b6e0e03ef8c57bf9453da4454..49404f72c6584541c30520bd14556fd4bbb19b54 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -188,7 +188,7 @@ if ($user->societe_id == 0)
DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
DOL_URL_ROOT.'/contrat/liste.php');
// Translation lang files
- $langfile=array("bills",
+ $langfile=array("companies",
"prospects",
"suppliers",
"members",
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 3935045d35f74a1e8f4d7e41766279e52088dae2..e2dbcd39af131396c5517eea62b27d9adfad4698 100755
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -136,23 +136,6 @@ function is_error($cerr)
}
-
-/**
- * Vérifie une adresse e-mail selon les normes RFC
- *
- * @param string $email l'adresse e-mail a vérifier
- * @return bool vrai si l'adresse est correcte, faux sinon
- * @see http://fightingforalostcause.net/misc/2006/compare-email-regex.php
- * @see http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup
- */
-function validateEmail($email)
-{
- $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD';
-
- return (bool) preg_match($pattern, $email);
-}
-
-
/**
* Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau
*
diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php
index 168f601b9f5df645bed54f4659d36e2e1516d294..2010a6fdd034b7219f4b9c2a3cc21d4beb6844ef 100755
--- a/htdocs/opensurvey/public/create_survey.php
+++ b/htdocs/opensurvey/public/create_survey.php
@@ -74,9 +74,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre") || GET
$_SESSION["mailsonde"] = false;
}
- if(validateEmail($adresse) === false) {
- $erreur_adresse = true;
- }
+ if (! isValidEmail($adresse)) $erreur_adresse = true;
//var_dump($titre.' - '.$nom.' - '.$adresse.' - '.!$erreur_adresse.' - '.! $erreur_injection_titre.' - '.! $erreur_injection_commentaires.' - '.! $erreur_injection_nom.' - '.$creation_sondage_date.' - '.$creation_sondage_autre); exit;
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index d29bb0fefc4a1d3650da6cac9613b8cc9fda53a8..e44342278f0f177c99eba2cd46019b8e5c13917c 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -31,6 +31,20 @@ if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check ant
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not check anti POST attack test
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+/**
+ * Header empty
+ *
+ * @return void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return void
+ */
+function llxFooter() { }
+
+
require '../../main.inc.php';
$tag=GETPOST('tag');
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index c1245ace0adbde3647773a70583cfe0d0639ea04..8585b19cd4a5a4ae99cfbd7774464a75d5bf2adf 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -29,6 +29,20 @@ if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this outpu
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check anti CSRF attack test
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+/**
+ * Header empty
+ *
+ * @return void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return void
+ */
+function llxFooter() { }
+
+
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 0d913e037fa74ca65594faae9ac170ff4974e9d2..6bf445326218d0c4ee0653a65d5daf55696babd9 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -336,10 +336,19 @@ table.login_table .vmenu {
/* ! Message d'erreur lors du login : */
center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
-/* For hide object and add pointer cursor */
-.hideobject {display:none;}
-.linkobject {cursor:pointer;}
+
+/* ============================================================================== */
+/* Styles to hide objects */
+/* ============================================================================== */
+
+.hideobject { display:none; }
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
+.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
+<?php } ?>
+.linkobject { cursor:pointer; }
+
/* For dragging lines */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 44cc9b396417feabec5ce1dae9508f7cfd9d0dec..6068aebf38576f076066bf493d4c1e260192f730 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -62,7 +62,13 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-//'/theme/auguria/img/menus/trtitle.png';
+
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
@@ -196,8 +202,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 113ee0e5998453d01b7bffb0139a2bc20f89b634..ea565c5d1f49e6465c099278ee6d8369bc3318a7 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$fontlist='arial,tahoma,verdana,helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif';
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$path=''; // This value may be used in future for external module to overwrite theme
$theme='bureau2crea'; // Value of theme
if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -225,8 +231,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index b33a6fd958bc9c7efcb8c282777998d278870a36..ddc88ac61d9e9d209d9105aa5211ff351a7103fa 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$fontlist='arial,tahoma,verdana,helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif';
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$path=''; // This value may be used in future for external module to overwrite theme
$theme='cameleo'; // Value of theme
if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -201,8 +207,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5bc359dd58cf5c14bd02506ee63ab37440919f97..47e27f3f968f6030e59ad9514a99a2466b8fa9fa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -352,8 +352,9 @@ th .button {
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 0eb74e30f887778cf4cf0aaec7dcab4802c25e81..01f8ea84b5524afe553d0c80ecce3b1f1783fe87 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -36,13 +36,18 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
// Pour autre que companylogo, on charge environnement + info issus de logon comme le user
if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
-
/**
- * Wrapper, donc header vierge
+ * Header empty
*
- * @return null
+ * @return void
*/
function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return void
+ */
+function llxFooter() { }
require 'main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index b18471c06f221638f86c139a434fc9d26ac1581d..424359786aec31f38a41799dc953805cf4042233 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -47,10 +47,6 @@
<directory suffix=".php">../../htdocs/societe/canvas/</directory>
<directory suffix=".php">../../htdocs/includes/</directory>
<file>../../htdocs/boutique/osc_master.inc.php</file>
- <file>../../htdocs/compta/bank/pre.inc.php</file>
- <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
- <file>../../htdocs/holiday/common.inc.php</file>
- <file>../../htdocs/ftp/pre.inc.php</file>
</exclude>
</whitelist>
</filter>