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

cvsimport

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-18 23:37:03 +00:00
commit b6f08ab884
72 changed files with 6576 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/initdata/initdemo.sh
View File

@ -11,7 +11,7 @@
#------------------------------------------------------
export dumpfile="mysqldump_dolibarr_3.0.0.sql"
export dumpfile="mysqldump_dolibarr_3.1.0.sql"
export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
if [ "x$mydir" = "x" ]
then

6000
dev/initdata/mysqldump_dolibarr_3.1.0.sql Executable file
View File

File diff suppressed because one or more lines are too long

BIN
doc/images/dolibarr_screenshot11.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 KiB

BIN
doc/images/dolibarr_screenshot12.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 KiB

BIN
doc/images/dolibarr_screenshot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 221 KiB

BIN
doc/images/dolibarr_screenshot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 167 KiB

BIN
doc/images/dolibarr_screenshot6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 163 KiB

BIN
doc/images/dolibarr_screenshot7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 131 KiB

BIN
doc/images/dolibarr_screenshot8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 161 KiB

BIN
doc/images/dolibarr_screenshot9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 175 KiB

10
htdocs/adherents/admin/adherent_extrafields.php
View File

@ -22,7 +22,7 @@
* \file htdocs/adherents/admin/adherent_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
* \version $Id: adherent_extrafields.php,v 1.3 2011/07/05 20:39:36 eldy Exp $
* \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $
*/
require("../../main.inc.php");
@ -204,13 +204,13 @@ $var=True;
foreach($extrafields->attribute_type as $key => $value)
{
$var=!$var;
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td>".$extrafields->attribute_label[$key]."</td>\n";
print "<td>".$key."</td>\n";
print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
print '<td align="right"><a href="".$_SERVER["PHP_SELF"]."?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
print "</tr>";
// $i++;
}
@ -312,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit')
$db->close();
llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.3 $');
llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $');
?>

8
htdocs/admin/company.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
*
@ -23,7 +23,7 @@
* \file htdocs/admin/company.php
* \ingroup company
* \brief Setup page to configure company/foundation
* \version $Id: company.php,v 1.92 2011/06/24 19:57:45 eldy Exp $
* \version $Id: company.php,v 1.93 2011/07/18 18:09:04 eldy Exp $
*/
require("../main.inc.php");
@ -623,7 +623,7 @@ else
* Show parameters
*/
if ($message) print $message.'<br>';
dol_htmloutput_mesg($message);
// Actions buttons
//print '<div class="tabsAction">';
@ -983,6 +983,6 @@ else
$db->close();
llxFooter('$Date: 2011/06/24 19:57:45 $ - $Revision: 1.92 $');
llxFooter('$Date: 2011/07/18 18:09:04 $ - $Revision: 1.93 $');
?>

74
htdocs/admin/events.php
View File

@ -20,16 +20,17 @@
* \file htdocs/admin/events.php
* \ingroup core
* \brief Log event setup page
* \version $Id$
* \version $Id: events.php,v 1.20 2011/07/18 23:30:56 eldy Exp $
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php");
if (!$user->admin)
accessforbidden();
accessforbidden();
$langs->load("users");
$langs->load("admin");
@ -38,52 +39,19 @@ $langs->load("other");
$action=GETPOST("action");
// List of all events supported by triggers
$eventstolog=array(
array('id'=>'USER_LOGIN', 'test'=>1),
array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
array('id'=>'USER_LOGOUT', 'test'=>1),
array('id'=>'USER_CREATE', 'test'=>1),
array('id'=>'USER_MODIFY', 'test'=>1),
array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
array('id'=>'USER_DELETE', 'test'=>1),
array('id'=>'GROUP_CREATE', 'test'=>1),
array('id'=>'GROUP_MODIFY', 'test'=>1),
array('id'=>'GROUP_DELETE', 'test'=>1),
/* array('id'=>'ACTION_CREATE', 'test'=>$conf->societe->enabled),
array('id'=>'COMPANY_CREATE', 'test'=>$conf->societe->enabled),
array('id'=>'CONTRACT_VALIDATE', 'test'=>$conf->contrat->enabled),
array('id'=>'PROPAL_VALIDATE', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_CLOSE_SIGNED', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_CLOSE_REFUSED', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_SENTBYMAIL', 'test'=>$conf->propal->enabled),
array('id'=>'ORDER_VALIDATE', 'test'=>$conf->commande->enabled),
array('id'=>'ORDER_SENTBYMAIL', 'test'=>$conf->commande->enabled),
array('id'=>'BILL_VALIDATE', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_PAYED', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_CANCEL', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_SENTBYMAIL', 'test'=>$conf->facture->enabled),
array('id'=>'PAYMENT_CUSTOMER_CREATE','test'=>$conf->facture->enabled),
array('id'=>'PAYMENT_SUPPLIER_CREATE','test'=>$conf->fournisseur->enabled),
array('id'=>'MEMBER_CREATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_VALIDATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_SUBSCRIPTION', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_MODIFY', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_RESILIATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_DELETE', 'test'=>$conf->adherent->enabled),
*/
);
$securityevent=new Events($db);
$eventstolog=$securityevent->eventstolog;
/*
* Actions
*/
* Actions
*/
if ($action == "save")
{
$i=0;
$i=0;
$db->begin();
$db->begin();
foreach ($eventstolog as $key => $arr)
{
@ -93,8 +61,8 @@ if ($action == "save")
else dolibarr_del_const($db,$param,$conf->entity);
}
$db->commit();
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
$db->commit();
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
}
@ -130,14 +98,14 @@ foreach ($eventstolog as $key => $arr)
{
if ($arr['id'])
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$arr['id'].'</td>';
print '<td>';
$key='MAIN_LOGEVENTS_'.$arr['id'];
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$arr['id'].'</td>';
print '<td>';
$key='MAIN_LOGEVENTS_'.$arr['id'];
$value=$conf->global->$key;
print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.($value?' checked="true"':'').'>';
print '</td></tr>'."\n";
print '</td></tr>'."\n";
}
}
print '</table>';
@ -151,12 +119,10 @@ print "</form>\n";
print '</div>';
if ($mesg) print "<br>$mesg<br>";
print "<br>";
dol_htmloutput_mesg($mesg);
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 23:30:56 $ - $Revision: 1.20 $');
?>

9
htdocs/admin/sms.php
View File

@ -20,7 +20,7 @@
/**
* \file htdocs/admin/sms.php
* \brief Page to setup emails sending
* \version $Id$
* \version $Id: sms.php,v 1.8 2011/07/18 11:31:54 eldy Exp $
*/
require("../main.inc.php");
@ -156,8 +156,7 @@ print "<br>\n";
if ($message) print $message.'<br>';
// List of sending methods
$listofmethods=$conf->sms_engine;
$listofmethods['']='';
$listofmethods=(is_array($conf->sms_engine)?$conf->sms_engine:array());
asort($listofmethods);
if ($action == 'edit')
@ -189,7 +188,7 @@ if ($action == 'edit')
// Method
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
if (sizeof($listofmethods)) print $html->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE);
if (count($listofmethods)) print $html->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
else print '<font class="error">'.$langs->trans("None").'</font>';
print '</td></tr>';
@ -348,5 +347,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 11:31:54 $ - $Revision: 1.8 $');
?>

53
htdocs/admin/tools/listevents.php
View File

@ -21,19 +21,19 @@
* \file htdocs/admin/tools/listevents.php
* \ingroup core
* \brief List of security events
* \version $Id$
* \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/events.class.php');
if (! $user->admin)
accessforbidden();
accessforbidden();
// Security check
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
$action = '';
$socid = $user->societe_id;
}
$langs->load("admin");
@ -61,23 +61,48 @@ $search_ua = GETPOST("search_ua");
* Actions
*/
$now=dol_now();
// Purge audit events
if ($_REQUEST['action'] == 'confirm_purge' && $_REQUEST['confirm'] == 'yes' && $user->admin)
{
$error=0;
$db->begin();
$securityevents=new Events($db);
// Delete events
$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
$sql.= " WHERE entity = ".$conf->entity;
$resql = $db->query($sql);
if (! $resql)
{
$error++;
$mesg='<div class="error">'.$db->lasterror().'</div>';
}
// Add event purge
$text=$langs->trans("SecurityEventsPurged");
$securityevent=new Events($db);
$securityevent->type='SECURITY_EVENTS_PURGE';
$securityevent->dateevent=$now;
$securityevent->description=$text;
$result=$securityevent->create($user);
if ($result > 0)
{
dol_syslog($text, LOG_WARNING);
}
else
{
$error++;
dol_syslog($securityevent->error, LOG_ERROR);
$db->rolback();
}
}
/*
* View
*/
* View
*/
llxHeader();
@ -215,21 +240,21 @@ if ($result)
else print '<tr><td colspan="6">'.$langs->trans("NoEventOrNoAuditSetup").'</td></tr>';
}
print "</table>";
$db->free();
$db->free($result);
if ($num)
{
print '<div class="tabsAction">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
print '</div>';
print '<div class="tabsAction">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
print '</div>';
}
}
else
{
dol_print_error($db);
dol_print_error($db);
}
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
?>

19
htdocs/comm/action/fiche.php
View File

