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

Fix: When creating invoice from other object, discount are created

Browse Source 
automatically
This commit is contained in:
Laurent Destailleur 2011-09-10 17:52:21 +00:00
parent 8426d806f0
commit 65c2d93a29
16 changed files with 484 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/adherents/fiche.php
View File

@ -1030,13 +1030,13 @@ if ($action == 'edit')
else print $langs->trans("NoDolibarrAccess"); else print $langs->trans("NoDolibarrAccess");
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '<tr><td colspan="3" align="center">';
print '<br><center>';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' &nbsp; &nbsp; &nbsp; '; print ' &nbsp; &nbsp; &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</center'; print '</td></tr>';
print '</table>';
print '</form>'; print '</form>';

13
htdocs/categories/class/categorie.class.php
View File

@ -102,7 +102,7 @@ class Categorie
$sql = "SELECT fk_categorie_mere"; $sql = "SELECT fk_categorie_mere";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_association"; $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
$sql.= " WHERE fk_categorie_fille = ".$id; $sql.= " WHERE fk_categorie_fille = '".$id."'";
dol_syslog("Categorie::fetch sql=".$sql); dol_syslog("Categorie::fetch sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -215,7 +215,6 @@ class Categorie
$this->label=trim($this->label); $this->label=trim($this->label);
$this->description=trim($this->description); $this->description=trim($this->description);
$this->parentId = ($this->id_mere) != "" ? intval($this->id_mere) : 0; $this->parentId = ($this->id_mere) != "" ? intval($this->id_mere) : 0;
$this->visible = ($this->visible) != "" ? intval($this->visible) : 0;
if ($this->already_exists()) if ($this->already_exists())
{ {
@ -227,7 +226,7 @@ class Categorie
$this->db->begin(); $this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'categorie_association'; $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'categorie_association';
$sql.= ' WHERE fk_categorie_fille = '.$this->id; $sql .= ' WHERE fk_categorie_fille = "'.$this->id.'"';
dol_syslog("Categorie::update sql=".$sql); dol_syslog("Categorie::update sql=".$sql);
if (! $this->db->query($sql)) if (! $this->db->query($sql))
@ -240,7 +239,7 @@ class Categorie
if($this->id_mere !="" && $this->id_mere!=$this->id) if($this->id_mere !="" && $this->id_mere!=$this->id)
{ {
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'categorie_association(fk_categorie_mere,fk_categorie_fille)'; $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'categorie_association(fk_categorie_mere,fk_categorie_fille)';
$sql.= ' VALUES ('.$this->id_mere.', '.$this->id.')'; $sql .= ' VALUES ("'.$this->id_mere.'","'.$this->id.'")';
dol_syslog("Categorie::update sql=".$sql); dol_syslog("Categorie::update sql=".$sql);
if (! $this->db->query($sql)) if (! $this->db->query($sql))
@ -580,10 +579,10 @@ class Categorie
* @param int $cate Category id * @param int $cate Category id
* @return string Description * @return string Description
*/ */
function get_desc($cate) function get_desc ($cate)
{ {
$sql = "SELECT description FROM ".MAIN_DB_PREFIX."categorie "; $sql = "SELECT description FROM ".MAIN_DB_PREFIX."categorie ";
$sql .= "WHERE rowid = ".$cate; $sql .= "WHERE rowid = '".$cate."'";
$res = $this->db->query($sql); $res = $this->db->query($sql);
$n = $this->db->fetch_array($res); $n = $this->db->fetch_array($res);
@ -596,7 +595,7 @@ class Categorie
* *
* @param Category $fille Object category * @param Category $fille Object category
*/ */
function is_fille($fille) function is_fille ($fille)
{ {
$sql = "SELECT count(fk_categorie_fille) FROM ".MAIN_DB_PREFIX."categorie_association "; $sql = "SELECT count(fk_categorie_fille) FROM ".MAIN_DB_PREFIX."categorie_association ";
$sql .= "WHERE fk_categorie_mere = ".$this->id." AND fk_categorie_fille = ".$fille->id; $sql .= "WHERE fk_categorie_mere = ".$this->id." AND fk_categorie_fille = ".$fille->id;

2
htdocs/compta/facture/class/facture.class.php
View File

@ -232,7 +232,7 @@ class Facture extends CommonObject
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ", '".$this->type."'"; $sql.= ", '".$this->type."'";
$sql.= ", '".$socid."'"; $sql.= ", '".$socid."'";
$sql.= ", '".$this->db->idate($now)."'"; $sql.= ", ".$this->db->idate($now);
$sql.= ", '".$totalht."'"; $sql.= ", '".$totalht."'";
$sql.= ",".($this->remise_absolue>0?$this->remise_absolue:'NULL'); $sql.= ",".($this->remise_absolue>0?$this->remise_absolue:'NULL');
$sql.= ",".($this->remise_percent>0?$this->remise_percent:'NULL'); $sql.= ",".($this->remise_percent>0?$this->remise_percent:'NULL');

18
htdocs/core/class/canvas.class.php
View File

@ -77,7 +77,7 @@ class Canvas
* and MVC properties: ->control (Controller), ->control->object (Model), ->template_dir (View) * and MVC properties: ->control (Controller), ->control->object (Model), ->template_dir (View)
* *
* @param module Name of target module (thirdparty, contact, ...) * @param module Name of target module (thirdparty, contact, ...)
* @param card Type of card (ex: 'card', 'info', 'contactcard', ...) or '' for a list page * @param card Type of card (ex: card, info, contactcard, ...)
* @param canvas Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule) * @param canvas Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule)
*/ */
function getCanvas($module, $card, $canvas) function getCanvas($module, $card, $canvas)
@ -161,7 +161,7 @@ class Canvas
} }
/** /**
* Get object * get object
* *
* @param param1 Param1 * @param param1 Param1
* @param param2 Param2 * @param param2 Param2
@ -224,7 +224,7 @@ class Canvas
/** /**
* Return the template to display canvas (if it exists) * Return the template to display canvas (if it exists)
* *
* @param string $mode 'create', ''='view', 'edit', 'list' * @param mode 'create', ''='view', 'edit'
* @return string Path to display canvas file if it exists, '' otherwise. * @return string Path to display canvas file if it exists, '' otherwise.
*/ */
function displayCanvasExists($mode='view') function displayCanvasExists($mode='view')
@ -232,8 +232,8 @@ class Canvas
$newmode=$mode; $newmode=$mode;
if (empty($newmode)) $newmode='view'; if (empty($newmode)) $newmode='view';
if (empty($this->template_dir)) return 0; if (empty($this->template_dir)) return 0;
//print $this->template_dir.($this->card?$this->card.'_':'').$newmode.'.tpl.php'; //print $this->template_dir.$this->card.'_'.$newmode.'.tpl.php';
if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$newmode.'.tpl.php')) return 1; if (file_exists($this->template_dir.$this->card.'_'.$newmode.'.tpl.php')) return 1;
else return 0; else return 0;
} }
@ -242,16 +242,16 @@ class Canvas
* Variables used by templates may have been defined, loaded before * Variables used by templates may have been defined, loaded before
* into the assign_values function. * into the assign_values function.
* *
* @param string $mode 'create', 'view', 'edit' * @param mode 'create', 'view', 'edit'
* @param int $id Id of object to show * @param id Id of object to show
*/ */
function display_canvas($mode='view',$id=0) function display_canvas($mode='view',$id=0)
{ {
global $db, $conf, $langs, $user, $canvas; global $db, $conf, $langs, $user, $canvas;
global $id, $form, $formfile; global $id, $form, $formfile;
//print $this->template_dir.($this->card?$this->card.'_':'').$mode.'.tpl.php';exit; //print $this->template_dir.$this->card.'_'.$mode.'.tpl.php';exit;
include($this->template_dir.($this->card?$this->card.'_':'').$mode.'.tpl.php'); // Include native PHP template include($this->template_dir.$this->card.'_'.$mode.'.tpl.php'); // Include native PHP template
} }
} }

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

