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

Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2

Browse Source
This commit is contained in:
Raphaël Doursenaud 2012-05-24 10:46:18 +02:00
commit ffaadcc930
19 changed files with 164 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/propal/class/propal.class.php
View File

@ -1588,6 +1588,7 @@ class Propal extends CommonObject
if ($this->db->query($sql))
{
$this->statut = 0;
$this->brouillon = 1;
return 1;
}
else

2
htdocs/core/class/commonobject.class.php
View File

@ -321,7 +321,7 @@ abstract class CommonObject
$tab=array();
$sql = "SELECT ec.rowid, ec.statut, ec.fk_socpeople as id";
$sql = "SELECT ec.rowid, ec.statut, ec.fk_socpeople as id"; // This field contains id of llx_socpeople or id of llx_user
if ($source == 'internal') $sql.=", '-1' as socid";
if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid";
$sql.= ", t.civilite as civility, t.name as lastname, t.firstname, t.email";

2
htdocs/core/lib/security.lib.php
View File

@ -373,7 +373,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
{
include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$projectstatic=new Project($db);
$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,$user->societe_id);
$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
$tmparray=explode(',',$tmps);
if (! in_array($objectid,$tmparray)) accessforbidden();
}

6
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -108,8 +108,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
'object_date_modification'=>dol_print_date($object->date_modification,'day'),
'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
'object_date_close'=>dol_print_date($object->date_cloture,'dayhour'),
'object_payment_mode'=>($object->mode_reglement!='-'?$object->mode_reglement:''),
'object_payment_term'=>$object->cond_reglement,
'object_payment_mode_code'=>$object->mode_reglement_code,
'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
'object_payment_term_code'=>$object->cond_reglement_code,
'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
'object_total_ht'=>price($object->total_ht,0,$outputlangs),
'object_total_vat'=>price($object->total_tva,0,$outputlangs),
'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),

6
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -115,8 +115,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_date_creation'=>dol_print_date($object->date_creation,'day'),
'object_date_modification'=>dol_print_date($object->date_modification,'day'),
'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
'object_payment_mode'=>($object->mode_reglement!='-'?$object->mode_reglement:''),
'object_payment_term'=>$object->cond_reglement,
'object_payment_mode_code'=>$object->mode_reglement_code,
'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
'object_payment_term_code'=>$object->cond_reglement_code,
'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
'object_total_ht'=>price($object->total_ht,0,$outputlangs),
'object_total_vat'=>price($object->total_tva,0,$outputlangs),
'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),

6
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -107,8 +107,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
'object_date_creation'=>dol_print_date($object->date_creation,'day'),
'object_date_modification'=>dol_print_date($object->date_modification,'day'),
'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
'object_payment_mode'=>($object->mode_reglement!='-'?$object->mode_reglement:''),
'object_payment_term'=>$object->cond_reglement,
'object_payment_mode_code'=>$object->mode_reglement_code,
'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
'object_payment_term_code'=>$object->cond_reglement_code,
'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
'object_total_ht'=>price($object->total_ht,0,$outputlangs),
'object_total_vat'=>price($object->total_tva,0,$outputlangs),
'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),

33
htdocs/ecm/index.php
View File

@ -150,26 +150,29 @@ if ($action == 'add' && $user->rights->ecm->setup)
}
// Remove file
if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes')
if ($action == 'confirm_deletefile')
{
$result=$ecmdir->fetch($section);
if (! $result > 0)
{
dol_print_error($db,$ecmdir->error);
exit;
}
$relativepath=$ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
$file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
if (GETPOST('confirm') == 'yes')
{
$result=$ecmdir->fetch($section);
if (! $result > 0)
{
dol_print_error($db,$ecmdir->error);
exit;
}
$relativepath=$ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
$file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$result=dol_delete_file($file);
$result=dol_delete_file($file);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
$result=$ecmdir->changeNbOfFiles('-');
$action='file_manager';
$result=$ecmdir->changeNbOfFiles('-');
clearstatcache();
clearstatcache();
}
$action='file_manager';
}
// Remove directory