@ -24,7 +24,7 @@
* \file htdocs/comm/action/fiche.php
* \ingroup agenda
* \brief Page for event card
* \version $Id: fiche.php,v 1.226 2011/07/18 01:44:15 eldy Exp $
* \version $Id: fiche.php,v 1.227 2011/07/18 08:59:42 hregis Exp $
*/
require("../../main.inc.php");
@ -94,7 +94,8 @@ if ($action == 'add_action')
$_POST["apmonth"],
$_POST["apday"],
$_POST["apyear"]);
$datep2=dol_mktime(
$datef=dol_mktime(
$fulldayevent?'23':$_POST["p2hour"],
$fulldayevent?'59':$_POST["p2min"],
$fulldayevent?'59':'0',
@ -103,7 +104,7 @@ if ($action == 'add_action')
$_POST["p2year"]);
// Check parameters
if (! $datep2 && $_POST["percentage"] == 100)
if (! $datef && $_POST["percentage"] == 100)
{
$error=1;
$action = 'create';
@ -146,7 +147,7 @@ if ($action == 'add_action')
}
$actioncomm->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
$actioncomm->datep = $datep;
$actioncomm->datef = $datep2;
$actioncomm->datef = $datef;
$actioncomm->percentage = isset($_POST["percentage"])?$_POST["percentage"]:0;
$actioncomm->duree=(($_POST["dureehour"] * 60) + $_POST["dureemin"]) * 60;
@ -177,7 +178,7 @@ if ($action == 'add_action')
if ($_POST["add_phenix"] == 'on' && $conf->phenix->enabled) $actioncomm->use_phenix=1;
// Check parameters
if ($actioncomm->type_code == 'AC_RDV' && ($datep == '' || $datep2 == ''))
if ($actioncomm->type_code == 'AC_RDV' && ($datep == '' || $datef == ''))
{
$error=1;
$action = 'create';
@ -296,7 +297,7 @@ if ($action == 'update')
$_POST["apday"],
$_POST["apyear"]);
$datep2=dol_mktime(
$datef=dol_mktime(
$fulldayevent?'23':$_POST["p2hour"],
$fulldayevent?'59':$_POST["p2min"],
$fulldayevent?'59':'0',
@ -322,7 +323,7 @@ if ($action == 'update')
//print 'dddd'.$datep;
$actioncomm->label = $_POST["label"];
$actioncomm->datep = $datep;
$actioncomm->datef = $datep2;
$actioncomm->datef = $datef;
//$actioncomm->date = $datea;
//$actioncomm->dateend = $datea2;
$actioncomm->percentage = $_POST["percentage"];
@ -335,7 +336,7 @@ if ($action == 'update')
$actioncomm->note = $_POST["note"];
$actioncomm->pnote = $_POST["note"];
if (! $datep2 && $_POST["percentage"] == 100)
if (! $datef && $_POST["percentage"] == 100)
{
$error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd"));
$action = 'edit';
@ -1022,7 +1023,7 @@ if ($id)
$db->close();
llxFooter('$Date: 2011/07/18 01:44:15 $ - $Revision: 1.226 $');
llxFooter('$Date: 2011/07/18 08:59:42 $ - $Revision: 1.227 $');
/**

6
htdocs/comm/fiche.php
View File

@ -26,7 +26,7 @@
* \file htdocs/comm/fiche.php
* \ingroup commercial, compta
* \brief Page to show customer card of a third party
* \version $Id$
* \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $
*/
require("../main.inc.php");
@ -223,7 +223,7 @@ if ($socid > 0)
// Address
print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
dol_print_address($objsoc->address,'gmap','contact',$objsoc->id);
dol_print_address($objsoc->address,'gmap','thirdparty',$objsoc->id);
print "</td></tr>";
// Zip / Town
@ -892,5 +892,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $');
?>

6
htdocs/compta/prelevement/create.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/compta/prelevement/create.php
* \brief Prelevement
* \version $Id$
* \version $Id: create.php,v 1.33 2011/07/18 18:07:36 eldy Exp $
*/
require("../bank/pre.inc.php");
@ -141,7 +141,7 @@ if ($nb)
}
else
{
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoInvoiceToWithdraw")).'">'.$langs->trans("CreateAll")."</a>\n";
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw")).'">'.$langs->trans("CreateAll")."</a>\n";
}
//if ($nb11) print '<a class="butAction" href="create.php?action=create&amp;banque=1">'.$langs->trans("CreateBanque")."</a>\n";
//if ($nb1) print '<a class="butAction" href="create.php?action=create&amp;banque=1&amp;guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
@ -274,5 +274,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 18:07:36 $ - $Revision: 1.33 $');
?>

78
htdocs/compta/tva/clients.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/tva/clients.php
* \ingroup tax
* \brief Page des societes
* \version $Id$
* \version $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $
*/
require('../../main.inc.php');
@ -38,7 +38,7 @@ $langs->load("companies");
$langs->load("products");
// Date range
$year=$_REQUEST["year"];
$year=GETPOST("year");
if (empty($year))
{
$year_current = strftime("%Y",dol_now());
@ -52,24 +52,26 @@ $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"
// Quarter
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
$q=(! empty($_REQUEST["q"]))?$_REQUEST["q"]:0;
if ($q==0)
$q=GETPOST("q");
if (empty($q))
{
if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
else $q=1;
else
{
$month_current = strftime("%m",dol_now());
if ($month_current >= 10) $q=4;
elseif ($month_current >= 7) $q=3;
elseif ($month_current >= 4) $q=2;
else $q=1;
}
}
if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
}
else
{
// TODO We define q
}
$min = $_REQUEST["min"];
$min = GETPOST("min");
if (empty($min)) $min = 0;
// Define modetax (0 or 1)
@ -78,7 +80,7 @@ $modetax = $conf->global->TAX_MODE;
if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
// Security check
$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
$socid = GETPOST("socid");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
@ -104,7 +106,7 @@ $fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
$fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': ';
$fsearch.=' <input type="text" name="min" value="'.$min.'">';
$fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
// Affiche en-tete du rapport
if ($modetax==1) // Calculate on invoice for goods and services
@ -115,7 +117,8 @@ if ($modetax==1) // Calculate on invoice for goods and services
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATDue");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
$description.=$fsearch;
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
@ -137,9 +140,10 @@ if ($modetax==0) // Invoice for goods, payment for services
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATIn");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
$description.=$fsearch;
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$builddate=time();
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
$elementcust=$langs->trans("CustomersInvoices");
@ -167,7 +171,7 @@ print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Customer")."</td>";
print "<td>".$langs->trans("VATIntra")."</td>";
print "<td align=\"right\">".$langs->trans("SalesTurnover")." ".$langs->trans("HT")."</td>";
print "<td align=\"right\">".$langs->trans("AmountHTVATRealReceived")."</td>";
print "<td align=\"right\">".$vatcust."</td>";
print "</tr>\n";
@ -175,7 +179,7 @@ $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
if (is_array($coll_list))
{
$var=true;
$total = 0; $subtotal = 0;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)
{
@ -191,10 +195,11 @@ if (is_array($coll_list))
}
else
{
$intra = $langs->trans('NotRegistered');
//$intra = $langs->trans('NotRegistered');
$intra = '';
}
}
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;
@ -204,13 +209,17 @@ if (is_array($coll_list))
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
$totalamount = $totalamount + $coll->amount;
$total = $total + $coll->tva;
print "</tr>\n";
$i++;
}
}
$x_coll_sum = $total;
print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("Total").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td nowrap align="right">'.price($totalamount).'</td>';
print '<td nowrap align="right">'.price($total).'</td>';
print '</tr>';
}
else
@ -237,7 +246,7 @@ print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Supplier")."</td>";
print "<td>".$langs->trans("VATIntra")."</td>";
print "<td align=\"right\">".$langs->trans("Outcome")." ".$langs->trans("HT")."</td>";
print "<td align=\"right\">".$langs->trans("AmountHTVATRealPaid")."</td>";
print "<td align=\"right\">".$vatsup."</td>";
print "</tr>\n";
@ -247,7 +256,7 @@ $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
if (is_array($coll_list))
{
$var=true;
$total = 0; $subtotal = 0;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)
{
@ -263,7 +272,8 @@ if (is_array($coll_list))
}
else
{
$intra = $langs->trans('NotRegistered');
//$intra = $langs->trans('NotRegistered');
$intra = '';
}
}
print "<tr $bc[$var]>";
@ -276,14 +286,30 @@ if (is_array($coll_list))
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
$totalamount = $totalamount + $coll->amount;
$total = $total + $coll->tva;
print "</tr>\n";
$i++;
}
}
$x_paye_sum = $total;
print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("Total").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td nowrap align="right">'.price($totalamount).'</td>';
print '<td nowrap align="right">'.price($total).'</td>';
print '</tr>';
print '</table>';
// Total to pay
print '<br><br>';
print '<table class="noborder" width="100%">';
$diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">';
print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
print "</tr>\n";
}
else
{
@ -301,5 +327,5 @@ print '</table>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $');
?>