@ -52,7 +52,7 @@ abstract class CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql.= " WHERE ref = '".$this->ref."'"; $sql.= " WHERE ref = '".$this->ref."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
dol_syslog(get_class($this)."::verifyNumRef sql=".$sql, LOG_DEBUG); dol_syslog("CommonObject::verifyNumRef sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -62,7 +62,7 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::verifyNumRef ".$this->error, LOG_ERR); dol_syslog("CommonObject::verifyNumRef ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -80,19 +80,19 @@ abstract class CommonObject
{ {
global $user,$conf,$langs; global $user,$conf,$langs;
dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source"); dol_syslog("CommonObject::add_contact $fk_socpeople, $type_contact, $source");
// Check parameters // Check parameters
if ($fk_socpeople <= 0) if ($fk_socpeople <= 0)
{ {
$this->error=$langs->trans("ErrorWrongValueForParameter","1"); $this->error=$langs->trans("ErrorWrongValueForParameter","1");
dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR); dol_syslog("CommonObject::add_contact ".$this->error,LOG_ERR);
return -1; return -1;
} }
if (! $type_contact) if (! $type_contact)
{ {
$this->error=$langs->trans("ErrorWrongValueForParameter","2"); $this->error=$langs->trans("ErrorWrongValueForParameter","2");
dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR); dol_syslog("CommonObject::add_contact ".$this->error,LOG_ERR);
return -2; return -2;
} }
@ -126,7 +126,7 @@ abstract class CommonObject
$sql.= $this->db->idate($datecreate); $sql.= $this->db->idate($datecreate);
$sql.= ", 4, '". $id_type_contact . "' "; $sql.= ", 4, '". $id_type_contact . "' ";
$sql.= ")"; $sql.= ")";
dol_syslog(get_class($this)."::add_contact sql=".$sql); dol_syslog("CommonObject::add_contact sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -200,7 +200,7 @@ abstract class CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
$sql.= " WHERE rowid =".$rowid; $sql.= " WHERE rowid =".$rowid;
dol_syslog(get_class($this)."::delete_contact sql=".$sql); dol_syslog("CommonObject::delete_contact sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
if (! $notrigger) if (! $notrigger)
@ -218,7 +218,7 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::delete_contact error=".$this->error, LOG_ERR); dol_syslog("CommonObject::delete_contact error=".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -243,7 +243,7 @@ abstract class CommonObject
$sql.= " WHERE element_id =".$this->id; $sql.= " WHERE element_id =".$this->id;
$sql.= " AND fk_c_type_contact IN (".$listId.")"; $sql.= " AND fk_c_type_contact IN (".$listId.")";
dol_syslog(get_class($this)."::delete_linked_contact sql=".$sql); dol_syslog("CommonObject::delete_linked_contact sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
return 1; return 1;
@ -251,7 +251,7 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::delete_linked_contact error=".$this->error, LOG_ERR); dol_syslog("CommonObject::delete_linked_contact error=".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -288,7 +288,7 @@ abstract class CommonObject
if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'"; if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
$sql.=" ORDER BY t.name ASC"; $sql.=" ORDER BY t.name ASC";
dol_syslog(get_class($this)."::liste_contact sql=".$sql); dol_syslog("CommonObject::liste_contact sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -440,7 +440,7 @@ abstract class CommonObject
$sql.= " AND tc.active = 1"; $sql.= " AND tc.active = 1";
if ($status) $sql.= " AND ec.statut = ".$status; if ($status) $sql.= " AND ec.statut = ".$status;
dol_syslog(get_class($this)."::getIdContact sql=".$sql); dol_syslog("CommonObject::getIdContact sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -453,7 +453,7 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog(get_class($this)."::getIdContact ".$this->error, LOG_ERR); dol_syslog("CommonObject::getIdContact ".$this->error, LOG_ERR);
return null; return null;
} }
@ -606,7 +606,7 @@ abstract class CommonObject
$sql.= $field." = '".$value."'"; $sql.= $field." = '".$value."'";
$sql.= " WHERE rowid = ".$id; $sql.= " WHERE rowid = ".$id;
dol_syslog(get_class($this)."::updateObjectField sql=".$sql, LOG_DEBUG); dol_syslog("CommonObject::updateObjectField sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -632,7 +632,7 @@ abstract class CommonObject
if (! $this->table_element) if (! $this->table_element)
{ {
dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined", LOG_ERR); dol_print_error('',"CommonObject::load_previous_next_ref was called on objet with property table_element not defined", LOG_ERR);
return -1; return -1;
} }
@ -720,7 +720,7 @@ abstract class CommonObject
{ {
if (! $this->table_element) if (! $this->table_element)
{ {
dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR); dol_syslog("CommonObject::setProject was called on objet with property table_element not defined",LOG_ERR);
return -1; return -1;
} }
@ -729,7 +729,7 @@ abstract class CommonObject
else $sql.= ' SET fk_projet = NULL'; else $sql.= ' SET fk_projet = NULL';
$sql.= ' WHERE rowid = '.$this->id; $sql.= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::setProject sql=".$sql); dol_syslog("CommonObject::setProject sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->fk_project = $projectid; $this->fk_project = $projectid;
@ -754,7 +754,7 @@ abstract class CommonObject
{ {
if (! $this->table_element) if (! $this->table_element)
{ {
dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR); dol_syslog("CommonObject::setDocModel was called on objet with property table_element not defined",LOG_ERR);
return -1; return -1;
} }
@ -766,7 +766,7 @@ abstract class CommonObject
// if ($this->element == 'facture') $sql.= " AND fk_statut < 2"; // if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
// if ($this->element == 'propal') $sql.= " AND fk_statut = 0"; // if ($this->element == 'propal') $sql.= " AND fk_statut = 0";
dol_syslog(get_class($this)."::setDocModel sql=".$sql); dol_syslog("CommonObject::setDocModel sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -791,12 +791,12 @@ abstract class CommonObject
{ {
if (! $this->table_element_line) if (! $this->table_element_line)
{ {
dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR); dol_syslog("CommonObject::line_order was called on objet with property table_element_line not defined",LOG_ERR);
return -1; return -1;
} }
if (! $this->fk_element) if (! $this->fk_element)
{ {
dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR); dol_syslog("CommonObject::line_order was called on objet with property fk_element not defined",LOG_ERR);
return -1; return -1;
} }
@ -1042,7 +1042,7 @@ abstract class CommonObject
{ {
if (! $this->table_element) if (! $this->table_element)
{ {
dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR); dol_syslog("CommonObject::update_note was called on objet with property table_element not defined", LOG_ERR);
return -1; return -1;
} }
@ -1058,7 +1058,7 @@ abstract class CommonObject
} }
$sql.= " WHERE rowid =". $this->id; $sql.= " WHERE rowid =". $this->id;
dol_syslog(get_class($this)."::update_note sql=".$sql, LOG_DEBUG); dol_syslog("CommonObject::update_note sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->note = $note; $this->note = $note;
@ -1067,7 +1067,7 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog(get_class($this)."::update_note error=".$this->error, LOG_ERR); dol_syslog("CommonObject::update_note error=".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -1081,7 +1081,7 @@ abstract class CommonObject
{ {
if (! $this->table_element) if (! $this->table_element)
{ {
dol_syslog(get_class($this)."::update_note_public was called on objet with property table_element not defined",LOG_ERR); dol_syslog("CommonObject::update_note_public was called on objet with property table_element not defined",LOG_ERR);
return -1; return -1;
} }
@ -1089,7 +1089,7 @@ abstract class CommonObject
$sql.= " SET note_public = '".$this->db->escape($note_public)."'"; $sql.= " SET note_public = '".$this->db->escape($note_public)."'";
$sql.= " WHERE rowid =". $this->id; $sql.= " WHERE rowid =". $this->id;
dol_syslog(get_class($this)."::update_note_public sql=".$sql); dol_syslog("CommonObject::update_note_public sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->note_public = $note_public; $this->note_public = $note_public;
@ -1130,7 +1130,7 @@ abstract class CommonObject
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id; $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
if ($exclspec) $sql.= ' AND product_type <> 9'; if ($exclspec) $sql.= ' AND product_type <> 9';
dol_syslog(get_class($this)."::update_price sql=".$sql); dol_syslog("CommonObject::update_price sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1194,7 +1194,7 @@ abstract class CommonObject
$sql .= ' WHERE rowid = '.$this->id; $sql .= ' WHERE rowid = '.$this->id;
//print "xx".$sql; //print "xx".$sql;
dol_syslog(get_class($this)."::update_price sql=".$sql); dol_syslog("CommonObject::update_price sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1203,14 +1203,14 @@ abstract class CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog(get_class($this)."::update_price error=".$this->error,LOG_ERR); dol_syslog("CommonObject::update_price error=".$this->error,LOG_ERR);
return -1; return -1;
} }
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog(get_class($this)."::update_price error=".$this->error,LOG_ERR); dol_syslog("CommonObject::update_price error=".$this->error,LOG_ERR);
return -1; return -1;
} }
} }
@ -1236,7 +1236,7 @@ abstract class CommonObject
$sql.= ", '".$this->element."'"; $sql.= ", '".$this->element."'";
$sql.= ")"; $sql.= ")";
dol_syslog(get_class($this)."::add_object_linked sql=".$sql); dol_syslog("CommonObject::add_object_linked sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->db->commit(); $this->db->commit();
@ -1293,7 +1293,7 @@ abstract class CommonObject
} }
//print $sql; //print $sql;
dol_syslog(get_class($this)."::fetchObjectLink sql=".$sql); dol_syslog("CommonObject::fetchObjectLink sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1382,24 +1382,72 @@ abstract class CommonObject
$sql.= " SET fk_statut = ".$statut; $sql.= " SET fk_statut = ".$statut;
$sql.= " WHERE rowid=".$elementId; $sql.= " WHERE rowid=".$elementId;
dol_syslog(get_class($this)."::setStatut sql=".$sql, LOG_DEBUG); dol_syslog("CommonObject::setStatut sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) if (!$resql)
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR); dol_syslog("CommonObject::setStatut ".$this->error, LOG_ERR);
return -1; return -1;
} }
return 1; return 1;
} }
/**
* Fetch field list
*/
function getFieldList()
{
global $conf, $langs;
$this->field_list = array();
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->fieldListName."'";
$sql.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY rang ASC";
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$fieldlist = array();
$obj = $this->db->fetch_object($resql);
$fieldlist["id"] = $obj->rowid;
$fieldlist["name"] = $obj->name;
$fieldlist["alias"] = $obj->alias;
$fieldlist["title"] = $langs->trans($obj->title);
$fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort;
$fieldlist["search"] = $obj->search;
$fieldlist["enabled"] = verifCond($obj->enabled);
$fieldlist["order"] = $obj->rang;
array_push($this->field_list,$fieldlist);
$i++;
}
$this->db->free($resql);
}
else
{
dol_print_error($db,$sql);
}
}
/** /**
* Load type of canvas of an object if it exists * Load type of canvas of an object if it exists
* *
* @param int $id Record id * @param id Record id
* @param string $ref Record ref * @param ref Record ref
* @return int <0 if KO, 0 if nothing done, >0 if OK * @return int <0 if KO, 0 if nothing done, >0 if OK
*/ */
function getCanvas($id=0,$ref='') function getCanvas($id=0,$ref='')

10
htdocs/exports/class/export.class.php
View File

@ -217,7 +217,6 @@ class Export
// Build the sql request // Build the sql request
$sql=$this->array_export_sql_start[$indice]; $sql=$this->array_export_sql_start[$indice];
$i=0; $i=0;
//print_r($array_selected); //print_r($array_selected);
foreach ($this->array_export_fields[$indice] as $key => $value) foreach ($this->array_export_fields[$indice] as $key => $value)
{ {
@ -255,13 +254,6 @@ class Export
dol_syslog("Export::build_file $model, $datatoexport, $array_selected"); dol_syslog("Export::build_file $model, $datatoexport, $array_selected");
// Check parameters or context properties
if (! is_array($this->array_export_fields[$indice]))
{
$this->error="ErrorBadParameter";
return -1;
}
// Creation de la classe d'export du model ExportXXX // Creation de la classe d'export du model ExportXXX
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/export/"; $dir = DOL_DOCUMENT_ROOT . "/includes/modules/export/";
$file = "export_".$model.".modules.php"; $file = "export_".$model.".modules.php";
@ -286,7 +278,7 @@ class Export
$outputlangs=$langs; // Lang for output $outputlangs=$langs; // Lang for output
// Open file // Open file
dol_mkdir($dirname); create_exdir($dirname);
$result=$objmodel->open_file($dirname."/".$filename, $outputlangs); $result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
if ($result >= 0) if ($result >= 0)

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

@ -1051,7 +1051,7 @@ LDAPFilterConnection=Search filter
LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSamba=Login (samba, activedirectory)
LDAPFieldLoginSambaExample=Example : samaccountname LDAPFieldLoginSambaExample=Example : samaccountname
LDAPFieldFullname=First name LDAPFieldFullname=Firstname Name
LDAPFieldFullnameExample=Example : cn LDAPFieldFullnameExample=Example : cn
LDAPFieldPassword=Password LDAPFieldPassword=Password
LDAPFieldPasswordNotCrypted=Password not crypted LDAPFieldPasswordNotCrypted=Password not crypted

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

@ -53,8 +53,8 @@ ReportByQuarter=Report by rate
CivilityCode=Civility code CivilityCode=Civility code
RegisteredOffice=Registered office RegisteredOffice=Registered office
Name=Name Name=Name
Lastname=Last name Lastname=Lastname
Firstname=First name Firstname=Name
PostOrFunction=Post/Function PostOrFunction=Post/Function
UserTitle=Title UserTitle=Title
Surname=Surname/Pseudo Surname=Surname/Pseudo

87
htdocs/product/canvas/product/actions_card_product.class.php
View File

@ -36,35 +36,25 @@ class ActionsCardProduct extends Product
//! Template container //! Template container
var $tpl = array(); var $tpl = array();
// List of fiels for action=list
var $field_list =array();
/** /**
* Constructor * \brief Constructeur de la classe
* * \param DB Handler acces base de donnees
* @param DoliDB $DB Handler acces base de donnees * \param id Id produit (0 par defaut)
* @param string $targmetmodule Name of directory of module where canvas is stored
* @param string $canvas Name of canvas
* @param string $card Name of tab (sub-canvas)
*/ */
function ActionsCardIndividual($DB,$targetmodule,$canvas,$card) function ActionsCardProduct($DB=0, $id=0, $user=0)
{ {
$this->db = $DB; $this->db = $DB;
$this->targetmodule = $targetmodule; $this->id = $id ;
$this->canvas = $canvas; $this->user = $user;
$this->card = $card; $this->module = "produit";
$this->canvas = "default";
$this->name = "product"; $this->name = "default";
$this->definition = "Product canvas (défaut)"; $this->definition = "Product canvas (défaut)";
$this->fieldListName = "product_default"; $this->fieldListName = "product_default";
$this->next_prev_filter = "canvas='default'"; $this->next_prev_filter = "canvas='default'";
} }
/**
* Return the title of card
*/
function getTitle() function getTitle()
{ {
global $langs; global $langs;
@ -189,65 +179,8 @@ class ActionsCardProduct extends Product
$this->tpl['fiche_end']=dol_get_fiche_end(); $this->tpl['fiche_end']=dol_get_fiche_end();
} }
if ($action == 'list')
{
$this->LoadListDatas($GLOBALS['limit'], $GLOBALS['offset'], $GLOBALS['sortfield'], $GLOBALS['sortorder']);
} }
}
/**
* Fetch field list
*/
function getFieldList()
{
global $conf, $langs;
$this->field_list = array();
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->fieldListName."'";
$sql.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY rang ASC";
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$fieldlist = array();
$obj = $this->db->fetch_object($resql);
$fieldlist["id"] = $obj->rowid;
$fieldlist["name"] = $obj->name;
$fieldlist["alias"] = $obj->alias;
$fieldlist["title"] = $langs->trans($obj->title);
$fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort;
$fieldlist["search"] = $obj->search;
$fieldlist["enabled"] = verifCond($obj->enabled);
$fieldlist["order"] = $obj->rang;
array_push($this->field_list,$fieldlist);
$i++;
}
$this->db->free($resql);
}
else
{
dol_print_error($db,$sql);
}
}
/** /**
* Fetch datas list * Fetch datas list
*/ */
@ -255,8 +188,6 @@ class ActionsCardProduct extends Product
{ {
global $conf, $langs; global $conf, $langs;
$this->getFieldList();
$this->list_datas = array(); $this->list_datas = array();
//$_GET["sall"] = 'LL'; //$_GET["sall"] = 'LL';

93
htdocs/product/canvas/service/actions_card_service.class.php
View File

@ -36,40 +36,28 @@ class ActionsCardService extends Product
//! Template container //! Template container
var $tpl = array(); var $tpl = array();
// List of fiels for action=list
var $field_list =array();
/** /**
* Constructor * \brief Constructeur de la classe
* * \param DB Handler acces base de donnees
* @param DoliDB $DB Handler acces base de donnees * \param id Id service (0 par defaut)
* @param string $targmetmodule Name of directory of module where canvas is stored
* @param string $canvas Name of canvas
* @param string $card Name of tab (sub-canvas)
*/ */
function ActionsCardIndividual($DB,$targetmodule,$canvas,$card) function ActionsCardService($DB=0, $id=0, $user=0)
{ {
$this->db = $DB; $this->db = $DB;
$this->targetmodule = $targetmodule; $this->id = $id ;
$this->canvas = $canvas; $this->user = $user;
$this->card = $card;
$this->module = "service"; $this->module = "service";
$this->canvas = "service";
$this->name = "service"; $this->name = "service";
$this->definition = "Services canvas"; $this->definition = "Services canvas";
$this->fieldListName = "product_service"; $this->fieldListName = "product_service";
$this->next_prev_filter = "canvas='service'"; $this->next_prev_filter = "canvas='service'";
} }
/**
* Return the title of card
*/
function getTitle() function getTitle()
{ {
global $langs; return 'Services';
return $langs->trans("Products");
} }
/** /**
@ -84,9 +72,8 @@ class ActionsCardService extends Product
} }
/** /**
* Assign custom values for canvas (for example into this->tpl to be used by templates) * \brief Assigne les valeurs pour les templates
* * \param object object
* @param action Type of action
*/ */
function assign_values($action='') function assign_values($action='')
{ {
@ -169,62 +156,6 @@ class ActionsCardService extends Product
$this->tpl['fiche_end']=dol_get_fiche_end(); $this->tpl['fiche_end']=dol_get_fiche_end();
} }
if ($action == 'list')
{
$this->LoadListDatas($GLOBALS['limit'], $GLOBALS['offset'], $GLOBALS['sortfield'], $GLOBALS['sortorder']);
}
}
/**
* Fetch field list
*/
private function getFieldList()
{
global $conf, $langs;
$this->field_list = array();
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->fieldListName."'";
$sql.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY rang ASC";
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$fieldlist = array();
$obj = $this->db->fetch_object($resql);
$fieldlist["id"] = $obj->rowid;
$fieldlist["name"] = $obj->name;
$fieldlist["alias"] = $obj->alias;
$fieldlist["title"] = $langs->trans($obj->title);
$fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort;
$fieldlist["search"] = $obj->search;
$fieldlist["enabled"] = verifCond($obj->enabled);
$fieldlist["order"] = $obj->rang;
array_push($this->field_list,$fieldlist);
$i++;
}
$this->db->free($resql);
}
else
{
dol_print_error($db,$sql);
}
} }
/** /**
@ -234,8 +165,6 @@ class ActionsCardService extends Product
{ {
global $conf; global $conf;
$this->getFieldList();
$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,'; $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
$sql.= ' p.fk_product_type, p.tms as datem,'; $sql.= ' p.fk_product_type, p.tms as datem,';
$sql.= ' p.duration, p.tosell as statut, p.seuil_stock_alerte'; $sql.= ' p.duration, p.tosell as statut, p.seuil_stock_alerte';

97
htdocs/product/liste.php
View File

@ -105,10 +105,15 @@ if ($conf->categorie->enabled && GETPOST('catid'))
$htmlother=new FormOther($db); $htmlother=new FormOther($db);
$html=new Form($db); $html=new Form($db);
if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) if (! empty($objcanvas->template_dir))
{ {
$objcanvas->assign_values('list'); // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder)) $classname = 'ActionsCard'.ucfirst($canvas);
$objcanvas->display_canvas('list'); // This is code to show template include_once(DOL_DOCUMENT_ROOT.'/product/canvas/'.$canvas.'/actions_card_'.$canvas.'.class.php');
$object = new $classname($db);
$object->getFieldList();
$object->LoadListDatas($limit, $offset, $sortfield, $sortorder);
$title = $object->getTitle();
} }
else else
{ {
@ -129,52 +134,53 @@ else
{ {
$texte = $langs->trans("ProductsAndServices"); $texte = $langs->trans("ProductsAndServices");
} }
}
$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,'; $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
$sql.= ' p.fk_product_type, p.tms as datem,'; $sql.= ' p.fk_product_type, p.tms as datem,';
$sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte,'; $sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte,';
$sql.= ' MIN(pfp.unitprice) as minsellprice'; $sql.= ' MIN(pfp.unitprice) as minsellprice';
$sql.= ' FROM ('.MAIN_DB_PREFIX.'product as p'; $sql.= ' FROM ('.MAIN_DB_PREFIX.'product as p';
// We'll need this table joined to the select in order to filter by categ // We'll need this table joined to the select in order to filter by categ
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp"; if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
$sql.= ') '; $sql.= ') ';
//if ($fourn_id > 0) // The DISTINCT is used to avoid duplicate from this link //if ($fourn_id > 0) // The DISTINCT is used to avoid duplicate from this link
//{ //{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON p.rowid = pf.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON p.rowid = pf.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON pf.rowid = pfp.fk_product_fournisseur"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON pf.rowid = pfp.fk_product_fournisseur";
//} //}
$sql.= ' WHERE p.entity IN (0,'.(! empty($conf->entities['product']) ? $conf->entities['product'] : $conf->entity).')'; $sql.= ' WHERE p.entity IN (0,'.(! empty($conf->entities['product']) ? $conf->entities['product'] : $conf->entity).')';
if ($search_categ) $sql.= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ if ($search_categ) $sql.= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
if ($sall) if ($sall)
{ {
$sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%')"; $sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%')";
} }
# if the type is not 1, we show all products (type = 0,2,3) # if the type is not 1, we show all products (type = 0,2,3)
if (dol_strlen($type)) if (dol_strlen($type))
{ {
if ($type == 1) $sql.= " AND p.fk_product_type = '1'"; if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
else $sql.= " AND p.fk_product_type <> '1'"; else $sql.= " AND p.fk_product_type <> '1'";
} }
if ($sref) $sql.= " AND p.ref like '%".$sref."%'"; if ($sref) $sql.= " AND p.ref like '%".$sref."%'";
if ($sbarcode) $sql.= " AND p.barcode like '%".$sbarcode."%'"; if ($sbarcode) $sql.= " AND p.barcode like '%".$sbarcode."%'";
if ($snom) $sql.= " AND p.label like '%".$db->escape($snom)."%'"; if ($snom) $sql.= " AND p.label like '%".$db->escape($snom)."%'";
if (isset($tosell) && dol_strlen($tosell) > 0) $sql.= " AND p.tosell = ".$db->escape($tosell); if (isset($tosell) && dol_strlen($tosell) > 0) $sql.= " AND p.tosell = ".$db->escape($tosell);
if (isset($tobuy) && dol_strlen($tobuy) > 0) $sql.= " AND p.tobuy = ".$db->escape($tobuy); if (isset($tobuy) && dol_strlen($tobuy) > 0) $sql.= " AND p.tobuy = ".$db->escape($tobuy);
if (dol_strlen($canvas) > 0) $sql.= " AND p.canvas = '".$db->escape($canvas)."'"; if (dol_strlen($canvas) > 0) $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
if ($catid) $sql.= " AND cp.fk_categorie = ".$catid; if ($catid) $sql.= " AND cp.fk_categorie = ".$catid;
if ($search_categ) $sql.= " AND cp.fk_categorie = ".$search_categ; if ($search_categ) $sql.= " AND cp.fk_categorie = ".$search_categ;
if ($fourn_id > 0) $sql.= " AND pf.fk_soc = ".$fourn_id; if ($fourn_id > 0) $sql.= " AND pf.fk_soc = ".$fourn_id;
$sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,"; $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
$sql.= " p.fk_product_type, p.tms,"; $sql.= " p.fk_product_type, p.tms,";
$sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte"; $sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte";
//if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte"; // Not used yet //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte"; // Not used yet
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit + 1 ,$offset); $sql.= $db->plimit($limit + 1 ,$offset);
dol_syslog("sql=".$sql); dol_syslog("sql=".$sql);
$resql = $db->query($sql) ; $resql = $db->query($sql) ;
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
@ -464,11 +470,10 @@ else
print "</table>"; print "</table>";
print '</form>'; print '</form>';
} }
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
}
} }

9
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -46,11 +46,10 @@ abstract class ActionsCardCommon
/** /**
* Constructor * Constructor
* * @param DB Handler acces base de donnees
* @param DoliDB $DB Handler acces base de donnees * @param targetmodule Name of directory of module where canvas is stored
* @param string $targmetmodule Name of directory of module where canvas is stored * @param canvas Name of canvas
* @param string $canvas Name of canvas * @param card Name of tab (sub-canvas)
* @param string $card Name of tab (sub-canvas)
*/ */
function ActionsCardCommon($DB,$targetmodule,$canvas,$card) function ActionsCardCommon($DB,$targetmodule,$canvas,$card)
{ {

17
htdocs/societe/canvas/default/actions_card_default.class.php
View File

@ -36,11 +36,10 @@ class ActionsCardDefault extends ActionsCardCommon
/** /**
* Constructor * Constructor
* * @param DB Handler acces base de donnees
* @param DoliDB $DB Handler acces base de donnees * @param targmetmodule Name of directory of module where canvas is stored
* @param string $targmetmodule Name of directory of module where canvas is stored * @param canvas Name of canvas
* @param string $canvas Name of canvas * @param card Name of tab (sub-canvas)
* @param string $card Name of tab (sub-canvas)
*/ */
function ActionsCardDefault($DB,$targetmodule,$canvas,$card) function ActionsCardDefault($DB,$targetmodule,$canvas,$card)
{ {
@ -67,6 +66,14 @@ class ActionsCardDefault extends ActionsCardCommon
} }
/**
* Assigne les valeurs POST dans l'objet
*/
function assign_post()
{
parent::assign_post();
}
/** /**
* Execute actions * Execute actions
* @param Id of object (may be empty for creation) * @param Id of object (may be empty for creation)

17
htdocs/societe/canvas/individual/actions_card_individual.class.php
View File

@ -35,11 +35,10 @@ class ActionsCardIndividual extends ActionsCardCommon
/** /**
* Constructor * Constructor
* * @param DB Handler acces base de donnees
* @param DoliDB $DB Handler acces base de donnees * @param targetmodule Name of directory of module where canvas is stored
* @param string $targmetmodule Name of directory of module where canvas is stored * @param canvas Name of canvas
* @param string $canvas Name of canvas * @param card Name of tab (sub-canvas)
* @param string $card Name of tab (sub-canvas)
*/ */
function ActionsCardIndividual($DB,$targetmodule,$canvas,$card) function ActionsCardIndividual($DB,$targetmodule,$canvas,$card)
{ {
@ -67,6 +66,14 @@ class ActionsCardIndividual extends ActionsCardCommon
} }
/**
* Assigne les valeurs POST dans l'objet
*/
function assign_post()
{
parent::assign_post();
}
/** /**
* Execute actions * Execute actions
* @param Id of object (may be empty for creation) * @param Id of object (may be empty for creation)

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

@ -1230,7 +1230,6 @@ class User extends CommonObject
function setPassword($user, $password='', $changelater=0, $notrigger=0, $nosyncmember=0) function setPassword($user, $password='', $changelater=0, $notrigger=0, $nosyncmember=0)
{ {
global $conf, $langs; global $conf, $langs;
require_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php");
$error=0; $error=0;

26
test/phpunit/ExportTest.php
View File

@ -139,8 +139,6 @@ class ExportTest extends PHPUnit_Framework_TestCase
$objexport->array_export_fields[0]=$array_export_fields; $objexport->array_export_fields[0]=$array_export_fields;
$objexport->array_export_alias[0]=$array_alias; $objexport->array_export_alias[0]=$array_alias;
dol_mkdir($conf->export->dir_temp);
$model='csv'; $model='csv';
// Build export file // Build export file
@ -165,29 +163,5 @@ class ExportTest extends PHPUnit_Framework_TestCase
return true; return true;
} }
/**
* Test export function
*
* @return void
*/
public function testExportSociete()
{
global $conf,$user,$langs,$db;
$sql = "";
$datatoexport='societe_1';
$array_selected = array("s.rowid"=>1, "s.nom"=>2); // Mut be fields found into declaration of dataset
$model='csv';
$objexport=new Export($db);
$result=$objexport->load_arrays($user,$datatoexport);
// Build export file
$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $sql);
$expectedresult=1;
$this->assertEquals($result,$expectedresult);
return true;
}
} }
?> ?>