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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-19 09:11:09 +02:00
commit 8eedf3db96
66 changed files with 401 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -36,7 +36,20 @@ For users:
- New: Add module Opensurvey.
- New: Default aprrover for holidays i sby default hierchical parent.
- First change to prepare feature "click to print" (IPP) for PDF.
- New: [ task #350 ] Merge tab customer and prospect
- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid)
- New: [ task #711 ] Add combobox for contact as done for product/thirdparty
- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECIEPT
- New: [ task #743 ] GED : Add aministration option to disabled autotree to display
- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address
- New: [ task #768 ] WYSIWYG for all mail
- New: [ task #773 ] Add Project document in GED(ECM) modules
- New: [ task #783 ] Add checkbox and radio into extrafield feature
- New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice
- New: [ task #814 ] Add extrafield feature into Project/project tasks module
- New: [ task #770 ] Add ODT document generation for Projects module
- New: [ task #741 ] Add intervention box
For translators:
- Update language files.
@ -59,6 +72,8 @@ For developers:
- New: when adding an action, we can define a free code to tag it for a specific need.
- New: Enhance Dolibarr migration process to include migration script of external
modules.
- New: [ task #811 ] Uniformanize note field.
WARNING: If you used external modules, some of them may need to be upgraded due to:
- Fields of classes were renamed to be normalized (nom, prenom, cp, ville, adresse, tel
@ -85,7 +100,10 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: Orderstoinvoice didn't act as expected when no order was checked
- Fix: Bad link to all proposals into Third party card if customer is prospect
- Fix: [ bug #789 ] VAT not being calculated in POS
- Fix: [ bug #794 ] Lost filter on zipcode in prospect list
- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed
- Fix: [ bug #810 ] Cannot update ODT template path
- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
***** ChangeLog for 3.3.1 compared to 3.3 *****
@ -95,6 +113,7 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #736 ] Missing column in llx_c_chargesociales
- Fix: Localtax2 for Spain must be based into buyer
- Fix: [ bug #762 ] Bad profit calculation in Reporting
- Fix: bug dictionnary with wrong prefix table

4
htdocs/admin/dict.php
View File

@ -139,7 +139,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t
$tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as country_code, p.libelle as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1";
$tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent";
$tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies";
$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid";
$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid";
$tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
$tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
$tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c";
@ -154,7 +154,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
$tabsql[22]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
$tabsql[23]= "SELECT rowid as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount";
$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1";
$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, llx_c_pays as p WHERE t.fk_pays=p.rowid";
$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid";
// Critere de tri du dictionnaire
$tabsqlsort=array();

2
htdocs/comm/action/listactions.php
View File

@ -238,7 +238,7 @@ if ($resql)
$i = 0;
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
//print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);

4
htdocs/compta/bank/releve.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -85,7 +85,7 @@ if ($id > 0 || ! empty($ref))
$acct->fetch($id, $ref);
}
if (! isset($num))
if (empty($num))
{
/*
* Vue liste tous releves confondus

3
htdocs/compta/paiement.php
View File

@ -286,7 +286,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$(\'.fieldrequireddyn\').addClass(\'fieldrequired\');
if ($(\'#fieldchqemetteur\').val() == \'\')
{
$(\'#fieldchqemetteur\').val(jQuery(\'#thirdpartylabel\').val());
var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag(MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val();
$(\'#fieldchqemetteur\').val(emetteur);
}
}
else

153
htdocs/core/boxes/box_ficheinter.php Normal file
View File

@ -0,0 +1,153 @@
<?php
/* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/boxes/box_intervention.php
* \ingroup ficheinter
* \brief Module de generation de l'affichage de la box ficheinter
*/
include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
/**
* Class to manage the box to show last contracts
*/
class box_ficheinter extends ModeleBoxes
{
var $boxcode="ficheinter";
var $boximg="object_intervention";
var $boxlabel="BoxFicheInter";
var $depends = array("ficheinter"); // conf->contrat->enabled
var $db;
var $param;
var $info_box_head = array();
var $info_box_contents = array();
/**
* Load data for box to show them later
*
* @param int $max Maximum number of records to load
* @return void
*/
function loadBox($max=10)
{
global $user, $langs, $db, $conf;
$this->max=$max;
include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
$ficheinterstatic=new Fichinter($db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
if ($user->rights->ficheinter->lire)
{
$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
$sql.= " f.datec,";
$sql.= " f.date_valid as datev,";
$sql.= " f.tms as datem,";
$sql.= " s.nom, s.rowid as socid, s.client";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir)
$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
$sql.= " WHERE f.fk_soc = s.rowid ";
$sql.= " AND f.entity = ".$conf->entity;
if (! $user->rights->societe->client->voir)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " ORDER BY f.tms DESC";
$sql.= $db->plimit($max, 0);
dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$now=dol_now();
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($resql);
$datec=$db->jdate($objp->datec);
$ficheinterstatic->statut=$objp->fk_statut;
$ficheinterstatic->id=$objp->rowid;
$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
'logo' => $this->boximg,
'url' => DOL_URL_ROOT."/ficheinter/fiche.php?id=".$objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref
'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
'logo' => 'company',
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
'text' => dol_trunc($objp->nom,40),
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
'text' => dol_print_date($datec,'day'));
$this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"',
'text' => $ficheinterstatic->getLibStatut(6),
'asis'=>1
);
$i++;
}
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedContracts"));
}
else
{
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else
{
$this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}
/**
* Method to show box
*
* @param array $head Array with properties of box title
* @param array $contents Array with properties of box lines
* @return void
*/
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
}
}
?>

10
htdocs/core/class/html.form.class.php
View File

@ -3333,7 +3333,7 @@ class Form
if (strval($set_time) != '' && $set_time != -1)
{
//$formated_date=dol_print_date($set_time,$conf->format_date_short);
$formated_date=dol_print_date($set_time,$langs->trans("FormatDateShort")); // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript
$formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
}
// Calendrier popup version eldy
@ -3342,7 +3342,7 @@ class Form
// Zone de saisie manuelle de la date
$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="9" maxlength="11" value="'.$formated_date.'"';
$retstring.=($disabled?' disabled="disabled"':'');
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\'); "'; // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
$retstring.='>';
// Icone calendrier
@ -3350,7 +3350,7 @@ class Form
{
$retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
$base=DOL_URL_ROOT.'/core/';
$retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
$retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
}
else $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
@ -3359,7 +3359,7 @@ class Form
$retstring.='<input type="hidden" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">'."\n";
}
else
{
{
print "Bad value of MAIN_POPUP_CALENDAR";
}
}
@ -3453,7 +3453,7 @@ class Form
if ($usecalendar == "eldy")
{
$base=DOL_URL_ROOT.'/core/';
$reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');';
$reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
}
else
{

6
htdocs/core/datepicker.php
View File

@ -224,16 +224,16 @@ function displayBox($selectedDate,$month,$year)
if($thedate==$selDate) $dayclass="dpSelected";
elseif($thedate==$today) $dayclass="dpToday";
if ($langs->trans("FormatDateShortJava")=="FormatDateShortJava")
if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
{
print "ERROR FormatDateShortJava not defined for language ".$langs->defaultlang;
print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
exit;
}
// Sur click dans calendrier, appelle fonction dpClickDay
echo "<TD class=\"".$dayclass."\"";
echo " onMouseOver=\"dpHighlightDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",tradMonths)\"";
echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJava")."')\"";
echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\"";
echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
$cols++;

5
htdocs/core/get_menudiv.php
View File

@ -40,11 +40,6 @@ $langs->load("main");
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
//var_dump($langs->defaultlang);
//var_dump($conf->format_date_short_java);
//var_dump($langs->trans("FormatDateShortJava"));
/*
* View

4
htdocs/core/lib/functions.lib.php
View File

@ -3105,12 +3105,16 @@ function get_default_npr($thirdparty_seller, $thirdparty_buyer, $idprod=0, $idpr
if ($idprodfournprice > 0)
{
if (! class_exists('ProductFournisseur'))
require DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
$prodprice = new ProductFournisseur($db);
$prodprice->fetch_product_fournisseur_price($idprodfournprice);
return $prodprice->fourn_tva_npr;
}
elseif ($idprod > 0)
{
if (! class_exists('Product'))
require DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
$prod = new Product($db);
$prod->fetch($idprod);
return $prod->tva_npr;

17
htdocs/core/modules/modCron.class.php
View File

@ -25,6 +25,7 @@
*/
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
/**
* Class to describe a Cron module
*/
@ -122,8 +123,8 @@ class modCron extends DolibarrModules
$r=0;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
'titre'=>'CronListActive',
'url'=>'/cron/list.php?status=1',
'titre'=>'CronList',
'url'=>'/cron/list.php?status=-1',
'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>200,
'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
@ -131,18 +132,6 @@ class modCron extends DolibarrModules
'target'=>'',
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
'titre'=>'CronListInactive',
'url'=>'/cron/list.php?status=0',
'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>201,
'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
'target'=>'',
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
}

1
htdocs/core/modules/modFicheinter.class.php
View File

@ -89,6 +89,7 @@ class modFicheinter extends DolibarrModules
// Boites
$this->boxes = array();
$this->boxes[0][1] = "box_ficheinter.php";
// Permissions
$this->rights = array();

5
htdocs/core/search_page.php
View File

@ -40,11 +40,6 @@ $langs->load("main");
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
//var_dump($langs->defaultlang);
//var_dump($conf->format_date_short_java);
//var_dump($langs->trans("FormatDateShortJava"));
/*
* View

8
htdocs/cron/class/cronjob.class.php
View File

@ -393,10 +393,9 @@ class Cronjob extends CommonObject
$sql.= " t.note,";
$sql.= " t.nbrun";
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
$status = (empty($status))?'0':'1';
$sql.= " WHERE t.status=".$status;
$sql.= " WHERE 1 = 1";
if ($status >= 0) $sql.= " AND t.status = ".(empty($status)?'0':'1');
//Manage filter
if (is_array($filter) && count($filter)>0) {
foreach($filter as $key => $value) {
@ -404,7 +403,6 @@ class Cronjob extends CommonObject
}
}
$sql.= " ORDER BY $sortfield $sortorder ";
if (!empty($limit) && !empty($offset)) {
$sql.= $this->db->plimit($limit + 1,$offset);
@ -836,7 +834,7 @@ class Cronjob extends CommonObject
$error=0;
$now=dol_now();
$langs->load('cron');
if (empty($userlogin)) {

20
htdocs/cron/list.php
View File

@ -108,8 +108,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
$form = new Form($db);
if (!empty($status)) $pagetitle=$langs->trans("CronListActive");
else $pagetitle=$langs->trans("CronListInactive");
//if (! empty($status)) $pagetitle=$langs->trans("CronListActive");
//else $pagetitle=$langs->trans("CronListInactive");
$pagetitle=$langs->trans("CronList");
llxHeader('',$pagetitle);
@ -155,8 +156,8 @@ if (count($object->lines)>0) {
print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Active"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder);
print '<td></td>';
print '</tr>';
print '<form method="get" action="'.$url_form.'" name="search_form">'."\n";
@ -177,7 +178,11 @@ if (count($object->lines)>0) {
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '<td class="liste_titre" align="center">';
print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), GETPOST('status'), 1);
print '</td><td class="liste_titre" align="right">';
print '&nbsp;';
print '<input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '&nbsp; ';
print '<input type="image" class="liste_titre" name="button_removefilter" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
print '</td>';
@ -189,7 +194,8 @@ if (count($object->lines)>0) {
// Boucler sur chaque job
$style='impair';
foreach($object->lines as $line){
foreach($object->lines as $line)
{
// title profil
if ($style=='pair') {$style='impair';}
else {$style='pair';}
@ -259,6 +265,10 @@ if (count($object->lines)>0) {
print '</td>';
print '<td align="center">';
print yn($line->status);
print '</td>';
print '<td align="right">';
if ($user->rights->cron->delete) {
print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$line->id."&status=".$status."&action=delete\" title=\"".$langs->trans('CronDelete')."\">".img_delete()."</a> &nbsp;";
} else {

2
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
View File

@ -180,6 +180,7 @@ UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7';
UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7';
ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end;
ALTER TABLE llx_product_fournisseur_price ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after tva_tx;
ALTER TABLE llx_actioncomm ADD COLUMN code varchar(32) NULL after fk_action;
@ -266,7 +267,6 @@ ALTER TABLE llx_commande_extrafields ADD INDEX idx_commande_extrafields (fk_obje
ALTER TABLE llx_socpeople ADD COLUMN note_public text after note;
ALTER TABLE llx_societe ADD COLUMN note_public text after note;
ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end;
ALTER TABLE llx_actioncomm ADD COLUMN transparency integer after fk_user_action;
INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29);

26
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
View File

@ -1,7 +1,7 @@
-- ============================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009-2011 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2009-2013 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
@ -21,23 +21,23 @@
create table llx_product_fournisseur_price
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
datec datetime,
tms timestamp,
rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
datec datetime,
tms timestamp,
fk_product integer,
fk_soc integer,
fk_soc integer,
ref_fourn varchar(30),
fk_availability integer,
price double(24,8) DEFAULT 0,
fk_availability integer,
price double(24,8) DEFAULT 0,
quantity double,
remise_percent double NOT NULL DEFAULT 0,
remise_percent double NOT NULL DEFAULT 0,
remise double NOT NULL DEFAULT 0,
unitprice double(24,8) DEFAULT 0,
charges double(24,8) DEFAULT 0,
charges double(24,8) DEFAULT 0,
unitcharges double(24,8) DEFAULT 0,
tva_tx double(6,3) NOT NULL,
tva_tx double(6,3) NOT NULL,
info_bits integer NOT NULL DEFAULT 0,
fk_user integer,
import_key varchar(14) -- Import key
fk_user integer,
import_key varchar(14) -- Import key
)ENGINE=innodb;

5
htdocs/langs/ar_SA/main.lang
View File

@ -15,7 +15,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=None
FormatDateShort=%d/%m/%Y
FormatDateShortInpu=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -600,7 +604,6 @@ Prefix=بادئة
// START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27).
// Reference language: en_US -> ar_SA
FormatDateShortJQuery=dd/mm/yy
AddLink=إضافة وصلة
Of=من
SearchOf=البحث

3
htdocs/langs/bg_BG/main.lang
View File

@ -10,8 +10,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

2
htdocs/langs/ca_ES/boxes.lang
View File

@ -18,6 +18,7 @@ BoxLastActions=Últims esdeveniments
BoxLastContracts=Últims contractes
BoxLastContacts=Últims contactes/adreçes
BoxLastMembers=Últims membres modificats
BoxFicheInter=Últimes intervencions modificades
BoxCurrentAccounts=Saldos comptes corrents
BoxSalesTurnover=Volum de vendes
BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament
@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendent de clients
BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors
BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades
BoxTitleLastModifiedMembers=Els %s últims membres modificats
BoxTitleLastFicheInter=Les %s últimes intervencions modificades
BoxMyLastBookmarks=Els meus %s darrers marcadors
BoxOldestExpiredServices=Serveis antics expirats
BoxLastExpiredServices=Els %s contractes més antics amb serveis actius expirats

3
htdocs/langs/ca_ES/main.lang
View File

@ -4,8 +4,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

5
htdocs/langs/da_DK/main.lang
View File

@ -14,7 +14,11 @@ CHARSET=UTF-8
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -624,7 +628,6 @@ Prefix=Præfiks
// START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19).
// Reference language: en_US -> da_DK
FormatDateShortJQuery=dd/mm/yy
AddLink=Tilføj link
Of=af
SearchOf=Søg

4
htdocs/langs/de_AT/main.lang
View File

@ -10,7 +10,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=.
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/MM/yy
FormatDateShortJQueryInput=dd/MM/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

3
htdocs/langs/de_DE/main.lang
View File

@ -11,8 +11,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=.
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/MM/yy
FormatDateShortJQueryInput=dd/MM/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

5
htdocs/langs/el_GR/main.lang
View File

@ -7,7 +7,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
@ -592,7 +596,6 @@ ShortSunday=Κ
// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
// Reference language: en_US -> el_GR
FormatDateShortJQuery=dd/mm/yy
AddLink=Προσθήκη συνδέσμου
Of=του
AmountByMonth=Ποσό ανά μήνα

4
htdocs/langs/en_AU/main.lang
View File

@ -4,7 +4,11 @@ CHARSET=UTF-8
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

4
htdocs/langs/en_GB/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

4
htdocs/langs/en_IN/main.lang
View File

@ -4,7 +4,11 @@ DIRECTION=ltr
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y

4
htdocs/langs/en_NZ/main.lang
View File

@ -4,7 +4,11 @@ CHARSET=UTF-8
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

3
htdocs/langs/en_SA/main.lang
View File

@ -6,8 +6,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

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

@ -18,6 +18,7 @@ BoxLastActions=Last actions
BoxLastContracts=Last contracts
BoxLastContacts=Last contacts/addresses
BoxLastMembers=Last members
BoxFicheInter=Last interventions
BoxCurrentAccounts=Current accounts balance
BoxSalesTurnover=Sales turnover
BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
@ -40,6 +41,7 @@ BoxTitleLastProspects=Last %s recorded prospects
BoxTitleLastModifiedProspects=Last %s modified prospects
BoxTitleLastProductsInContract=Last %s products/services in a contract
BoxTitleLastModifiedMembers=Last %s modified members
BoxTitleLastFicheInter=Last %s modified intervention
BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
BoxTitleCurrentAccounts=Current account's balances

3
htdocs/langs/en_US/main.lang
View File

@ -4,8 +4,11 @@ DIRECTION=ltr
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=mm/dd/yy
FormatDateShortJQueryInput=mm/dd/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y

2
htdocs/langs/es_ES/boxes.lang
View File

@ -18,6 +18,7 @@ BoxLastActions=Últimos eventos
BoxLastContracts=Últimos contratos
BoxLastContacts=Últimos contactos/direcciones
BoxLastMembers=Últimos miembros modificados
BoxFicheInter=Últimas intervenciones modificadas
BoxCurrentAccounts=Saldos cuentas corrientes
BoxSalesTurnover=Volumen de ventas
BoxTotalUnpaidCustomerBills=Total facturas a clientes pendientes de pago
@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendiente de clientes
BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores
BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas
BoxTitleLastModifiedMembers=Los %s últimos miembros modificados
BoxTitleLastFicheInter=Las %s últimas intervenciones modificadas
BoxMyLastBookmarks=Mis %s últimos marcadores
BoxOldestExpiredServices=Servicios antiguos expirados
BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados

3
htdocs/langs/es_ES/main.lang
View File

@ -4,8 +4,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

9
htdocs/langs/es_HN/main.lang
View File

@ -3,15 +3,6 @@ CHARSET=UTF-8
DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Importe ISV
TotalVAT=Total ISV
IncludedVAT=ISV incluido

9
htdocs/langs/es_PR/main.lang
View File

@ -3,15 +3,6 @@ CHARSET=UTF-8
DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Importe IVU
TotalVAT=Total IVU
IncludedVAT=IVU incluido

3
htdocs/langs/et_EE/main.lang
View File

@ -12,8 +12,11 @@ DIRECTION=ltr
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y

4
htdocs/langs/fa_IR/main.lang
View File

@ -15,7 +15,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=/
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

5
htdocs/langs/fi_FI/main.lang
View File

@ -11,7 +11,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H.%M
FormatDateTextShort=%d. %b %Y
FormatDateText=%d. %B %Y
@ -616,7 +620,6 @@ Prefix=Etuliite
// START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23).
// Reference language: en_US -> fi_FI
FormatDateShortJQuery=dd/mm/yy
AddLink=Lisää linkki
Of=ja
SearchOf=Etsi

4
htdocs/langs/fr_BE/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

4
htdocs/langs/fr_CA/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

4
htdocs/langs/fr_CH/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d-%m-%Y
FormatDateShortInput=%d-%m-%Y
FormatDateShortJava=dd-MM-yyyy
FormatDateShortJavaInput=dd-MM-yyyy
FormatDateShortJQuery=dd-mm-yy
FormatDateShortJQueryInput=dd-mm-yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

2
htdocs/langs/fr_FR/boxes.lang
View File

@ -18,6 +18,7 @@ BoxLastActions=Derniers événements
BoxLastContracts=Derniers contrats
BoxLastContacts=Derniers contacts/adresses
BoxLastMembers=Derniers adhérents modifiés
BoxFicheInter=Dernières fiche d'intervention modifiée
BoxCurrentAccounts=Soldes Comptes courants
BoxSalesTurnover=Chiffre d'affaires
BoxTotalUnpaidCustomerBills=Total des factures clients impayées
@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Impayés clients
BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs
BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés
BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés
BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée
BoxMyLastBookmarks=Mes %s derniers marque-pages
BoxOldestExpiredServices=Plus anciens services expirés
BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés

7
htdocs/langs/fr_FR/main.lang
View File

@ -3,9 +3,12 @@ CHARSET=UTF-8
DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShort=%d/%m/%y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

5
htdocs/langs/he_IL/main.lang
View File

@ -15,8 +15,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=mm/dd/yy
FormatDateShortJQueryInput=mm/dd/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y

5
htdocs/langs/hu_HU/main.lang
View File

@ -5,7 +5,11 @@ FONTFORPDF=dejavusans
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
@ -587,7 +591,6 @@ ShortSunday=V
// START - Lines generated via autotranslator.php tool (2012-02-29 16:13:31).
// Reference language: en_US -> hu_HU
FormatDateShortJQuery=dd/mm/yy
AddLink=Link hozzáadása
Of=A
SearchOf=Keresés

5
htdocs/langs/is_IS/main.lang
View File

@ -12,7 +12,11 @@ DIRECTION=ltr
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -604,7 +608,6 @@ Reason=Ástæða
// START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19).
// Reference language: en_US -> is_IS
FormatDateShortJQuery=dd/mm/yy
AddLink=Bæta við tengli
Of=á
SearchOf=Leita

13
htdocs/langs/it_IT/main.lang
View File

@ -270,15 +270,18 @@ FollowingConstantsWillBeSubstituted =Le seguenti costanti saranno sostitute
ForCustomer =Per i clienti
FormatDateHourShort =%d/%m/%Y %H.%M
FormatDateHourText =%d %B %Y %H:%M
FormatDateHourTextShort =%d %b %Y %H.%M
FormatDateHourTextShort =%d %b %Y %H.%M
FormatDateShort =%d/%m/%Y
FormatDateShortInput =%d/%m/%Y
FormatDateShortJava =dd/MM/yyyy
FormatDateShortJQuery =dd/mm/yy
FormatDateShortJavaInput =dd/MM/yyyy
FormatDateShortJQuery =dd/mm/yy
FormatDateShortJQueryInput =dd/mm/yy
FormatDateText =%d %B %Y
FormatDateTextShort =%d %b %Y
FormatHourShortDuration =%H:%M
FormatHourShort =%H.%M
For =Per
FormatHourShortDuration =%H:%M
FormatHourShort =%H.%M
For =Per
FreeZone =Testo libero
Frequency =Frequenza
FridayMin =Ven

9
htdocs/langs/ja_JP/main.lang
View File

@ -9,9 +9,12 @@ FONTSIZEFORPDF=9
// Reference language: en_US -> ja_JP
SeparatorDecimal=.
SeparatorThousand=、
FormatDateShort=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=mm/dd/yy
FormatDateShortJQueryInput=mm/dd/yy
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y

9
htdocs/langs/nb_NO/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H.%M
FormatDateTextShort=%d. %b %Y
FormatDateText=%d. %B %Y
@ -535,8 +539,8 @@ Login=Innlogging
Month01=januar
Month02=februar
Month03=mars
Month04=April
Month05=kan
Month04=april
Month05=mai
Month06=juni
Month07=juli
Month08=August
@ -606,7 +610,6 @@ Day0=Søndag
// START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43).
// Reference language: en_US -> nb_NO
FormatDateShortJQuery=dd/mm/yy
AddLink=Legg til link
Of=av
SearchOf=Søk

4
htdocs/langs/nl_BE/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

5
htdocs/langs/nl_NL/main.lang
View File

@ -4,7 +4,11 @@ DIRECTION = ltr
SeparatorDecimal = ,
SeparatorThousand = .
FormatDateShort = %d-%m-%Y
FormatDateShortInput = %d-%m-%Y
FormatDateShortJava = dd-MM-yyyy
FormatDateShortJavaInput = dd-MM-yyyy
FormatDateShortJQuery=dd-mm-yy
FormatDateShortJQueryInput=dd-mm-yy
FormatHourShort = %H:%M
FormatHourShortDuration = %H:%M
FormatDateTextShort = %d %b %Y
@ -590,7 +594,6 @@ ShortSunday = Zo
// START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39).
// Reference language: en_US -> nl_NL
FormatDateShortJQuery=dd/mm/yy
JanuaryMin=Jan
FebruaryMin=Februari
MarchMin=Mar

5
htdocs/langs/pl_PL/main.lang
View File

@ -15,7 +15,11 @@ FONTSIZEFORPDF=8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d-%m-%Y
FormatDateShortInput=%d-%m-%Y
FormatDateShortJava=dd-MM-yyyy
FormatDateShortJavaInput=dd-MM-yyyy
FormatDateShortJQuery=dd-mm-yy
FormatDateShortJQueryInput=dd-mm-yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -620,7 +624,6 @@ Prefix=Przedrostek
// START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29).
// Reference language: en_US -> pl_PL
FormatDateShortJQuery=dd/mm/yy
AddLink=Dodaj link
Of=z
SearchOf=Szukaj

5
htdocs/langs/pt_PT/main.lang
View File

@ -3,7 +3,11 @@ CHARSET=UTF-8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -601,7 +605,6 @@ Prefix=Prefixo
// START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52).
// Reference language: en_US -> pt_PT
FormatDateShortJQuery=dd/mm/yy
AddLink=Adicionar link
Of=de
SearchOf=Pesquisar

5
htdocs/langs/ro_RO/main.lang
View File

@ -13,7 +13,11 @@ FONTSIZEFORPDF=8
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -618,7 +622,6 @@ Prefix=Prefix
// START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15).
// Reference language: en_US -> ro_RO
FormatDateShortJQuery=dd/mm/yy
AddLink=Adauga link-ul
Of=de
SearchOf=Căutare

5
htdocs/langs/ru_RU/main.lang
View File

@ -15,7 +15,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
@ -628,7 +632,6 @@ Person=Персона
// START - Lines generated via autotranslator.php tool (2011-08-18 23:26:41).
// Reference language: en_US -> ru_RU
FormatDateShortJQuery=dd/mm/yy
AddLink=Добавить ссылку
Of=из
AmountByMonth=Сумма за месяц

4
htdocs/langs/ru_UA/main.lang
View File

@ -10,7 +10,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShort=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y

3
htdocs/langs/sl_SI/main.lang
View File

@ -6,8 +6,11 @@ FONTSIZEFORPDF=8
SeparatorDecimal = ,
SeparatorThousand = .
FormatDateShort = %d/%m/%Y
FormatDateShortInput = %d/%m/%Y
FormatDateShortJava = dd/MM/yyyy
FormatDateShortJavaInput = dd/MM/yyyy
FormatDateShortJQuery = dd/mm/yy
FormatDateShortJQueryInput = dd/mm/yy
FormatHourShort = %I:%M %p
FormatHourShortDuration = %H:%M
FormatDateTextShort = %d. %b, %Y

5
htdocs/langs/sv_SE/main.lang
View File

@ -12,7 +12,11 @@ DIRECTION=ltr
SeparatorDecimal=,
SeparatorThousand=
FormatDateShort=%Y-%m-%d
FormatDateShortInput=%Y-%m-%d
FormatDateShortJava=yyyy-MM-dd
FormatDateShortJavaInput=yyyy-MM-dd
FormatDateShortJQuery=yy-mm-dd
FormatDateShortJQueryInput=yy-mm-dd
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d %Y
@ -594,7 +598,6 @@ ShortSunday=S
// START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03).
// Reference language: en_US -> sv_SE
FormatDateShortJQuery=dd/mm/yy
AddLink=Tillsätt länk
Of=av
SearchOf=Sök

3
htdocs/langs/tr_TR/main.lang
View File

@ -14,8 +14,11 @@ FONTSIZEFORPDF=8
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y

5
htdocs/langs/zh_CN/main.lang
View File

@ -17,7 +17,11 @@ FONTSIZEFORPDF=9
SeparatorDecimal=.
SeparatorThousand=None
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y
@ -604,7 +608,6 @@ Prefix=字首
// START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
// Reference language: en_US -> zh_CN
FormatDateShortJQuery=dd/mm/yy
AddLink=添加链接
Of=的
SearchOf=搜索

5
htdocs/langs/zh_TW/main.lang
View File

@ -13,7 +13,11 @@ FONTFORPDF=msungstdlight
SeparatorDecimal=.
SeparatorThousand=None
FormatDateShort=%Y/%m/%d
FormatDateShortInput=%Y/%m/%d
FormatDateShortJava=yyyy/MM/dd
FormatDateShortJavaInput=yyyy/MM/dd
FormatDateShortJQuery=yy/mm/dd
FormatDateShortJQueryInput=yy/mm/dd
FormatHourShort=%I:%M %p
FormatDateTextShort=%Y %b %d
FormatDateText=%Y %B %d
@ -600,7 +604,6 @@ Prefix=字首
// START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
// Reference language: en_US -> zh_CN
FormatDateShortJQuery=dd/mm/yy
AddLink=添加鏈接
Of=的
SearchOf=搜尋

4
htdocs/projet/ganttview.php
View File

@ -184,8 +184,8 @@ if (count($tasksarray)>0)
// Show Gant diagram from $taskarray using JSGantt
$dateformat=$langs->trans("FormatDateShort");
$dateformat=strtolower($langs->trans("FormatDateShortJava"));
$dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later
$dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.php later
$array_contacts=array();
$tasks=array();
$project_dependencies=array();

6
htdocs/societe/societe.php
View File

@ -122,7 +122,7 @@ if ($mode == 'search')
if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
if ($search_type > 0 && in_array($search_type,array('4'))) $sql .= " AND s.fournisseur = 1";
if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
$result=$db->query($sql);
if ($result)
{
@ -365,13 +365,13 @@ if ($resql)
print '<td class="liste_titre" align="middle">';
print '<select class="flat" name="search_type">';
print '<option value="-1"'.($search_type==''?' selected="selected"':'').'>&nbsp;</option>';
print '<option value="1,3"'.($search_type=='1,3'?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
//if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
print '<option value="4"'.($search_type=='4'?' selected="selected"':'').'>'.$langs->trans('Supplier').'</option>';
print '<option value="0"'.($search_type=='0'?' selected="selected"':'').'>'.$langs->trans('Others').'</option>';
print '</select></td>';
// Status
// Status
print '<td class="liste_titre" align="right">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '&nbsp; ';

2
test/phpunit/NumberingModulesTest.php
View File

@ -443,4 +443,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
}
}
?>
?>

4
test/soapui/Dolibarr-soapui-project.xml
View File

@ -130,7 +130,7 @@
<xsd:element name="total_net" type="xsd:double"/>
<xsd:element name="total_vat" type="xsd:double"/>
<xsd:element name="total" type="xsd:double"/>
<xsd:element name="note" type="xsd:string"/>
<xsd:element name="note_private" type="xsd:string"/>
<xsd:element name="note_public" type="xsd:string"/>
<xsd:element name="status" type="xsd:int"/>
<xsd:element name="close_code" type="xsd:string"/>
@ -628,7 +628,7 @@
<xsd:element name="total_net" type="xsd:double"/>
<xsd:element name="total_vat" type="xsd:double"/>
<xsd:element name="total" type="xsd:double"/>
<xsd:element name="note" type="xsd:string"/>
<xsd:element name="note_private" type="xsd:string"/>
<xsd:element name="note_public" type="xsd:string"/>
<xsd:element name="status" type="xsd:int"/>
<xsd:element name="close_code" type="xsd:string"/>