135
htdocs/compta/tva/quadri_detail.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/tva/quadri_detail.php
* \ingroup tax
* \brief Trimestrial page - detailed version
* \version $Id$
* \version $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $
* \todo Deal with recurrent invoices as well
*/
@ -44,7 +44,7 @@ $langs->load("companies");
$langs->load("products");
// Date range
$year=$_REQUEST["year"];
$year=GETPOST("year");
if (empty($year))
{
$year_current = strftime("%Y",dol_now());
@ -58,24 +58,26 @@ $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"
// Quarter
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
$q=(! empty($_REQUEST["q"]))?$_REQUEST["q"]:0;
if ($q==0)
$q=GETPOST("q");
if (empty($q))
{
if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
else $q=1;
else
{
$month_current = strftime("%m",dol_now());
if ($month_current >= 10) $q=4;
elseif ($month_current >= 7) $q=3;
elseif ($month_current >= 4) $q=2;
else $q=1;
}
}
if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
}
else
{
// TODO We define q
}
$min = $_REQUEST["min"];
$min = GETPOST("min");
if (empty($min)) $min = 0;
// Define modetax (0 or 1)
@ -85,7 +87,7 @@ if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
if (empty($modetax)) $modetax=0;
// Security check
$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
$socid = GETPOST("socid");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
@ -134,9 +136,10 @@ if ($modetax==1) // Calculate on invoice for goods and services
else { $nextquarter=1; $nextyear++; }
//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATDue");
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
$description.=$fsearch;
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$description.=$fsearch;
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
@ -164,7 +167,8 @@ if ($modetax==0) // Invoice for goods, payment for services
//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATIn");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
$description.=$fsearch;
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
@ -188,14 +192,10 @@ $vatsup=$langs->trans("VATPaid");
// VAT Received and paid
//print "<br>";
//print_titre($vatcust);
echo '<table class="noborder" width="100%">';
$y = $year_current;
$total = 0;
$subtotal = 0;
$i=0;
// Load arrays of datas
@ -416,21 +416,36 @@ else
$x_coll_sum += $temp_vat;
}
}
// Total customers
print '<tr class="liste_total">';
print '<td></td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
print '</tr>';
// Total customers for this vat rate
print '<tr class="liste_total">';
print '<td></td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
print '</tr>';
}
if (count($x_coll) == 0) // Show a total ine if nothing shown
{
print '<tr class="liste_total">';
print '<td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num(0,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num(0,'MT')).'</td>';
print '</tr>';
}
// Blank line
print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
//print table headers for this quadri - expenses now
@ -552,41 +567,51 @@ else
$x_paye_sum += $temp_vat;
}
}
// Total suppliers
print '<tr class="liste_total">';
print '<td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
print '</tr>';
// Total suppliers for this vat rate
print '<tr class="liste_total">';
print '<td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
print '</tr>';
}
print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
if (count($x_paye) == 0) // Show a total ine if nothing shown
{
print '<tr class="liste_total">';
print '<td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("Total").':</td>';
if ($modetax == 0)
{
print '<td nowrap align="right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>';
}
print '<td align="right">'.price(price2num(0,'MT')).'</td>';
print '<td nowrap align="right">'.price(price2num(0,'MT')).'</td>';
print '</tr>';
}
print '</table>';
// Total to pay
print '<tr class="liste_titre">';
print '<td class="liste_titre" colspan="'.($span-1).'"></td><td class="liste_titre" align="right" colspan="2">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').':</td>';
print '</tr>'."\n";
$diff = $x_coll_sum - $x_paye_sum;
print '<br><br>';
print '<table class="noborder" width="100%">';
$diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">';
print '<td class="liste_total" colspan="'.$span.'"></td>';
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
print "</tr>\n";
//print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>'."\n";
$i++;
}
echo '</table>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $');
?>

39
htdocs/core/class/events.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/core/class/events.class.php
* \ingroup core
* \brief File of class to manage security events.
* \version $Id$
* \version $Id: events.class.php,v 1.7 2011/07/18 23:32:00 eldy Exp $
* \author Laurent Destailleur
*/
@ -52,6 +52,42 @@ class Events // extends CommonObject
var $dateevent;
var $description;
// List of all events supported by triggers
var $eventstolog=array(
array('id'=>'USER_LOGIN', 'test'=>1),
array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
array('id'=>'USER_LOGOUT', 'test'=>1),
array('id'=>'USER_CREATE', 'test'=>1),
array('id'=>'USER_MODIFY', 'test'=>1),
array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
array('id'=>'USER_DELETE', 'test'=>1),
array('id'=>'GROUP_CREATE', 'test'=>1),
array('id'=>'GROUP_MODIFY', 'test'=>1),
array('id'=>'GROUP_DELETE', 'test'=>1),
/* array('id'=>'ACTION_CREATE', 'test'=>$conf->societe->enabled),
array('id'=>'COMPANY_CREATE', 'test'=>$conf->societe->enabled),
array('id'=>'CONTRACT_VALIDATE', 'test'=>$conf->contrat->enabled),
array('id'=>'PROPAL_VALIDATE', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_CLOSE_SIGNED', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_CLOSE_REFUSED', 'test'=>$conf->propal->enabled),
array('id'=>'PROPAL_SENTBYMAIL', 'test'=>$conf->propal->enabled),
array('id'=>'ORDER_VALIDATE', 'test'=>$conf->commande->enabled),
array('id'=>'ORDER_SENTBYMAIL', 'test'=>$conf->commande->enabled),
array('id'=>'BILL_VALIDATE', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_PAYED', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_CANCEL', 'test'=>$conf->facture->enabled),
array('id'=>'BILL_SENTBYMAIL', 'test'=>$conf->facture->enabled),
array('id'=>'PAYMENT_CUSTOMER_CREATE','test'=>$conf->facture->enabled),
array('id'=>'PAYMENT_SUPPLIER_CREATE','test'=>$conf->fournisseur->enabled),
array('id'=>'MEMBER_CREATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_VALIDATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_SUBSCRIPTION', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_MODIFY', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_RESILIATE', 'test'=>$conf->adherent->enabled),
array('id'=>'MEMBER_DELETE', 'test'=>$conf->adherent->enabled),
*/
);
/**
@ -75,7 +111,6 @@ class Events // extends CommonObject
global $conf, $langs;
// Clean parameters
$this->id=trim($this->id);
$this->description=trim($this->description);
// Check parameters

7
htdocs/core/class/menubase.class.php
View File

@ -20,7 +20,7 @@
/**
* \file htdocs/core/class/menubase.class.php
* \ingroup core
* \version $Id: menubase.class.php,v 1.26 2011/07/17 19:56:51 hregis Exp $
* \version $Id: menubase.class.php,v 1.27 2011/07/18 20:19:48 eldy Exp $
* \brief File of class to manage dynamic menu entries
* \remarks Initialy built by build_class_from_table on 2008-01-12 14:19
*/
@ -578,12 +578,11 @@ class Menubase
$tabMenu[$b][0] = $menu['rowid'];
$tabMenu[$b][1] = $menu['fk_menu'];
$tabMenu[$b][2] = $menu['url'];
// FIXME idmenu is already added in auguria.lib.php
/*if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
{
if (preg_match('/\?/',$tabMenu[$b][2])) $tabMenu[$b][2].='&amp;idmenu='.$menu['rowid'];
else $tabMenu[$b][2].='?idmenu='.$menu['rowid'];
}*/
}
$tabMenu[$b][3] = $chaine;
$tabMenu[$b][5] = $menu['target'];
$tabMenu[$b][6] = $menu['leftmenu'];

16
htdocs/fichinter/fiche.php
View File

@ -23,7 +23,7 @@
* \file htdocs/fichinter/fiche.php
* \brief Fichier fiche intervention
* \ingroup ficheinter
* \version $Id: fiche.php,v 1.171 2011/07/10 20:03:39 eldy Exp $
* \version $Id: fiche.php,v 1.172 2011/07/18 03:04:48 eldy Exp $
*/
require("../main.inc.php");
@ -1072,14 +1072,14 @@ elseif ($fichinterid)
// Validate
if ($object->statut == 0 && $user->rights->ficheinter->creer && sizeof($object->lines) > 0)
{
print '<a class="butAction" href="fiche.php?id='.$id.'&action=validate"';
print '<a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"';
print '>'.$langs->trans("Valid").'</a>';
}
// Modify
if ($object->statut == 1 && $user->rights->ficheinter->creer)
{
print '<a class="butAction" href="fiche.php?id='.$id.'&action=modify"';
print '<a class="butAction" href="fiche.php?id='.$object->id.'&action=modify"';
print '>'.$langs->trans("Modify").'</a>';
}
@ -1092,7 +1092,7 @@ elseif ($fichinterid)
{
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
}
else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
}
@ -1112,7 +1112,7 @@ elseif ($fichinterid)
{
if ($object->statut != 2)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
}
}
}
@ -1120,7 +1120,7 @@ elseif ($fichinterid)
// Delete
if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
{
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=delete"';
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
print '>'.$langs->trans('Delete').'</a>';
}
@ -1128,7 +1128,7 @@ elseif ($fichinterid)
}
print '</div>';
print '<br>';
if ($action != 'presend')
{
@ -1219,5 +1219,5 @@ elseif ($fichinterid)
$db->close();
llxFooter('$Date: 2011/07/10 20:03:39 $ - $Revision: 1.171 $');
llxFooter('$Date: 2011/07/18 03:04:48 $ - $Revision: 1.172 $');
?>

10
htdocs/includes/menus/init_menu_auguria.sql
View File

@ -1,6 +1,6 @@
--
-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
-- $Revision: 1.121 $
-- $Id: init_menu_auguria.sql,v 1.123 2011/07/18 19:25:48 eldy Exp $
-- $Revision: 1.123 $
--
-- Menu base entries
-- This file is loaded when a menu handler base is activated (auguria, etc..)
@ -33,7 +33,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
@ -254,7 +254,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members&amp;statut=0', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__);
-- Members - Subscriptions
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=accountancy&amp;mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__);
@ -263,7 +263,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled && $conf->export->enabled', __HANDLER__, 'left', 4501__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&amp;mainmenu=members', 'MembersType', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&amp;mainmenu=members', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&amp;mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__);
-- Members - Category member

11
htdocs/includes/menus/standard/auguria.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/auguria.lib.php
* \brief Library for file auguria menus
* \version $Id: auguria.lib.php,v 1.19 2011/07/18 00:58:35 eldy Exp $
* \version $Id: auguria.lib.php,v 1.20 2011/07/18 20:19:41 eldy Exp $
*/
@ -64,14 +64,15 @@ function print_auguria_menu($db,$atarget,$type_user)
else
{
$url=dol_buildpath($newTabMenu[$i]['url'],1);
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))
{
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&';
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
$url.="idmenu=".$newTabMenu[$i]['rowid'];
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
}
$url=preg_replace('/__LOGIN__/',$user->login,$url);
// Define the class (top menu selected or not)
if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';