2
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
View File

@ -450,3 +450,5 @@ ALTER TABLE llx_commande_fournisseur ADD COLUMN extraparams varchar(255) AFTER i
ALTER TABLE llx_facture_fourn ADD COLUMN extraparams varchar(255) AFTER import_key;
ALTER TABLE llx_boxes ADD COLUMN maxline integer NULL;
ALTER TABLE llx_product_fournisseur_price MODIFY fk_product_fournisseur integer DEFAULT 0;

29
htdocs/install/repair.php
View File

@ -211,12 +211,21 @@ foreach($listofmodulesextra as $tablename => $elementtype)
$i=0;
while($obj=$db->fetch_object($resql))
{
$fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
$fieldtype = isset($obj->Type)?$obj->Type:'varchar';
$fieldname=$fieldtype='';
if (preg_match('/mysql/',$db->type))
{
$fieldname=$obj->Field;
$fieldtype=$obj->Type;
}
else
{
$fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
$fieldtype = isset($obj->Type)?$obj->Type:'varchar';
}
if (empty($fieldname)) continue;
if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue;
$arrayoffieldsfound[$fieldname]=$fieldtype;
$arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype);
}
// If it does not match, we create fields
@ -225,14 +234,16 @@ foreach($listofmodulesextra as $tablename => $elementtype)
if (! in_array($code,array_keys($arrayoffieldsfound)))
{
print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
$type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
$field_desc=array(
'type'=>'varchar',
'value'=>'',
'attribute'=>'',
'default'=>'',
'extra'=>'',
'null'=>'null'
'type'=>$type,
'value'=>$value,
'attribute'=>$attribute,
'default'=>$default,
'extra'=>$extra,
'null'=>$null
);
//var_dump($field_desc);exit;
$result=$db->DDLAddField($tableextra,$code,$field_desc,"");
if ($result < 0)

32
htdocs/product/fournisseurs.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
@ -92,7 +92,7 @@ if ($action == 'updateprice' && $_POST["cancel"] <> $langs->trans("Cancel"))
$ref_fourn=GETPOST("ref_fourn");
if (empty($ref_fourn)) $ref_fourn=GETPOST("search_ref_fourn");
$quantity=GETPOST("qty");
$tva_tx=GETPOST('tva_tx','alpha');
$tva_tx=price2num(GETPOST('tva_tx','alpha'));
if (empty($quantity))
{
@ -282,7 +282,7 @@ if ($id || $ref)
$events=array();
$events[]=array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php',1), 'htmlname' => 'tva_tx', 'params' => array());
print $form->select_company(GETPOST("id_fourn"),'id_fourn','fournisseur=1',1,0,0,$events);
if (is_object($hookmanager))
{
$parameters=array('filtre'=>"fournisseur=1",'html_name'=>'id_fourn','selected'=>GETPOST("id_fourn"),'showempty'=>1,'prod_id'=>$product->id);
@ -299,14 +299,17 @@ if ($id || $ref)
}
else
{
print '<input class="flat" name="ref_fourn" size="12" value="'.($_POST["ref_fourn"]?$_POST["ref_fourn"]:'').'">';
print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn")?GETPOST("ref_fourn"):'').'">';
}
print '</td>';
print '</tr>';
// Vat rate
print '<tr><td class="fieldrequired">'.$langs->trans("VATRate").'</td>';
print '<td colspan="3">'.$form->load_tva('tva_tx',$product->tva_tx,$supplier,$mysoc).'</td></tr>';
// Vat rate
print '<tr><td class="fieldrequired">'.$langs->trans("VATRate").'</td>';
print '<td colspan="3">';
//print $form->load_tva('tva_tx',$product->tva_tx,$supplier,$mysoc); // Do not use list here as it may be any vat rates for any country
print '<input type="text" class="flat" size="5" name="tva_tx" value="'.vatrate(GETPOST("tva_tx")?GETPOST("tva_tx"):$product->tva_tx).'">';
print '</td></tr>';
// Availability
if (! empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
@ -332,7 +335,7 @@ if ($id || $ref)
print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
}
print '</td>';
// Price qty min
print '<td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
print '<td><input class="flat" name="price" size="8" value="'.($_POST["price"]?$_POST["price"]:(isset($product->fourn_price)?price($product->fourn_price):'')).'">';
@ -420,10 +423,11 @@ if ($id || $ref)
print '<td align="right">';
print $productfourn->fourn_qty;
print '</td>';
// VAT rate
print '<td align="right">';
print vatrate($productfourn->fourn_tva_tx,true);
// VAT rate
print '<td align="right">';
print vatrate($productfourn->fourn_tva_tx,true);
print '</td>';
// Price quantity
@ -465,4 +469,4 @@ else
// End of page
llxFooter();
$db->close();
?>
?>

31
htdocs/projet/class/project.class.php
View File

@ -242,11 +242,11 @@ class Project extends CommonObject
$sql = "SELECT rowid, ref, title, description, public, datec";
$sql.= ", tms, dateo, datee, fk_soc, fk_user_creat, fk_statut, note_private, note_public";
$sql.= " FROM " . MAIN_DB_PREFIX . "projet";
if ($ref)
{
$sql.= " WHERE ref='".$ref."'";
$sql.= " AND entity IN (".getEntity('project').")";
}
if ($ref)
{
$sql.= " WHERE ref='".$ref."'";
$sql.= " AND entity IN (".getEntity('project').")";
}
else $sql.= " WHERE rowid=".$id;
dol_syslog("Project::fetch sql=" . $sql, LOG_DEBUG);
@ -787,12 +787,19 @@ class Project extends CommonObject
$nblinks = 0;
while ($nblinks < $num)
{
if (preg_match('/PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
if ($source == 'internal' && preg_match('/PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
{
if ($mode == 'read' && $user->rights->projet->lire) $userAccess++;
if ($mode == 'write' && $user->rights->projet->creer) $userAccess++;
if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
}
// Permission are supported on users only. To have an external thirdparty contact to see a project, its user must allowed to contacts of projects.
/*if ($source == 'external' && preg_match('/PROJECT/', $userRole[$nblinks]['code']) && $user->contact_id == $userRole[$nblinks]['id'])
{
if ($mode == 'read' && $user->rights->projet->lire) $userAccess++;
if ($mode == 'write' && $user->rights->projet->creer) $userAccess++;
if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
}*/
$nblinks++;
}
}
@ -836,18 +843,24 @@ class Project extends CommonObject
if ($mode == 0)
{
$sql.= " AND ec.element_id = p.rowid AND ( p.public = 1";
$sql.= " AND ec.element_id = p.rowid";
$sql.= " AND ( p.public = 1";
//$sql.= " OR p.fk_user_creat = ".$user->id;
$sql.= " OR ( ctc.rowid = ec.fk_c_type_contact";
$sql.= " AND ctc.element = '" . $this->element . "'";
$sql.= " AND ec.fk_socpeople = " . $user->id . " ) )";
$sql.= " AND ( (ctc.source = 'internal' AND ec.fk_socpeople = ".$user->id.")";
//$sql.= " OR (ctc.source = 'external' AND ec.fk_socpeople = ".($user->contact_id?$user->contact_id:0).")"; // Permission are supported on users only. To have an external thirdparty contact to see a project, its user must allowed to contacts of projects.
$sql.= " )";
$sql.= " ))";
}
if ($mode == 1)
{
$sql.= " AND ec.element_id = p.rowid";
$sql.= " AND ctc.rowid = ec.fk_c_type_contact";
$sql.= " AND ctc.element = '" . $this->element . "'";
$sql.= " AND ec.fk_socpeople = " . $user->id;
$sql.= " AND ( (ctc.source = 'internal' AND ec.fk_socpeople = ".$user->id.")";
//$sql.= " OR (ctc.source = 'external' AND ec.fk_socpeople = ".($user->contact_id?$user->contact_id:0).")"; // Permission are supported on users only. To have an external thirdparty contact to see a project, its user must allowed to contacts of projects.
$sql.= " )";
}
if ($mode == 2)
{

26
htdocs/projet/contact.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -31,14 +32,21 @@ $langs->load("projects");
$langs->load("companies");
$id = GETPOST('id','int');
$ref= GETPOST('ref');
$ref= GETPOST('ref','alpha');
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$project = new Project($db);
if ($ref)
{
$project->fetch(0,$ref);
$id=$project->id;
}
// Security check
$socid=0;
if ($user->societe_id) $socid=$user->societe_id;
if ($user->societe_id > 0) $socid=$user->societe_id;
$result = restrictedArea($user, 'projet', $id);
@ -49,9 +57,7 @@ $result = restrictedArea($user, 'projet', $id);
// Add new contact
if ($_POST["action"] == 'addcontact' && $user->rights->projet->creer)
{
$result = 0;
$project = new Project($db);
$result = $project->fetch($id);
if ($result > 0 && $id > 0)
@ -81,7 +87,6 @@ if ($_POST["action"] == 'addcontact' && $user->rights->projet->creer)
// bascule du statut d'un contact
if ($_GET["action"] == 'swapstatut' && $user->rights->projet->creer)
{
$project = new Project($db);
if ($project->fetch($id))
{
$result=$project->swapContactStatus(GETPOST('ligne'));
@ -95,7 +100,6 @@ if ($_GET["action"] == 'swapstatut' && $user->rights->projet->creer)
// Efface un contact
if ($_GET["action"] == 'deleteline' && $user->rights->projet->creer)
{
$project = new Project($db);
$project->fetch($id);
$result = $project->delete_contact($_GET["lineid"]);
@ -133,8 +137,6 @@ dol_htmloutput_mesg($mesg);
if ($id > 0 || ! empty($ref))
{
$project = new Project($db);
if ( $project->fetch($id,$ref) > 0)
{
if ($project->societe->id > 0) $result=$project->societe->fetch($project->societe->id);
@ -211,14 +213,14 @@ if ($id > 0 || ! empty($ref))
$var = false;
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addcontact">';
print '<input type="hidden" name="source" value="internal">';
print '<input type="hidden" name="id" value="'.$id.'">';
print '<input type="hidden" name="id" value="'.$project->id.'">';
// Ligne ajout pour contact interne
print "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print '<td nowrap="nowrap">';
print img_object('','user').' '.$langs->trans("Users");

17
htdocs/projet/document.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -36,6 +37,14 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
$id = GETPOST('id','int');
$ref= GETPOST('ref');
$project = new Project($db);
if (! $project->fetch($id,$ref) > 0)
{
dol_print_error($db);
exit;
}
else $id=$project->id;
// Security check
$socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;
@ -52,12 +61,6 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="name";
$project = new Project($db);
if (! $project->fetch($id,$ref) > 0)
{
dol_print_error($db);
exit;
}
/*

13
htdocs/projet/element.php
View File

@ -46,10 +46,8 @@ if ($conf->commande->enabled) $langs->load("orders");
if ($conf->propal->enabled) $langs->load("propal");
if ($conf->ficheinter->enabled) $langs->load("interventions");
$projectid='';
$ref='';
if (isset($_GET["id"])) { $projectid=$_GET["id"]; }
if (isset($_GET["ref"])) { $ref=$_GET["ref"]; }
$projectid=GETPOST('id');
$ref=GETPOST('ref');
if ($projectid == '' && $ref == '')
{
dol_print_error('','Bad parameter');
@ -59,6 +57,13 @@ if ($projectid == '' && $ref == '')
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$project = new Project($db);
if ($ref)
{
$project->fetch(0,$ref);
$projectid=$project->id;
}
// Security check
$socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;

17
htdocs/projet/fiche.php
View File

@ -43,6 +43,13 @@ if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $acti
$mine = GETPOST('mode')=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$project = new Project($db);
if ($ref)
{
$project->fetch(0,$ref);
$id=$project->id;
}
// Security check
$socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;
@ -82,8 +89,6 @@ if ($action == 'add' && $user->rights->projet->creer)
$db->begin();
$project = new Project($db);
$project->ref = $_POST["ref"];
$project->title = $_POST["title"];
$project->socid = $_POST["socid"];
@ -150,8 +155,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
}
if (! $error)
{
$project = new Project($db);
$project->fetch($_POST["id"]);
$project->fetch($id);
$project->ref = $_POST["ref"];
$project->title = $_POST["title"];
@ -174,7 +178,6 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
// Build doc
if ($action == 'builddoc' && $user->rights->projet->creer)
{
$project = new Project($db);
$project->fetch($id);
if (GETPOST('model'))
{
@ -202,7 +205,6 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
{
$project = new Project($db);
$project->fetch($id);
$result = $project->setValid($user);
@ -214,7 +216,6 @@ if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
{
$project = new Project($db);
$project->fetch($id);
$result = $project->setClose($user);
if ($result <= 0)
@ -225,7 +226,6 @@ if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
{
$project = new Project($db);
$project->fetch($id);
$result = $project->setValid($user);
if ($result <= 0)
@ -236,7 +236,6 @@ if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer)
{
$project = new Project($db);
$project->fetch($id);
$result=$project->delete($user);
if ($result > 0)

7
htdocs/projet/ganttview.php
View File

@ -35,6 +35,13 @@ $ref=GETPOST('ref','alpha');
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$object = new Project($db);
if ($ref)
{
$object->fetch(0,$ref);
$id=$object->id;
}
// Security check
$socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;

15
htdocs/projet/note.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -34,6 +35,13 @@ $ref= GETPOST('ref');
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$project = new Project($db);
if ($ref)
{
$project->fetch(0,$ref);
$id=$project->id;
}
// Security check
$socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;
@ -47,7 +55,6 @@ $result = restrictedArea($user, 'projet', $id);
if ($action == 'update_public' && $user->rights->projet->creer)
{
$project = new Project($db);
$project->fetch($_GET['id']);
$db->begin();
@ -66,7 +73,6 @@ if ($action == 'update_public' && $user->rights->projet->creer)
if ($action == 'update_private' && $user->rights->projet->creer)
{
$project = new Project($db);
$project->fetch($_GET['id']);
$db->begin();
@ -99,8 +105,7 @@ $now=dol_now();
if ($id > 0 || ! empty($ref))
{
if ($mesg) print $mesg;
dol_htmloutput_mesg($mesg);
if ($project->fetch($id, $ref))
{

11
htdocs/projet/tasks.php
View File

@ -42,11 +42,17 @@ $mode = GETPOST('mode', 'alpha');
$mine = ($mode == 'mine' ? 1 : 0);
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$object = new Project($db);
if ($ref)
{
$object->fetch(0,$ref);
$id=$object->id;
}
// Security check
$socid=0;
if ($user->societe_id > 0) $socid = $user->societe_id;
//$result = restrictedArea($user, 'projet', $projectid);
if (!$user->rights->projet->lire) accessforbidden();
$result = restrictedArea($user, 'projet', $id);
$progress=GETPOST('progress', 'int');
$label=GETPOST('label', 'alpha');
@ -54,7 +60,6 @@ $description=GETPOST('description', 'alpha');
$userAccess=0;
$object = new Project($db);
/*

3
htdocs/user/class/user.class.php
View File

@ -66,8 +66,11 @@ class User extends CommonObject
var $datec;
var $datem;
//! If this is defined, it is an external user
var $societe_id;
var $contact_id;
var $fk_member;
var $webcal_login;