This commit is contained in:
Laurent Destailleur 2010-10-27 21:51:41 +00:00
parent 82dcb8616e
commit 718b646da9
14 changed files with 1124 additions and 750 deletions

File diff suppressed because it is too large Load Diff

View File

@ -124,6 +124,7 @@ print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print "<td colspan=\"2\">".$langs->trans("LogEvents")."</td>";
print "</tr>\n";
// Loop on each event type
foreach ($eventstolog as $key => $arr)
{
if ($arr['id'])

View File

@ -17,9 +17,10 @@
*/
/**
* \file htdocs/societe/ajaxziptown.php
* \brief File to return Ajax response on zipcode or town request
* \version $Id$
* \file htdocs/core/ajaxziptown.php
* \ingroup core
* \brief File to return Ajax response on zipcode or town request
* \version $Id$
*/
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
@ -78,7 +79,7 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
if ($resql)
{
$num = $db->num_rows($resql);
if (! $num)
{
$sql = "SELECT DISTINCT s.cp as zip, s.ville as town, s.fk_departement as fk_county, s.fk_pays as fk_country";
@ -95,14 +96,14 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
//print $sql;
$resql=$db->query($sql);
}
if ($resql)
{
while ($row = $db->fetch_array($resql))
{
$country = $row['fk_country']?($langs->trans('Country'.$row['country_code'])!='Country'.$row['country_code']?$langs->trans('Country'.$row['country_code']):$row['country']):'';
$county = $row['fk_county']?($langs->trans($row['county_code'])!=$row['county_code']?$langs->trans($row['county_code']):($row['county']!='-'?$row['county']:'')):'';
$row_array['label'] = $row['zip'].' '.$row['town'];
$row_array['label'] .= ($county || $country)?' (':'';
$row_array['label'] .= $county;
@ -121,14 +122,14 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
}
$row_array['selectpays_id'] = $row['fk_country'];
$row_array['departement_id'] = $row['fk_county'];
$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
array_push($return_arr,$row_array);
}
}
}
echo json_encode($return_arr);
}
else

View File

@ -54,7 +54,7 @@
////////////////////////////////////////////////////
/**
* \file htdocs/includes/modules/member/pdf_standardlabel.class.php
* \file htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
* \ingroup member
* \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
* \author Steve Dillon

View File

@ -23,7 +23,7 @@
/**
* \file htdocs/includes/modules/modPaybox.class.php
* \ingroup mymodule
* \ingroup paybox
* \brief Description and activation file for module Paybox
* \version $Id$
*/

View File

@ -17,13 +17,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/** \defgroup paybox Module paypal
/** \defgroup paypal Module paypal
* \brief Add integration with Paypal online payment system.
*/
/**
* \file htdocs/includes/modules/modPaypal.class.php
* \ingroup mymodule
* \ingroup paypal
* \brief Description and activation file for module Paypal
* \version $Id$
*/

View File

@ -18,8 +18,8 @@
*/
/**
* \file htdocs/includes/modules/supplier_invoice/modules_invoicefournisseur.php
* \ingroup facture
* \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
* \ingroup facture fourniseur
* \brief File that contain parent class for supplier invoices models
* \version $Id$
*/
@ -66,7 +66,7 @@ class ModelePDFSuppliersInvoices
function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
{
global $conf, $langs;
$langs->load("suppliers");
$dir = DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/pdf/";

View File

@ -17,7 +17,7 @@
*/
/**
\file htdocs/includes/triggers/interface_modWebcalendar_webcalsynchro.class.php
\file htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php
\ingroup webcalendar
\brief Fichier de gestion des triggers webcalendar
\version $Id$

View File

@ -62,7 +62,7 @@ function ConvertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0)
* @param format Output format (all: complete display, hour: displays only hours, min: displays only minutes)
* @param lengthOfDay Length of day (default 86400 seconds)
* @return sTime Formated text of duration
* @example 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
* Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
*/
function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400)
{

View File

@ -20,6 +20,7 @@
/**
* \file htdocs/paybox/lib/paybox.lib.php
* \ingroup paybox
* \brief Library for common paybox functions
* \version $Id$
*/

View File

@ -1,4 +1,26 @@
<?php
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.org>
*
* 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/** \file htdocs/paypal/expresscheckout.php
* \ingroup paypal
* \brief Page with Paypal functions
* \version $Id$
*/
require_once ("paypalfunctions.php");
// ==================================

View File

@ -20,6 +20,7 @@
/**
* \file htdocs/paypal/lib/paypal.lib.php
* \ingroup paypal
* \brief Library for common paypal functions
* \version $Id$
*/

View File

@ -1,5 +1,28 @@
<?php
/********************************************
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.org>
*
* 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/** \file htdocs/paypal/paypalfunctions.php
* \ingroup paypal
* \brief Page with Paypal functions
* \version $Id$
*/
/********************************************
PayPal API Module
Defines all the global variables and the wrapper functions

View File

@ -17,7 +17,7 @@
*/
/**
* \file htdocs/societe/canvas/default/dao_thirdparty_individual.class.php
* \file htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
* \ingroup thirdparty
* \brief Fichier de la classe des particuliers
* \version $Id$