12
htdocs/includes/menus/standard/eldy.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/eldy.lib.php
* \brief Library for file eldy menus
* \version $Id: eldy.lib.php,v 1.58 2011/07/18 00:57:40 eldy Exp $
* \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $
*/
@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user)
else
{
$url=dol_buildpath($newTabMenu[$i]['url'],1);
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))
{
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&';
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
$url.="idmenu=".$newTabMenu[$i]['rowid'];
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
}
$url=preg_replace('/__LOGIN__/',$user->login,$url);
@ -639,7 +639,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
if ($leftmenu=="setup") $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);

24
htdocs/langs/ar_SA/companies.lang
View File

@ -92,15 +92,15 @@ ProfId2=الهوية المهنية (2)
ProfId3=3 الهوية المهنية
ProfId4=الهوية المهنية 4
ProfId1AU=الأستاذ عيد 1 (ايه. بي.)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=الأستاذ عيد 1 (عدد المهنية)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=الأستاذ عيد 1 (عدد الاتحادية)
ProfId4CH=الأستاذ عيد 2 (رقم السجل التجاري)
ProfId1FR=الأستاذ عيد 1 (صفارة إنذار)
@ -108,9 +108,9 @@ ProfId2FR=الأستاذ عيد 2 (SIRET)
ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
ProfId1GB=الأستاذ عيد 1 (رقم التسجيل)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=3 الأستاذ عيد حسبما
ProfId4GB=--
ProfId4GB=-
ProfId1PT=الأستاذ عيد 1 (NIPC)
ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي)
ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري)
@ -214,7 +214,7 @@ PL_UNKNOWN=غير معروف
PL_LOW=منخفض
PL_MEDIUM=المتوسط
PL_HIGH=عال
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=بدء التشغيل
TE_GROUP=شركة كبرى
TE_MEDIUM=شركة المتوسط
@ -280,7 +280,7 @@ Company/Fundation=الشركة / المؤسسة
ProfId1DE=الأستاذ عيد 1 (USt. - IdNr)
ProfId2DE=الأستاذ عيد 2 (رقم USt. -)
ProfId3DE=الأستاذ عيد 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProspectLevelShort=المحتملة
// STOP - Lines generated via autotranslator.php tool (2009-08-19 21:04:44).

2
htdocs/langs/ar_SA/members.lang
View File

@ -124,7 +124,7 @@ ExportDataset_member_1=واشتراكات الأعضاء
LastMembers=ق أعضاء الماضي ٪
LastMembersModified=آخر تعديل اعضاء ق ٪
AttributeName=اسم السمة
FieldEdition=الطبعة مجال ٪
FieldEdition=الطبعة مجال ٪s
AlphaNumOnlyCharsAndNoSpace=إلا alphanumericals حرفا دون الفضاء
String=سلسلة
Text=النص

24
htdocs/langs/da_DK/companies.lang
View File

@ -90,15 +90,15 @@ ProfId2=Professional ID 2
ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id 1 (Professionnel nummer)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (Federal nummer)
ProfId4CH=Prof Id 2 (Commercial rekordstort antal)
ProfId1FR=Prof Id 1 (SIREN)
@ -106,9 +106,9 @@ ProfId2FR=Prof Id 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, gamle APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof ID 1 (Registration Number)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof ID 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Commercial rekordstort antal)
@ -213,7 +213,7 @@ PL_UNKNOWN=Ukendt
PL_LOW=Lav
PL_MEDIUM=Medium
PL_HIGH=Høj
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Startup
TE_GROUP=Stor virksomhed
TE_MEDIUM=Mellemstort selskab
@ -289,7 +289,7 @@ Company/Fundation=Company / Foundation
ProfId1DE=Prof Id 1 (USt.-IdNr)
ProfId2DE=Prof Id 2 (USt.-Nr)
ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:57:56).

2
htdocs/langs/da_DK/members.lang
View File

@ -118,7 +118,7 @@ ExportDataset_member_1=Medlemmer og abonnementer
LastMembers=Seneste %s medlemmer
LastMembersModified=Seneste %s modificerede medlemmer
AttributeName=Attribut navn
FieldEdition=% Område udgave
FieldEdition=Område udgave %s
AlphaNumOnlyCharsAndNoSpace=kun alphanumericals tegn uden mellemrum
String=String
Text=Tekst

22
htdocs/langs/de_AT/companies.lang
View File

@ -94,15 +94,15 @@ ProfId2AT=Firmenbuchgericht
ProfId3AT=Sonstige Steuernummer
ProfId4AT=Freies Feld
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id 1 (Anzahl Professionnel)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (Bundes-Nummer)
ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
ProfId1DE=Prof Id 1 (USt.-IdNr)
@ -114,9 +114,9 @@ ProfId2FR=Prof Id 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, alte APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof Id 1 (Registration Number)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof Id 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Commercial Record-Nummer)
@ -219,7 +219,7 @@ PL_UNKNOWN=Unbekannt
PL_LOW=Niedrig
PL_MEDIUM=Mittel
PL_HIGH=Hoch
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Startup
TE_GROUP=Großunternehmen
TE_MEDIUM=Mittleres Unternehmen

2
htdocs/langs/de_AT/members.lang
View File

@ -114,7 +114,7 @@ ExportDataset_member_1=Mitglieder und Abonnements
LastMembers=%s neueste Mitglieder
LastMembersModified=%s zuletzt bearbeitete Mitglieder
AttributeName=Attributname
FieldEdition=% Feldbearbeitung
FieldEdition=Feldbearbeitung %s
AlphaNumOnlyCharsAndNoSpace=ausschließlich alphanumerische Zeichen (ohne Leerzeichen)
String=Zeichenkette
Text=Text

22
htdocs/langs/de_DE/companies.lang
View File

@ -94,15 +94,15 @@ ProfId2AT=Firmenbuchgericht
ProfId3AT=Sonstige Steuernummer
ProfId4AT=Freies Feld
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id 1 (Anzahl Professionnel)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (Bundes-Nummer)
ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
ProfId1DE=Prof Id 1 (USt.-IdNr)
@ -114,9 +114,9 @@ ProfId2FR=Prof Id 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, alte APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof Id 1 (Registration Number)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof Id 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Commercial Record-Nummer)
@ -219,7 +219,7 @@ PL_UNKNOWN=Unbekannt
PL_LOW=Niedrig
PL_MEDIUM=Mittel
PL_HIGH=Hoch
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Startup
TE_GROUP=Großunternehmen
TE_MEDIUM=Mittleres Unternehmen

2
htdocs/langs/de_DE/members.lang
View File

@ -111,7 +111,7 @@ ExportDataset_member_1=Mitglieder und Abonnements
LastMembers=%s neueste Mitglieder
LastMembersModified=%s zuletzt bearbeitete Mitglieder
AttributeName=Attributname
FieldEdition=% Feldbearbeitung
FieldEdition=Feldbearbeitung %s
AlphaNumOnlyCharsAndNoSpace=ausschließlich alphanumerische Zeichen (ohne Leerzeichen)
String=Zeichenkette
Text=Text

2
htdocs/langs/el_GR/members.lang
View File

@ -118,7 +118,7 @@ ImportDataset_member_1=Μέλη
LastMembers=Last %s members
LastMembersModified=Last %s modified members
AttributeName=Attribute name
FieldEdition=% field edition
FieldEdition=Field edition %s
AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
String=String
Text=Text

1
htdocs/langs/en_US/admin.lang
View File

@ -307,6 +307,7 @@ ResponseTimeout=Response timeout
SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
SecurityToken=Key to encrypt urls
NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on http://www.dolistore.com
# Modules
Module0Name=Users & groups

25
htdocs/langs/en_US/companies.lang
View File

@ -91,76 +91,97 @@ ProfId1Short=Prof. id 1
ProfId2Short=Prof. id 2
ProfId3Short=Prof. id 3
ProfId4Short=Prof. id 4
ProfId5Short=Prof. id 5
ProfId1=Professional ID 1
ProfId2=Professional ID 2
ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId5=Professional ID 5
ProfId1AR=Prof Id 1 (CUIT/CUIL)
ProfId2AR=Prof Id 2 (Revenu brutes)
ProfId3AR=-
ProfId4AR=-
ProfId5AR=-
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId5AU=-
ProfId1BE=Prof Id 1 (Professional number)
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId5BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (Federal number)
ProfId4CH=Prof Id 2 (Commercial Record number)
ProfId5CH=-
ProfId1CL=Prof Id 1 (R.U.T.)
ProfId2CL=-
ProfId3CL=-
ProfId4CL=-
ProfId5CL=-
ProfId1DE=Prof Id 1 (USt.-IdNr)
ProfId2DE=Prof Id 2 (USt.-Nr)
ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
ProfId4DE=-
ProfId5DE=-
ProfId1ES=Prof Id 1 (CIF/NIF)
ProfId2ES=Prof Id 2 (Social security number)
ProfId3ES=Prof Id 3 (CNAE)
ProfId4ES=Prof Id 4 (Collegiate number)
ProfId5ES=-
ProfId1FR=Prof Id 1 (SIREN)
ProfId2FR=Prof Id 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, old APE)
ProfId4FR=Prof Id 4 (RCS/RM)
ProfId1GB=Prof Id 1 (Registration Number)
ProfId5FR=Prof Id 5
ProfId1GB=Registration Number
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId3GB=SIC
ProfId4GB=-
ProfId5GB=-
ProfId1HN=Id prof. 1 (RTN)
ProfId2HN=-
ProfId3HN=-
ProfId4HN=-
ProfId5HN=-
ProfId1IN=Prof Id 1 (TIN)
ProfId2IN=Prof Id 2
ProfId3IN=Prof Id 3
ProfId4IN=Prof Id 4
ProfId5IN=Prof Id 5
ProfId1MA=Id prof. 1 (R.C.)
ProfId2MA=Id prof. 2 (Patente)
ProfId3MA=Id prof. 3 (I.F.)
ProfId4MA=Id prof. 4 (C.N.S.S.)
ProfId5MA=-
ProfId1MX=Prof Id 1 (R.F.C).
ProfId2MX=Prof Id 2 (R..P. IMSS)
ProfId3MX=Prof Id 3 (Profesional Charter)
ProfId4MX=-
ProfId5MX=-
ProfId1NL=KVK nummer
ProfId2NL=-
ProfId3NL=-
ProfId4NL=-
ProfId5NL=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof Id 2 (Social security number)
ProfId3PT=Prof Id 3 (Commercial Record number)
ProfId4PT=Prof Id 4 (Conservatory)
ProfId5PT=-
ProfId1SN=RC
ProfId2SN=NINEA
ProfId3SN=-
ProfId4SN=-
ProfId5SN=-
ProfId1TN=Prof Id 1 (RC)
ProfId2TN=Prof Id 2 (Fiscal matricule)
ProfId3TN=Prof Id 3 (Douane code)
ProfId4TN=Prof Id 4 (BAN)
ProfId5TN=-
VATIntra=VAT number
VATIntraShort=VAT number
VATIntraVeryShort=VAT

