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

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

Browse Source
This commit is contained in:
Regis Houssin 2012-06-11 22:39:26 +02:00
commit 302c0bb778
7 changed files with 194 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
htdocs/core/boxes/box_supplier_orders.php Normal file
View File

@ -0,0 +1,156 @@
<?php
/* Copyright (C) 2004-2006 Destailleur Laurent <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/boxes/box_supplier_orders.php
* \ingroup fournisseurs
* \brief Module that generates the latest supplier orders box
*/
include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
/**
* Class that manages the box showing latest supplier orders
*/
class box_supplier_orders extends ModeleBoxes
{
var $boxcode = "latestsupplierorders";
var $boximg = "object_order";
var $boxlabel;
var $depends = array("fournisseur");
var $db;
var $param;
var $info_box_head = array();
var $info_box_contents = array();
/**
* Constructor
*/
function box_supplier_orders()
{
global $langs;
$langs->load("boxes");
$this->boxlabel = $langs->transnoentitiesnoconv("BoxLatestSupplierOrders");
}
/**
* Load data into info_box_contents array to show array later.
*
* @param int $max Maximum number of records to load
* @return void
*/
function loadBox($max = 5)
{
global $conf, $user, $langs, $db;
$langs->load("boxes");
$this->max = $max;
include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
$supplierorderstatic=new CommandeFournisseur($db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestSupplierOrders", $max));
if ($user->rights->fournisseur->commande->lire)
{
$sql = "SELECT s.nom, s.rowid as socid,";
$sql.= " c.ref, c.tms, c.rowid,";
$sql.= " c.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
$sql.= " AND c.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
$sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
$sql.= $db->plimit($max, 0);
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$datem=$db->jdate($objp->tms);
$urlo = DOL_URL_ROOT."/fourn/commande/fiche.php?id=".$objp->rowid;
$urls = DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid;
$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
'logo' => $this->boximg,
'url' => $urlo);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => $objp->ref,
'url' => $urlo);
$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
'logo' => 'company',
'url' => $urls);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
'text' => $objp->nom,
'url' => $urls);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
'text' => dol_print_date($datem,'day'),
);
$this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
'text' => $supplierorderstatic->LibStatut($objp->fk_statut,3));
$i++;
}
if ($num == 0)
$this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text' => $langs->trans("NoSupplierOrder"));
}
else
{
dol_print_error($db);
}
}
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);
}
}
?>

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

@ -107,18 +107,22 @@ class Menubase
// an insert with a forced id.
if (in_array($this->db->type,array('pgsql')))
{
$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
$resqlrowid=$this->db->query($sql);
if ($resqlrowid)
{
$obj=$this->db->fetch_object($resqlrowid);
$maxrowid=$obj->maxrowid;
$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
$resqlrowid=$this->db->query($sql);
if ($resqlrowid)
{
$obj=$this->db->fetch_object($resqlrowid);
$maxrowid=$obj->maxrowid;
$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
$resqlrowidset=$this->db->query($sql);
if (! $resqlrowidset) dol_print_error($this->db);
}
else dol_print_error($this->db);
// Max rowid can be empty if there is no record yet
if(empty($maxrowid)) $maxrowid=1;
$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
//print $sql; exit;
$resqlrowidset=$this->db->query($sql);
if (! $resqlrowidset) dol_print_error($this->db);
}
else dol_print_error($this->db);
}
// Insert request

11
htdocs/core/lib/date.lib.php
View File

@ -261,16 +261,23 @@ function convertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf
if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
$sTime.=$sWeek.' '.$weekTranslate.' ';
}
if ($sDay>0)
/* if ($sDay>0)
{
$dayTranslate = $langs->trans("Day");
if ($sDay > 1) $dayTranslate = $langs->trans("Days");
$sTime.=$sDay.' '.$dayTranslate.' ';
}
*/
}
}
if ($sDay>0)
{
$dayTranslate = $langs->trans("Day");
if ($sDay > 1) $dayTranslate = $langs->trans("Days");
$sTime.=$sDay.' '.$dayTranslate.' ';
}
if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' ';
// if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' ';
if ($iSecond || empty($sDay))
{
$sTime.= dol_print_date($iSecond,'hourduration',true);

3
htdocs/core/modules/modFournisseur.class.php
View File

@ -105,6 +105,9 @@ class modFournisseur extends DolibarrModules
$this->boxes[$r][1] = "box_factures_fourn.php";
$r++;
$this->boxes[$r][1] = "box_supplier_orders.php";
$r++;
// Permissions
$this->rights = array();
$this->rights_class = 'fournisseur';

6
htdocs/index.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2012 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
@ -338,7 +338,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
$board->load_board($user,"opened");
$board->warning_delay=$conf->propal->cloture->warning_delay/60/60/24;
$board->label=$langs->trans("PropalsToClose");
$board->url=DOL_URL_ROOT.'/comm/propal.php?viewstatut=1';
$board->url=DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1';
$board->img=img_object($langs->trans("Propals"),"propal");
$rowspan++;
$dashboardlines[]=$board;
@ -354,7 +354,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
$board->load_board($user,"signed");
$board->warning_delay=$conf->propal->facturation->warning_delay/60/60/24;
$board->label=$langs->trans("PropalsToBill");
$board->url=DOL_URL_ROOT.'/comm/propal.php?viewstatut=2';
$board->url=DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=2';
$board->img=img_object($langs->trans("Propals"),"propal");
$rowspan++;
$dashboardlines[]=$board;

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

@ -70,3 +70,7 @@ NoRecordedProducts=No recorded products/services
NoRecordedProspects=No recorded prospects
NoContractedProducts=No products/services contracted
NoRecordedContracts=No recorded contracts
# Latest supplier orders
BoxLatestSupplierOrders=Latest supplier orders
BoxTitleLatestSupplierOrders=%s latest supplier orders
NoSupplierOrder=No recorded supplier order

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

@ -70,3 +70,7 @@ NoRecordedProducts=Pas de produit/service enregistré
NoRecordedProspects=Pas de prospect enregistré
NoContractedProducts=Pas de produit/service contracté
NoRecordedContracts=Pas de contrat enregistré
# Dernières commandes fournisseur
BoxLatestSupplierOrders=Dernières commandes fournisseur
BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées
NoSupplierOrder=Pas de commandes fournisseur enregistrées