1
htdocs/langs/en_US/compta.lang
View File

@ -128,3 +128,4 @@ InvoiceRef=Invoice ref.
CodeNotDef=Not defined
AddRemind=Dispatch available amount
RemainToDivide= Remain to dispatch :
WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.

2
htdocs/langs/en_US/members.lang
View File

@ -118,7 +118,7 @@ ImportDataset_member_1=Members
LastMembers=Last %s members
LastMembersModified=Last %s modified members
AttributeName=Attribute name
FieldEdition=% field edition
FieldEdition=Edition of field %s
AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
String=String
Text=Text

22
htdocs/langs/en_US/products.lang
View File

@ -47,17 +47,17 @@ Movement=Movement
Movements=Movements
Sell=Sales
Buy=Purchases
OnSell=Sold
OnBuy=Purchased
NotOnSell=Obsolete
ProductStatusOnSell=Available
ProductStatusNotOnSell=Obsolete
ProductStatusOnSellShort=Available
ProductStatusNotOnSellShort=Obsolete
ProductStatusOnBuy=Available
ProductStatusNotOnBuy=Obsolete
ProductStatusOnBuyShort=Available
ProductStatusNotOnBuyShort=Obsolete
OnSell=For sale
OnBuy=For purchase
NotOnSell=Not for sale
ProductStatusOnSell=For sale
ProductStatusNotOnSell=Not for sale
ProductStatusOnSellShort=For sale
ProductStatusNotOnSellShort=Not for sale
ProductStatusOnBuy=For purchase
ProductStatusNotOnBuy=Not for purchase
ProductStatusOnBuyShort=For purchase
ProductStatusNotOnBuyShort=Not for purchase
UpdatePrice=Update price
AppliedPricesFrom=Applied prices from
SellingPrice=Selling price

20
htdocs/langs/es_ES/companies.lang
View File

@ -98,6 +98,7 @@ ProfId1AR=CUIT/CUIL
ProfId2AR=Ingresos brutos
ProfId3AR=-
ProfId4AR=-
ProfId5AR=-
ProfId1=ID profesional 1
ProfId2=ID profesional 2
ProfId3=ID profesional 3
@ -107,10 +108,12 @@ ProfId1AU=ABN
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId5AU=-
ProfId1BE=N° colegiado
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId5BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Número federado
@ -119,52 +122,67 @@ ProfId1CL=R.U.T.
ProfId2CL=-
ProfId3CL=-
ProfId4CL=-
ProfId5CL=-
ProfId1DE=Id prof. 1 (USt.-IdNr)
ProfId2DE=Id prof. 2 (USt.-Nr)
ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
ProfId4DE=-
ProfId5DE=-
ProfId1ES=CIF/NIF
ProfId2ES=Núm seguridad social
ProfId3ES=CNAE
ProfId4ES=Núm colegiado
ProfId5ES=-
ProfId1FR=SIREN
ProfId2FR=SIRET
ProfId3FR=NAF (Ex APE)
ProfId4FR=RCS/RM
ProfId5FR=-
ProfId1GB=Número registro
ProfId2GB=-
ProfId3GB=SIC
ProfId4GB=-
ProfId5GB=-
ProfId1HN=RTN
ProfId2HN=-
ProfId3HN=-
ProfId4HN=-
ProfId5HN=-
ProfId1IN=Id prof. 1 (TIN)
ProfId2IN=Id prof. 2
ProfId3IN=Id prof. 3
ProfId4IN=Id prof. 4
ProfId5IN=Id prof. 5
ProfId1MA=Id prof. 1 (R.C.)
ProfId2MA=Id prof. 2 (Patente)
ProfId3MA=Id prof. 3 (I.F.)
ProfId4MA=Id prof. 4 (C.N.S.S.)
ProfId5MA=Id prof. 5
ProfId1MX=R.F.C.
ProfId2MX=Registro Patronal IMSS
ProfId3MX=Cédula Profesional
ProfId4MX=-
ProfId5MX=-
ProfId1NL=Número KVK
ProfId2NL=-
ProfId3NL=-
ProfId4NL=-
ProfId5NL=-
ProfId1PT=NIPC
ProfId2PT=Núm. seguridad social
ProfId3PT=Num reg. comercial
ProfId4PT=Conservatorio
ProfId5PT=-
ProfId1SN=RC
ProfId2SN=NINEA
ProfId2SN=-
ProfId3SN=-
ProfId4SN=-
ProfId5SN=-
ProfId1TN=RC
ProfId2TN=Matrícula fiscal
ProfId3TN=Código en aduana
ProfId4TN=CCC
ProfId5TN=-
VATIntra=NIF intracomunitario
VATIntraShort=NIF intra.
VATIntraVeryShort=NIF intra.

24
htdocs/langs/fa_IR/companies.lang
View File

@ -92,15 +92,15 @@ ProfId2=الهوية المهنية (2)
ProfId3=3 الهوية المهنية
ProfId4=الهوية المهنية 4
ProfId1AU=الأستاذ عيد 1 (ايه. بي.)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=الأستاذ عيد 1 (عدد المهنية)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=الأستاذ عيد 1 (عدد الاتحادية)
ProfId4CH=الأستاذ عيد 2 (رقم السجل التجاري)
ProfId1FR=الأستاذ عيد 1 (صفارة إنذار)
@ -108,9 +108,9 @@ ProfId2FR=الأستاذ عيد 2 (SIRET)
ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
ProfId1GB=الأستاذ عيد 1 (رقم التسجيل)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=3 الأستاذ عيد حسبما
ProfId4GB=--
ProfId4GB=-
ProfId1PT=الأستاذ عيد 1 (NIPC)
ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي)
ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري)
@ -214,7 +214,7 @@ PL_UNKNOWN=غير معروف
PL_LOW=منخفض
PL_MEDIUM=المتوسط
PL_HIGH=عال
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=بدء التشغيل
TE_GROUP=شركة كبرى
TE_MEDIUM=شركة المتوسط
@ -280,7 +280,7 @@ Company/Fundation=الشركة / المؤسسة
ProfId1DE=الأستاذ عيد 1 (USt. - IdNr)
ProfId2DE=الأستاذ عيد 2 (رقم USt. -)
ProfId3DE=الأستاذ عيد 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProspectLevelShort=المحتملة
// STOP - Lines generated via autotranslator.php tool (2009-08-19 21:04:44).

2
htdocs/langs/fa_IR/members.lang
View File

@ -124,7 +124,7 @@ ExportDataset_member_1=واشتراكات الأعضاء
LastMembers=ق أعضاء الماضي ٪
LastMembersModified=آخر تعديل اعضاء ق ٪
AttributeName=اسم السمة
FieldEdition=الطبعة مجال ٪
FieldEdition=الطبعة مجال ٪s
AlphaNumOnlyCharsAndNoSpace=إلا alphanumericals حرفا دون الفضاء
String=سلسلة
Text=النص

24
htdocs/langs/fi_FI/companies.lang
View File

@ -88,15 +88,15 @@ ProfId2=Professional-tunnuksen 2
ProfId3=Professional-tunnuksen 3
ProfId4=Professional-tunnuksen 4
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id 1 (professionnel numero)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (liittovaltion numero)
ProfId4CH=Prof Id 2 (Commercial Record numero)
ProfId1FR=Prof Id 1 (SIREN)
@ -104,9 +104,9 @@ ProfId2FR=Prof Id 2 (Siret)
ProfId3FR=Prof Id 3 (NAF, vanha APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof Id 1 (Registration Number)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof Id 2 (Sosiaaliturva numero)
ProfId3PT=Prof Id 3 (Commercial Record numero)
@ -210,7 +210,7 @@ PL_UNKNOWN=Tuntematon
PL_LOW=Matala
PL_MEDIUM=Medium
PL_HIGH=Korkea
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Käynnistys
TE_GROUP=Suuri yritys
TE_MEDIUM=Keskikokoinen yritys
@ -285,7 +285,7 @@ Company/Fundation=Yritys / säätiö
ProfId1DE=Prof Id 1 (USt.-IdNr)
ProfId2DE=Prof Id 2 (USt.-Nr)
ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProspectLevelShort=Mahdollinen
ExportDataset_company_1=Yhtiöiden / säätiöiden ja ominaisuudet
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:44:21).

2
htdocs/langs/fi_FI/members.lang
View File

@ -116,7 +116,7 @@ ExportDataset_member_1=Jäsenet ja tilaukset
LastMembers=Viimeisin %s jäseniä
LastMembersModified=Viimeisin %s muunnettu jäseniä
AttributeName=Attribuutin nimi
FieldEdition=% Alalla painos
FieldEdition=Alalla painos %s
AlphaNumOnlyCharsAndNoSpace=vain alphanumericals merkkiä ilman tilaa
String=String
Text=Teksti

1
htdocs/langs/fr_FR/admin.lang
View File

@ -308,6 +308,7 @@ ResponseTimeout=Timeout de réponse
SmsTestMessage=Message de test de __PHONEFROM__ vers __PHONETO__
ModuleMustBeEnabledFirst=Le module <b>%s</b> doit etre activé pour utiliser cette fonction.
SecurityToken=Clé de cryptage des url
NoSmsEngine=Aucun gestionnaire d'envoi de SMS n'est disponible. Les gestionnaires d'envois SMS ne sont pas installés en standard (car dépendent d'un fournisseur) mais vous pourrez en trouver depuis la plateforme http://www.dolistore.com
# Modules= undefined
Module0Name= Utilisateurs & groupes

22
htdocs/langs/fr_FR/companies.lang
View File

@ -103,69 +103,87 @@ ProfId1AR=Id prof. 1 (CUIT/CUIL)
ProfId2AR=Id prof. 2 (Revenu brutes)
ProfId3AR=-
ProfId4AR=-
ProfId5AR=-
ProfId1AU=Id prof. 1 (ABN)
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId5AU=-
ProfId1BE=Id prof. 1 (N° professionnel)
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId5BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Numéro fédéral
ProfId4CH=Num registre du commerce
ProfId5CH=-
ProfId1CL=Prof Id 1 (R.U.T.)
ProfId2CL=-
ProfId3CL=-
ProfId4CL=-
ProfId5CL=-
ProfId1DE=Id prof. 1 (USt.-IdNr)
ProfId2DE=Id prof. 2 (USt.-Nr)
ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
ProfId4DE=-
ProfId5DE=-
ProfId1ES=Id prof. 1 (CIF/NIF)
ProfId2ES=Id prof. 2 (Num sécurité social)
ProfId3ES=Id prof. 3 (CNAE)
ProfId4ES=Id prof. 4 (Num Collégiale)
ProfId5ES=-
ProfId1FR=Id prof. 1 (SIREN)
ProfId2FR=Id prof. 2 (SIRET)
ProfId3FR=Id prof. 3 (NAF, ex APE)
ProfId4FR=Id prof. 4 (RCS/RM)
ProfId5FR=Id prof. 5
ProfId1GB=Id prof. 1 (Registration Number)
ProfId1GB=Registration Number
ProfId2GB=-
ProfId3GB=Id prof. 3 (SIC)
ProfId3GB=SIC
ProfId4GB=-
ProfId5GB=-
ProfId1HN=Id prof. 1 (RTN)
ProfId2HN=-
ProfId3HN=-
ProfId4HN=-
ProfId5HN=-
ProfId1IN=Id prof. 1 (TIN)
ProfId2IN=Id prof. 2
ProfId3IN=Id prof. 3
ProfId4IN=Id prof. 4
ProfId5IN=Id prof. 5
ProfId1MA=Id prof. 1 (R.C.)
ProfId2MA=Id prof. 2 (Patente)
ProfId3MA=Id prof. 3 (I.F.)
ProfId4MA=Id prof. 4 (C.N.S.S.)
ProfId5MA=-
ProfId1MX=Prof Id 1 (R.F.C).
ProfId2MX=Prof Id 2 (R..P. IMSS)
ProfId3MX=Prof Id 3 (Charte Profesional)
ProfId4MX=-
ProfId5MX=-
ProfId1NL=KVK nummer
ProfId2NL=-
ProfId3NL=-
ProfId4NL=-
ProfId5NL=-
ProfId1PT=Id prof. 1 (NIPC)
ProfId2PT=Id prof. 2 (Num sécurité social)
ProfId3PT=Id prof. 3 (Num enreg. commercial)
ProfId4PT=Id prof. 4 (Conservatory)
ProfId5PT=Id prof. 5
ProfId1SN=RC
ProfId2SN=NINEA
ProfId3SN=-
ProfId4SN=-
ProfId5SN=-
ProfId1TN=Id prof. 1 (RC)
ProfId2TN=Id prof. 2 (Matricule fiscal)
ProfId3TN=Id prof. 3 (Code en douane)
ProfId4TN=Id prof. 4 (BAN)
ProfId5TN=-
VATIntra=Numéro de TVA
VATIntraShort=Num TVA
VATIntraVeryShort=N° TVA

3
htdocs/langs/fr_FR/compta.lang
View File

@ -139,4 +139,5 @@ COMPTA_VAT_ACCOUNT=Code comptable par défaut pour TVA (si non défini dans dict
COMPTA_ACCOUNT_CUSTOMER=Code comptable client par défaut (si non défini sur fiche tiers)
COMPTA_ACCOUNT_SUPPLIER=Code comptable fournisseur par défaut (si non défini sur fiche tiers)
AddRemind=Ventiler montant disponible
RemainToDivide=Reste à répartir :
RemainToDivide=Reste à répartir :
WarningDepositsNotIncluded=Les factures d'accomptes ne sont pas encore prises en compte dans cette version avec ce module de comptabilité.

2
htdocs/langs/it_IT/companies.lang
View File

@ -293,7 +293,7 @@ LeopardNumRefModelDesc=Codice cliente / fornitore libero. Questo codice può ess
ProfId1DE=Id Prof 1 (USt.-IdNr)
ProfId2DE=Id Prof 2 (USt.-Nr)
ProfId3DE=Id Prof 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:42:54).

2
htdocs/langs/it_IT/members.lang
View File

@ -105,7 +105,7 @@ ExportDataset_member_1 =Membri e abbonamenti
LastMembers =Ultimi %s membri
LastMembersModified =Ultim %s membri modificati
AttributeName =Nome attributo
FieldEdition =% edizione campo
FieldEdition =Edizione campo %s
AlphaNumOnlyCharsAndNoSpace =solo caratteri alfanumerici senza spazi
String =Stringa
Text =Testo

2
htdocs/langs/nb_NO/members.lang
View File

@ -132,7 +132,7 @@ ExportDataset_member_1=Medlemmer og abonnementer
LastMembers=Siste %s medlemmer
LastMembersModified=Sist endret %s medlemmer
AttributeName=Attributtnavn
FieldEdition=% Felt utgave
FieldEdition=Felt utgave %s
AlphaNumOnlyCharsAndNoSpace=Kun alphanumericals tegn uten mellomrom
String=String
Text=Tekst

6
htdocs/langs/nl_BE/companies.lang
View File

@ -218,8 +218,8 @@ ProfId1Short=Prof id 1
ProfId2Short=Prof id 2
ProfId3Short=Prof id 3
ProfId4Short=Prof id 4
ProfId1CH=--
ProfId2CH=--
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof. id 1 (Federale nummer)
ProfId4CH=Prof. id 2 (Commerciële Record aantal)
ProfId1TN=Prof. id 1 (RC)
@ -248,7 +248,7 @@ PL_UNKNOWN=Onbekend
PL_LOW=Laag
PL_MEDIUM=Medium
PL_HIGH=Hoog
TE_UNKNOWN=--
TE_UNKNOWN=-
DeleteFile=Verwijder bestand
ConfirmDeleteFile=Weet u zeker dat u dit bestand wilt verwijderen?
AllocateCommercial=Toewijzing van een commerciële

26
htdocs/langs/nl_NL/companies.lang
View File

@ -93,29 +93,29 @@ ProfId2=Professional ID 2
ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId1AU=Prof. id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof. id 1 (Professionnel nummer)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Federale Nummer
ProfId4CH=Nummer handelsregister
ProfId1DE=Prof. id 1 (USt.-IdNr)
ProfId2DE=Prof. id 2 (USt.-Nr)
ProfId3DE=Prof. Id 3 (KVK Nr.)
ProfId4DE=--
ProfId4DE=-
ProfId1FR=Prof. id 1 (SIREN)
ProfId2FR=Prof. id 2 (SIRET)
ProfId3FR=Prof. Id 3 (NAF, oude APE)
ProfId4FR=Prof. id 4 (RCS / RM)
ProfId1GB=Prof. id 1 (Registratie Nummer)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof. Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1MA=Id prof. 1 (R.C.)
ProfId2MA=Id prof. 2 (Patente)
ProfId3MA=Id prof. 3 (I.F.)
@ -133,8 +133,8 @@ ProfId2ES= (Burgerservicenummer)
ProfId3ES= (IAE)
ProfId4ES= ()
ProfId1NL=KVK nummer
ProfId2NL=--
ProfId3NL=--
ProfId2NL=-
ProfId3NL=-
ProfId4NL=Burgerservicenummer
VATIntra=BTW-nummer
VATIntraShort=BTW-nummer

2
htdocs/langs/nl_NL/members.lang
View File

@ -116,7 +116,7 @@ ExportDataset_member_1=Leden en abonnementen
LastMembers=Laatste %s leden
LastMembersModified=Laatste %s bewerkte leden
AttributeName=Attribuut naam
FieldEdition=% Gebied uitgave
FieldEdition=Gebied uitgave %s
AlphaNumOnlyCharsAndNoSpace=alleen alphanumerieke tekens zonder spaties
String=String
Text=Tekst

24
htdocs/langs/pl_PL/companies.lang
View File

@ -91,15 +91,15 @@ ProfId2=Profesjonalne ID 2
ProfId3=Profesjonalne ID 3
ProfId4=Profesjonalne ID 4
ProfId1AU=Prof Id 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id 1 (numer Professionnel)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id 1 (Federal numer)
ProfId4CH=Prof ID 2 (Commercial rekordowa liczba)
ProfId1FR=Prof Id 1 (SIREN)
@ -107,9 +107,9 @@ ProfId2FR=Prof ID 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, stare APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof Id 1 (numer rejestracyjny)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id 1 (NIPC)
ProfId2PT=Prof ID 2 (numer ubezpieczenia społecznego)
ProfId3PT=Prof Id 3 (Commercial rekordowa liczba)
@ -213,7 +213,7 @@ PL_UNKNOWN=Nieznany
PL_LOW=Niski
PL_MEDIUM=Średni
PL_HIGH=Wysoki
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Uruchamianie
TE_GROUP=Duże firmy
TE_MEDIUM=Średnie firmy
@ -288,7 +288,7 @@ LeopardNumRefModelDesc=Klient / dostawcy kod jest bezpłatny. Ten kod może być
ProfId1DE=Prof Id 1 (USt.-IdNr)
ProfId2DE=Prof ID 2 (USt. Nr)
ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProspectLevelShort=Potencjalne
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:27:54).

2
htdocs/langs/pl_PL/members.lang
View File

@ -119,7 +119,7 @@ ExportDataset_member_1=Członkowie i abonamentów
LastMembers=Ostatnia %s użytkowników
LastMembersModified=Ostatnia %s zmodyfikowane użytkowników
AttributeName=Nazwa atrybutu
FieldEdition=% Dziedzinie wydanie
FieldEdition=Dziedzinie wydanie %s
AlphaNumOnlyCharsAndNoSpace=tylko alphanumericals znaków bez spacji
String=String
Text=Tekst

2
htdocs/langs/pt_BR/members.lang
View File

@ -111,7 +111,7 @@ ExportDataset_member_1=Membros e Filiações
LastMembers=os %s últimos Membros
LastMembersModified=os %s últimos Membros modificados
AttributeName=Nome do atributo
FieldEdition=edição do campo %s
FieldEdition=Edição do campo %s
AlphaNumOnlyCharsAndNoSpace=somente caracteres alfanuméricos espaços
String=Cadeia
Text=Texto largo

2
htdocs/langs/pt_PT/members.lang
View File

@ -108,7 +108,7 @@ ExportDataset_member_1=Membros e Filicações
LastMembers=os %s últimos Membros
LastMembersModified=os %s últimos Membros modificados
AttributeName=Nome do atributo
FieldEdition=edição do campo %s
FieldEdition=Edição do campo %s
AlphaNumOnlyCharsAndNoSpace=somente carateres alfanuméricos espaços
String=Cadeia
Text=Texto largo

24
htdocs/langs/ro_RO/companies.lang
View File

@ -89,15 +89,15 @@ ProfId2=Professional ID 2
ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId1AU=Prof Id-ul 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof Id-ul 1 (Professionnel număr)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof Id-ul 1 (Federal număr)
ProfId4CH=Prof Id-ul 2 (Comerciale număr record)
ProfId1FR=Prof Id-ul 1 (sirena)
@ -105,9 +105,9 @@ ProfId2FR=Prof Id-ul 2 (SIRET)
ProfId3FR=Prof Id 3 (NAF, vechi APE)
ProfId4FR=Prof Id 4 (RCS / RM)
ProfId1GB=Prof Id-ul 1 (numărul de înregistrare)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof Id-ul 1 (NIPC)
ProfId2PT=Prof Id-ul 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Comerciale număr record)
@ -211,7 +211,7 @@ PL_UNKNOWN=Necunoscut
PL_LOW=Jos
PL_MEDIUM=Mediu
PL_HIGH=Înalt
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Startup
TE_GROUP=Companii mari
TE_MEDIUM=Mediu companie
@ -286,7 +286,7 @@ LeopardNumRefModelDesc=Client / furnizor de cod este gratuit. Acest cod poate fi
ProfId1DE=Prof Id-ul 1 (USt.-IdNr)
ProfId2DE=Prof Id-ul 2 (USt.-NR)
ProfId3DE=Prof Id-ul 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProspectLevelShort=Potential
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:22:33).

2
htdocs/langs/ro_RO/members.lang
View File

@ -117,7 +117,7 @@ ExportDataset_member_1=Membrii şi abonamente
LastMembers=Ultima %s membri
LastMembersModified=Ultima %s modificate membri
AttributeName=Nume de atribut
FieldEdition=% Domeniul ediţie
FieldEdition=Domeniul ediţie %s
AlphaNumOnlyCharsAndNoSpace=numai alphanumericals caractere fără spaţiu
String=String
Text=Text

24
htdocs/langs/ru_RU/companies.lang
View File

@ -89,15 +89,15 @@ ProfId2=Профессиональные ID 2
ProfId3=Профессиональные ID 3
ProfId4=Профессиональные ID 4
ProfId1AU=Проф Id 1 (АБН)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Проф Id 1 (Professionnel число)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Проф ID 1 (федеральный номер)
ProfId4CH=Проф Id 2 (коммерческий Запись номер)
ProfId1FR=Проф Id 1 (SIREN)
@ -105,9 +105,9 @@ ProfId2FR=Проф Id 2 (SIRET)
ProfId3FR=Проф Id 3 (NAF, старые APE)
ProfId4FR=Проф Id 4 (RCS / РМ)
ProfId1GB=Проф ID 1 (регистрационный номер)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Проф Id 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Проф ID 1 (NIPC)
ProfId2PT=Проф Id 2 (номера социального страхования)
ProfId3PT=Проф Id 3 (коммерческий Запись номер)
@ -212,7 +212,7 @@ PL_UNKNOWN=Неизвестно
PL_LOW=Низко
PL_MEDIUM=Средне
PL_HIGH=Высокий
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Запуск
TE_GROUP=Большие компании
TE_MEDIUM=Средняя компания
@ -287,7 +287,7 @@ LeopardNumRefModelDesc=Клиент / код поставщика являетс
ProfId1DE=Проф ID 1 (USt.-IdNr)
ProfId2DE=Проф Id 2 (USt.-NR)
ProfId3DE=Проф ID 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:18:27).

2
htdocs/langs/ru_RU/members.lang
View File

@ -117,7 +117,7 @@ ExportDataset_member_1=Члены и подписки
LastMembers=Последнее% с членами
LastMembersModified=Последнее% с измененными участники
AttributeName=Название атрибута
FieldEdition=% Местах издание
FieldEdition=Местах издание %s
AlphaNumOnlyCharsAndNoSpace=только alphanumericals знаков без пространства
String=String
Text=Текст

2
htdocs/langs/sv_SE/members.lang
View File

@ -124,7 +124,7 @@ ExportDataset_member_1=Medlemmar och prenumerationer
LastMembers=Senaste %s medlemmar
LastMembersModified=Senast %s uppdaterad medlemmar
AttributeName=Attributnamn
FieldEdition=% Fält utgåva
FieldEdition=Fält utgåva %s
AlphaNumOnlyCharsAndNoSpace=bara alphanumericals tecken utan mellanslag
String=String
Text=Text

24
htdocs/langs/tr_TR/companies.lang
View File

@ -94,29 +94,29 @@ ProfId2=Profesyonel 2 numarası
ProfId3=Profesyonel 3 numarası
ProfId4=Profesyonel 4 numarası
ProfId1AU=Prof No 1 (ABN)
ProfId2AU=--
ProfId3AU=--
ProfId4AU=--
ProfId2AU=-
ProfId3AU=-
ProfId4AU=-
ProfId1BE=Prof No 1 (Profesyonel sayı)
ProfId2BE=--
ProfId3BE=--
ProfId4BE=--
ProfId1CH=--
ProfId2CH=--
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1CH=-
ProfId2CH=-
ProfId3CH=Prof No 1 (Federal sayı)
ProfId4CH=Prof No 2 (Ticari kayıt numarası)
ProfId1DE=Prof No 1 (Ust.-IdNr)
ProfId2DE=Prof No 2 (Ust.-Nr)
ProfId3DE=Prof No 3 (Handelsregister-Nr.)
ProfId4DE=--
ProfId4DE=-
ProfId1FR=Prof No 1 (SİREN)
ProfId2FR=Prof No 2 (Siret)
ProfId3FR=Prof No 3 (KAF, eski APE)
ProfId4FR=Prof No 4 (RCS / RM)
ProfId1GB=Prof No 1 (Registration Number)
ProfId2GB=--
ProfId2GB=-
ProfId3GB=Prof No 3 (SIC)
ProfId4GB=--
ProfId4GB=-
ProfId1PT=Prof No 1 (NIPC)
ProfId2PT=Prof No 2 (Sosyal güvenlik numarası)
ProfId3PT=Prof No 3 (Ticari Tutanak sayı)
@ -225,7 +225,7 @@ PL_UNKNOWN=Unknown
PL_LOW=Alçak
PL_MEDIUM=Orta
PL_HIGH=Yüksek
TE_UNKNOWN=--
TE_UNKNOWN=-
TE_STARTUP=Başlangıç
TE_GROUP=Büyük bir şirket
TE_MEDIUM=Orta ölçekli bir firmanın

6
htdocs/langs/tr_TR/members.lang
View File

@ -121,10 +121,10 @@ PublicMemberList=Kamu üye listesi
BlankSubscriptionForm=Abone Formu
MemberPublicLinks=Kamu bağlantılar / sayfaları
ExportDataset_member_1=Üyeleri ve abonelikleri
LastMembers=Son %s üye
LastMembersModified=Son %s üye olarak
LastMembers=Son %s üye
LastMembersModified=Son %s üye olarak
AttributeName=Özellik adı
FieldEdition=% Alan baskı
FieldEdition=Alan baskı %s
AlphaNumOnlyCharsAndNoSpace=boşluk olmadan sadece alphanumericals karakter
String=String
Text=Metin

2
htdocs/langs/zh_CN/members.lang
View File

@ -124,7 +124,7 @@ ExportDataset_member_1=成员和订阅
LastMembers=上次％s成员
LastMembersModified=最后％S修饰成员
AttributeName=属性名称
FieldEdition=％外地版
FieldEdition=外地版 %s
AlphaNumOnlyCharsAndNoSpace=只有alphanumericals字符没有空间
String=弦
Text=文本

42
htdocs/lib/functions.lib.php
View File

@ -29,7 +29,7 @@
* \file htdocs/lib/functions.lib.php
* \brief A set of functions for Dolibarr
* This file contains all frequently used functions.
* \version $Id: functions.lib.php,v 1.547 2011/07/18 00:48:33 eldy Exp $
* \version $Id: functions.lib.php,v 1.548 2011/07/18 03:49:10 eldy Exp $
*/
// For compatibility during upgrade
@ -1559,34 +1559,40 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8')
/**
* Show a picto according to module or object (generic function)
* @param alt Text of alt on image
* @param object Objet pour lequel il faut afficher le logo (example: user, group, action, bill, contract, propal, product, ...)
* Pour les modules externe utiliser nomimage@mymodule pour rechercher dans le repertoire "img" du module
* @param options Add more attribute on img tag
* @return string Return img tag
* Show a picto called object_picto (generic function)
* @param alt Text of alt on image
* @param picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
* For external modules use imagename@mymodule to search into directory "img" of module.
* @param options Add more attribute on img tag
* @param pictoisfullpath If 1, image path is a full path
* @return string Return img tag
* @see img_picto, img_picto_common
*/
function img_object($alt, $object, $options='')
function img_object($alt, $picto, $options='', $pictoisfullpath=0)
{
global $conf,$langs;
$path = 'theme/'.$conf->theme;
$path = 'theme/'.$conf->theme;
$url = DOL_URL_ROOT;
if (preg_match('/^([^@]+)@([^@]+)$/i',$object,$regs))
if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
{
$object = $regs[1];
$picto = $regs[1];
$path = $regs[2];
if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
// If img file not into standard path, we use alternate path
if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/object_'.$object.'.png')) $url = DOL_URL_ROOT_ALT;
if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/object_'.$picto)) $url = DOL_URL_ROOT_ALT;
}
return '<img src="'.$url.'/'.$path.'/img/object_'.$object.'.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
else
{
if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
}
if ($pictoisfullpath) return '<img src="'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
return '<img src="'.$url.'/'.$path.'/img/object_'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
}
/**
* Show picto (generic function)
* Show picto whatever it's its name (generic function)
* @param alt Text on alt and title of image
* @param picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into img directory.
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
@ -1612,8 +1618,10 @@ function img_picto($alt, $picto, $options='', $pictoisfullpath=0)
// If img file not into standard path, we use alternate path
if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) $url = DOL_URL_ROOT_ALT;
}
if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
else
{
if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
}
if ($pictoisfullpath) return '<img src="'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
return '<img src="'.$url.'/'.$path.'/img/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
}

14
htdocs/lib/tax.lib.php
View File

@ -21,7 +21,7 @@
* \file htdocs/lib/tax.lib.php
* \ingroup tax
* \brief Library for tax module
* \version $Id: tax.lib.php,v 1.20 2011/07/04 09:01:37 eldy Exp $
* \version $Id: tax.lib.php,v 1.21 2011/07/18 11:11:19 eldy Exp $
*/
@ -142,8 +142,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
}
if (! $sql) return -1;
if ($sql && $sql=='TODO') return -2;
if ($sql && $sql!='TODO')
if ($sql == 'TODO') return -2;
if ($sql != 'TODO')
{
dol_syslog("Tax.lib:thirdparty sql=".$sql);
$resql = $db->query($sql);
@ -316,8 +316,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
//print $sql.'<br>';
if (! $sql) return -1;
if ($sql && $sql=='TODO') return -2;
if ($sql && $sql!='TODO')
if ($sql == 'TODO') return -2;
if ($sql != 'TODO')
{
dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
@ -477,8 +477,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
dol_syslog("Tax.lib.php::vat_by_date no accountancy module enabled".$sql,LOG_ERR);
return -1; // -1 = Not accountancy module enabled
}
if ($sql && $sql=='TODO') return -2; // -2 = Feature not yet available
if ($sql && $sql!='TODO')
if ($sql == 'TODO') return -2; // -2 = Feature not yet available
if ($sql != 'TODO')
{
dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
$resql = $db->query($sql);

9
htdocs/lib/usergroups.lib.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/lib/usergroups.lib.php
* \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes
* \version $Id: usergroups.lib.php,v 1.28 2011/07/04 09:01:38 eldy Exp $
* \version $Id: usergroups.lib.php,v 1.29 2011/07/18 23:35:06 eldy Exp $
*/
function user_prepare_head($object)
{
@ -152,10 +152,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
{
global $conf,$langs,$bc;
$dirtheme=dol_buildpath($conf->global->MAIN_FORCETHEMEDIR.'/theme',0);
$urltheme=dol_buildpath($conf->global->MAIN_FORCETHEMEDIR.'/theme',1);
$selected_theme=$conf->global->MAIN_THEME;
if (! empty($fuser)) $selected_theme=$fuser->conf->MAIN_THEME;
@ -178,6 +178,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '<td align="right">';
$url='http://www.dolistore.com/lang-en/4-skins';
if (preg_match('/fr/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-fr/4-themes';
//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
print '<a href="'.$url.'" target="_blank">';
print $langs->trans('DownloadMoreSkins');
print '</a>';
@ -203,7 +204,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '<td'.($foruserprofile?' colspan="3"':'').'>'.$dirtheme.'</td>';
print '</tr>';
}
if ($edit)
{
if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");

23
htdocs/societe/soc.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -26,7 +26,7 @@
* \file htdocs/societe/soc.php
* \ingroup societe
* \brief Third party card page
* \version $Id: soc.php,v 1.121 2011/07/04 08:00:53 eldy Exp $
* \version $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $
*/
require("../main.inc.php");
@ -275,7 +275,7 @@ if (empty($reshook))
dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
$contact=new Contact($db);
$contact->civilite_id = $object->civilite_id;
$contact->civilite_id=$object->civilite_id;
$contact->name=$object->nom_particulier;
$contact->firstname=$object->prenom;
$contact->address=$object->address;
@ -283,10 +283,13 @@ if (empty($reshook))
$contact->cp=$object->cp;
$contact->town=$object->town;
$contact->ville=$object->ville;
$contact->fk_pays=$object->fk_pays;
$contact->fk_departement=$object->departement_id;
$contact->fk_pays=$object->pays_id;
$contact->socid=$object->id; // fk_soc
$contact->status=1;
$contact->email=$object->email;
$contact->phone_pro=$object->tel;
$contact->fax=$object->fax;
$contact->priv=0;
$result=$contact->create($user);
@ -699,12 +702,14 @@ else
jQuery(".individualline").hide();
jQuery("#typent_id").val(0);
jQuery("#effectif_id").val(0);
document.getElementById("TypeName").innerHTML=document.formsoc.ThirdPartyName.value;
document.formsoc.private.value=0;
});
jQuery("#radioprivate").click(function() {
jQuery(".individualline").show();
jQuery("#typent_id").val(id_te_private);
jQuery("#effectif_id").val(id_ef15);
document.getElementById("TypeName").innerHTML=document.formsoc.LastName.value;
document.formsoc.private.value=1;
});
jQuery("#selectpays_id").change(function() {
@ -735,14 +740,16 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="private" value='.$object->particulier.'>';
print '<input type="hidden" name="type" value='.GETPOST("type").'>';
print '<input type="hidden" name="LastName" value="'.$langs->trans('LastName').'">';
print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
print '<table class="border" width="100%">';
// Name, firstname
if ($object->particulier)
if ($object->particulier || GETPOST("private"))
{
print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->nom.'"></td>';
print '<tr><td><span id="TypeName" class="fieldrequired">'.$langs->trans('LastName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->nom.'"></td>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
@ -751,7 +758,7 @@ else
}
else
{
print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->nom.'"></td>';
print '<tr><td><span span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->nom.'"></td>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
@ -1961,5 +1968,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/04 08:00:53 $ - $Revision: 1.121 $');
llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $');
?>

4
htdocs/theme/eldy/style.css.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.84 2011/07/06 11:40:22 eldy Exp $
* \version $Id: style.css.php,v 1.85 2011/07/18 03:18:37 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@ -1277,7 +1277,7 @@ div.error {
margin: 0.5em 0em 0.5em 0em;
border: 1px solid #8C9CAB;
-moz-border-radius:6px;
background: #efefa4;
background: #EFCFCF;
}
/* Info admin */

4
htdocs/theme/yellow/style.css.php
View File

@ -20,7 +20,7 @@
/**
* \file htdocs/theme/yellow/style.css.php
* \brief Fichier de style CSS du theme Yellow
* \version $Id: style.css.php,v 1.42 2011/07/06 11:40:21 eldy Exp $
* \version $Id: style.css.php,v 1.43 2011/07/18 23:37:03 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@ -64,7 +64,7 @@ body {
<?php if (! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
background-color: #ebebe0;
background-color: #fbfbf0;
<?php } ?>
font-size: 12px;
font-family: helvetica, verdana, arial, sans-serif;