';
print "\n";
@@ -606,7 +606,7 @@ if ($rowid > 0)
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 524fd5c0f93..be4e9eed510 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -95,7 +95,7 @@ class BOM extends CommonObject
'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLoss'),
- 'duration' => array('type'=>'real', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
+ 'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-2, 'position'=>161, 'notnull'=>-1,),
'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-2, 'position'=>162, 'notnull'=>-1,),
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 3578e0e0c60..d252171b38f 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -278,7 +278,7 @@ if ($user->rights->categorie->creer)
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 47110da8a92..868d149691a 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -83,16 +83,16 @@ class Categories extends DolibarrApi
*/
public function get($id, $include_childs = false)
{
- if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if ( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
- if ( ! DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -131,50 +131,50 @@ class Categories extends DolibarrApi
$obj_ret = array();
- if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$sql = "SELECT t.rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."categorie as t";
- $sql.= ' WHERE t.entity IN ('.getEntity('category').')';
+ $sql .= " FROM ".MAIN_DB_PREFIX."categorie as t";
+ $sql .= ' WHERE t.entity IN ('.getEntity('category').')';
if (!empty($type))
{
- $sql.= ' AND t.type='.array_search($type, Categories::$TYPES);
+ $sql .= ' AND t.type='.array_search($type, Categories::$TYPES);
}
// Add sql filters
if ($sqlfilters)
{
- if (! DolibarrApi::_checkFilters($sqlfilters))
+ if (!DolibarrApi::_checkFilters($sqlfilters))
{
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
- $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
- $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
- $sql.= $db->order($sortfield, $sortorder);
- if ($limit) {
+ $sql .= $db->order($sortfield, $sortorder);
+ if ($limit) {
if ($page < 0)
{
$page = 0;
}
$offset = $limit * $page;
- $sql.= $db->plimit($limit + 1, $offset);
+ $sql .= $db->plimit($limit + 1, $offset);
}
$result = $db->query($sql);
if ($result)
{
- $i=0;
+ $i = 0;
$num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
while ($i < $min)
{
$obj = $db->fetch_object($result);
$category_static = new Categorie($db);
- if($category_static->fetch($obj->rowid)) {
+ if ($category_static->fetch($obj->rowid)) {
$obj_ret[] = $this->_cleanObjectDatas($category_static);
}
$i++;
@@ -183,7 +183,7 @@ class Categories extends DolibarrApi
else {
throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
}
- if( ! count($obj_ret)) {
+ if (!count($obj_ret)) {
throw new RestException(404, 'No category found');
}
return $obj_ret;
@@ -197,14 +197,14 @@ class Categories extends DolibarrApi
*/
public function post($request_data = null)
{
- if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+ if (!DolibarrApiAccess::$user->rights->categorie->creer) {
throw new RestException(401);
}
// Check mandatory fields
$result = $this->_validate($request_data);
- foreach($request_data as $field => $value) {
+ foreach ($request_data as $field => $value) {
$this->category->$field = $value;
}
if ($this->category->create(DolibarrApiAccess::$user) < 0) {
@@ -222,20 +222,20 @@ class Categories extends DolibarrApi
*/
public function put($id, $request_data = null)
{
- if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+ if (!DolibarrApiAccess::$user->rights->categorie->creer) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
- if ( ! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- foreach($request_data as $field => $value) {
+ foreach ($request_data as $field => $value) {
if ($field == 'id') continue;
$this->category->$field = $value;
}
@@ -258,19 +258,19 @@ class Categories extends DolibarrApi
*/
public function delete($id)
{
- if(! DolibarrApiAccess::$user->rights->categorie->supprimer) {
+ if (!DolibarrApiAccess::$user->rights->categorie->supprimer) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
- if ( ! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- if (! $this->category->delete(DolibarrApiAccess::$user)) {
+ if (!$this->category->delete(DolibarrApiAccess::$user)) {
throw new RestException(401, 'error when delete category');
}
@@ -311,21 +311,21 @@ class Categories extends DolibarrApi
throw new RestException(401);
}
- if($type == Categorie::TYPE_PRODUCT && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
+ if ($type == Categorie::TYPE_PRODUCT && !(DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
throw new RestException(401);
- } elseif ($type == Categorie::TYPE_CONTACT && ! DolibarrApiAccess::$user->rights->contact->lire) {
+ } elseif ($type == Categorie::TYPE_CONTACT && !DolibarrApiAccess::$user->rights->contact->lire) {
throw new RestException(401);
- } elseif ($type == Categorie::TYPE_CUSTOMER && ! DolibarrApiAccess::$user->rights->societe->lire) {
+ } elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->rights->societe->lire) {
throw new RestException(401);
- } elseif ($type == Categorie::TYPE_SUPPLIER && ! DolibarrApiAccess::$user->rights->fournisseur->lire) {
+ } elseif ($type == Categorie::TYPE_SUPPLIER && !DolibarrApiAccess::$user->rights->fournisseur->lire) {
throw new RestException(401);
- } elseif ($type == Categorie::TYPE_MEMBER && ! DolibarrApiAccess::$user->rights->adherent->lire) {
+ } elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
throw new RestException(401);
}
$categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
- if( ! is_array($categories)) {
+ if (!is_array($categories)) {
if ($categories == 0) {
throw new RestException(404, 'No category found for this object');
}
@@ -352,37 +352,37 @@ class Categories extends DolibarrApi
throw new RestException(401);
}
- if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
if ($type === Categorie::TYPE_PRODUCT) {
- if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+ if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
throw new RestException(401);
}
$object = new Product($this->db);
} elseif ($type === Categorie::TYPE_CUSTOMER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_SUPPLIER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_CONTACT) {
- if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
throw new RestException(401);
}
$object = new Contact($this->db);
} elseif ($type === Categorie::TYPE_MEMBER) {
- if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+ if (!DolibarrApiAccess::$user->rights->adherent->creer) {
throw new RestException(401);
}
$object = new Adherent($this->db);
@@ -393,7 +393,7 @@ class Categories extends DolibarrApi
if (!empty($object)) {
$result = $object->fetch($object_id);
if ($result > 0) {
- $result=$this->category->add_type($object, $type);
+ $result = $this->category->add_type($object, $type);
if ($result < 0) {
if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
@@ -432,37 +432,37 @@ class Categories extends DolibarrApi
throw new RestException(401);
}
- if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
if ($type === Categorie::TYPE_PRODUCT) {
- if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+ if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
throw new RestException(401);
}
$object = new Product($this->db);
} elseif ($type === Categorie::TYPE_CUSTOMER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_SUPPLIER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_CONTACT) {
- if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
throw new RestException(401);
}
$object = new Contact($this->db);
} elseif ($type === Categorie::TYPE_MEMBER) {
- if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+ if (!DolibarrApiAccess::$user->rights->adherent->creer) {
throw new RestException(401);
}
$object = new Adherent($this->db);
@@ -473,7 +473,7 @@ class Categories extends DolibarrApi
if (!empty($object)) {
$result = $object->fetch('', $object_ref);
if ($result > 0) {
- $result=$this->category->add_type($object, $type);
+ $result = $this->category->add_type($object, $type);
if ($result < 0) {
if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
@@ -512,37 +512,37 @@ class Categories extends DolibarrApi
throw new RestException(401);
}
- if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
if ($type === Categorie::TYPE_PRODUCT) {
- if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+ if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
throw new RestException(401);
}
$object = new Product($this->db);
} elseif ($type === Categorie::TYPE_CUSTOMER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_SUPPLIER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_CONTACT) {
- if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
throw new RestException(401);
}
$object = new Contact($this->db);
} elseif ($type === Categorie::TYPE_MEMBER) {
- if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+ if (!DolibarrApiAccess::$user->rights->adherent->creer) {
throw new RestException(401);
}
$object = new Adherent($this->db);
@@ -553,7 +553,7 @@ class Categories extends DolibarrApi
if (!empty($object)) {
$result = $object->fetch((int) $object_id);
if ($result > 0) {
- $result=$this->category->del_type($object, $type);
+ $result = $this->category->del_type($object, $type);
if ($result < 0) {
throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
}
@@ -590,37 +590,37 @@ class Categories extends DolibarrApi
throw new RestException(401);
}
- if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$result = $this->category->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
if ($type === Categorie::TYPE_PRODUCT) {
- if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+ if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
throw new RestException(401);
}
$object = new Product($this->db);
} elseif ($type === Categorie::TYPE_CUSTOMER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_SUPPLIER) {
- if(! DolibarrApiAccess::$user->rights->societe->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->creer) {
throw new RestException(401);
}
$object = new Societe($this->db);
} elseif ($type === Categorie::TYPE_CONTACT) {
- if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+ if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
throw new RestException(401);
}
$object = new Contact($this->db);
} elseif ($type === Categorie::TYPE_MEMBER) {
- if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+ if (!DolibarrApiAccess::$user->rights->adherent->creer) {
throw new RestException(401);
}
$object = new Adherent($this->db);
@@ -631,7 +631,7 @@ class Categories extends DolibarrApi
if (!empty($object)) {
$result = $object->fetch('', (string) $object_ref);
if ($result > 0) {
- $result=$this->category->del_type($object, $type);
+ $result = $this->category->del_type($object, $type);
if ($result < 0) {
throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
}
@@ -741,7 +741,7 @@ class Categories extends DolibarrApi
{
dol_syslog("getObjects($id, $type, $onlyids)", LOG_DEBUG);
- if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
@@ -751,11 +751,11 @@ class Categories extends DolibarrApi
}
$result = $this->category->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'category not found');
}
- if (! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 525ee23c8bf..c9937d4eca9 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -789,18 +789,19 @@ class Categorie extends CommonObject
$objs = array();
- $obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
+ $tmpclass = $this->MAP_OBJ_CLASS[$type];
+ $obj = new $tmpclass($this->db);
- $sql = "SELECT c.fk_" . $this->MAP_CAT_FK[$type];
- $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as c";
- $sql .= ", " . MAIN_DB_PREFIX . $this->MAP_OBJ_TABLE[$type] . " as o";
- $sql .= " WHERE o.entity IN (" . getEntity($obj->element).")";
+ $sql = "SELECT c.fk_".$this->MAP_CAT_FK[$type];
+ $sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as c";
+ $sql .= ", ".MAIN_DB_PREFIX.$this->MAP_OBJ_TABLE[$type]." as o";
+ $sql .= " WHERE o.entity IN (".getEntity($obj->element).")";
$sql .= " AND c.fk_categorie = ".$this->id;
- $sql .= " AND c.fk_" . $this->MAP_CAT_FK[$type] . " = o.rowid";
+ $sql .= " AND c.fk_".$this->MAP_CAT_FK[$type]." = o.rowid";
// Protection for external users
if (($type == 'customer' || $type == 'supplier') && $user->socid > 0)
{
- $sql.= " AND o.rowid = ".$user->socid;
+ $sql .= " AND o.rowid = ".$user->socid;
}
if ($limit > 0 || $offset > 0) $sql .= $this->db->plimit($limit + 1, $offset);
$sql .= $this->db->order($sortfield, $sortorder);
@@ -937,7 +938,7 @@ class Categorie extends CommonObject
$categories[$i]['description'] = $category_static->description;
$categories[$i]['color'] = $category_static->color;
$categories[$i]['socid'] = $category_static->socid;
- $categories[$i]['ref_ext'] = $category_static->ref_ext;
+ $categories[$i]['ref_ext'] = $category_static->ref_ext;
$categories[$i]['visible'] = $category_static->visible;
$categories[$i]['type'] = $category_static->type;
$categories[$i]['entity'] = $category_static->entity;
@@ -1577,7 +1578,7 @@ class Categorie extends CommonObject
$sql .= " AND rowid = '".$id."'";
}
- $res = $this->db->query($sql);
+ $res = $this->db->query($sql);
if ($res)
{
while ($rec = $this->db->fetch_array($res))
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index a45ca818dbc..9c653decdff 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -180,7 +180,7 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fdf06497355..afd71d59932 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1132,7 +1132,7 @@ if ($action == 'create')
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
@@ -1549,7 +1549,7 @@ if ($id > 0)
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a2d8c0a373b..8deb8100c72 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1242,7 +1242,7 @@ else
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f949e118599..803d699077f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1771,7 +1771,7 @@ if ($action == 'create' && $usercancreate)
}
};
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
// Template to use by default
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 07d18855c86..21bcbf5bf26 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -443,7 +443,7 @@ if ($action == 'create')
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
@@ -945,7 +945,7 @@ else
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print '';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c80a0cd0ab8..ab93b2f0f97 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -344,8 +344,6 @@ if ($action == 'create')
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- print '';
-
// Category
if (is_array($options) && count($options) && $conf->categorie->enabled)
{
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 48cd8e81054..b6997922e2a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3282,11 +3282,11 @@ if ($action == 'create')
}
// Other attributes
- $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="2"', 'cols'=>2);
+ $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="2"', 'cols' => '2');
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
// Template to use by default
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1e2050c5a47..c693aa89b4c 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -42,12 +42,12 @@ class BonPrelevement extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='widthdraw';
+ public $element = 'widthdraw';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='prelevement_bons';
+ public $table_element = 'prelevement_bons';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -68,11 +68,11 @@ class BonPrelevement extends CommonObject
public $total;
public $fetched;
- public $statut; // 0-Wait, 1-Trans, 2-Done
- public $labelStatus=array();
+ public $statut; // 0-Wait, 1-Trans, 2-Done
+ public $labelStatus = array();
- public $invoice_in_error=array();
- public $thirdparty_in_error=array();
+ public $invoice_in_error = array();
+ public $thirdparty_in_error = array();
const STATUS_DRAFT = 0;
const STATUS_TRANSFERED = 1;
@@ -87,12 +87,12 @@ class BonPrelevement extends CommonObject
*/
public function __construct($db, $filename = '')
{
- global $conf,$langs;
+ global $conf, $langs;
$error = 0;
$this->db = $db;
- $this->filename=$filename;
+ $this->filename = $filename;
$this->date_echeance = time();
$this->raison_sociale = "";
@@ -143,12 +143,12 @@ class BonPrelevement extends CommonObject
if ($line_id > 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture (";
- $sql.= "fk_facture";
- $sql.= ",fk_prelevement_lignes";
- $sql.= ") VALUES (";
- $sql.= $facture_id;
- $sql.= ", ".$line_id;
- $sql.= ")";
+ $sql .= "fk_facture";
+ $sql .= ",fk_prelevement_lignes";
+ $sql .= ") VALUES (";
+ $sql .= $facture_id;
+ $sql .= ", ".$line_id;
+ $sql .= ")";
if ($this->db->query($sql))
{
@@ -199,14 +199,14 @@ class BonPrelevement extends CommonObject
* We aggregate the lines
*/
$sql = "SELECT rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes";
- $sql.= " WHERE fk_prelevement_bons = ".$this->id;
- $sql.= " AND fk_soc =".$client_id;
- $sql.= " AND code_banque ='".$code_banque."'";
- $sql.= " AND code_guichet ='".$code_guichet."'";
- $sql.= " AND number ='".$number."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes";
+ $sql .= " WHERE fk_prelevement_bons = ".$this->id;
+ $sql .= " AND fk_soc =".$client_id;
+ $sql .= " AND code_banque ='".$code_banque."'";
+ $sql .= " AND code_guichet ='".$code_guichet."'";
+ $sql .= " AND number ='".$number."'";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -222,24 +222,24 @@ class BonPrelevement extends CommonObject
* No aggregate
*/
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_lignes (";
- $sql.= "fk_prelevement_bons";
- $sql.= ", fk_soc";
- $sql.= ", client_nom";
- $sql.= ", amount";
- $sql.= ", code_banque";
- $sql.= ", code_guichet";
- $sql.= ", number";
- $sql.= ", cle_rib";
- $sql.= ") VALUES (";
- $sql.= $this->id;
- $sql.= ", ".$client_id;
- $sql.= ", '".$this->db->escape($client_nom)."'";
- $sql.= ", '".price2num($amount)."'";
- $sql.= ", '".$code_banque."'";
- $sql.= ", '".$code_guichet."'";
- $sql.= ", '".$number."'";
- $sql.= ", '".$number_key."'";
- $sql.= ")";
+ $sql .= "fk_prelevement_bons";
+ $sql .= ", fk_soc";
+ $sql .= ", client_nom";
+ $sql .= ", amount";
+ $sql .= ", code_banque";
+ $sql .= ", code_guichet";
+ $sql .= ", number";
+ $sql .= ", cle_rib";
+ $sql .= ") VALUES (";
+ $sql .= $this->id;
+ $sql .= ", ".$client_id;
+ $sql .= ", '".$this->db->escape($client_nom)."'";
+ $sql .= ", '".price2num($amount)."'";
+ $sql .= ", '".$code_banque."'";
+ $sql .= ", '".$code_guichet."'";
+ $sql .= ", '".$number."'";
+ $sql .= ", '".$number_key."'";
+ $sql .= ")";
if ($this->db->query($sql))
{
@@ -285,19 +285,19 @@ class BonPrelevement extends CommonObject
global $conf;
$sql = "SELECT p.rowid, p.ref, p.amount, p.note";
- $sql.= ", p.datec as dc";
- $sql.= ", p.date_trans as date_trans";
- $sql.= ", p.method_trans, p.fk_user_trans";
- $sql.= ", p.date_credit as date_credit";
- $sql.= ", p.fk_user_credit";
- $sql.= ", p.statut";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
- $sql.= " WHERE p.entity IN (".getEntity('invoice').")";
- if ($rowid > 0) $sql.= " AND p.rowid = ".$rowid;
- else $sql.= " AND p.ref = '".$this->db->escape($ref)."'";
+ $sql .= ", p.datec as dc";
+ $sql .= ", p.date_trans as date_trans";
+ $sql .= ", p.method_trans, p.fk_user_trans";
+ $sql .= ", p.date_credit as date_credit";
+ $sql .= ", p.fk_user_credit";
+ $sql .= ", p.statut";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+ $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+ if ($rowid > 0) $sql .= " AND p.rowid = ".$rowid;
+ else $sql .= " AND p.ref = '".$this->db->escape($ref)."'";
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $result=$this->db->query($sql);
+ $result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
@@ -344,30 +344,30 @@ class BonPrelevement extends CommonObject
public function set_credite()
{
// phpcs:enable
- global $user,$conf;
+ global $user, $conf;
$error = 0;
if ($this->db->begin())
{
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
- $sql.= " SET statut = 1";
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql .= " SET statut = 1";
+ $sql .= " WHERE rowid = ".$this->id;
+ $sql .= " AND entity = ".$conf->entity;
- $result=$this->db->query($sql);
- if (! $result)
+ $result = $this->db->query($sql);
+ if (!$result)
{
dol_syslog(get_class($this)."::set_credite Erreur 1");
$error++;
}
- if (! $error)
+ if (!$error)
{
$facs = array();
$facs = $this->getListInvoices();
- $num=count($facs);
+ $num = count($facs);
for ($i = 0; $i < $num; $i++)
{
/* Tag invoice as payed */
@@ -378,13 +378,13 @@ class BonPrelevement extends CommonObject
}
}
- if (! $error)
+ if (!$error)
{
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
- $sql.= " SET statut = 2";
- $sql.= " WHERE fk_prelevement_bons = ".$this->id;
+ $sql .= " SET statut = 2";
+ $sql .= " WHERE fk_prelevement_bons = ".$this->id;
- if (! $this->db->query($sql))
+ if (!$this->db->query($sql))
{
dol_syslog(get_class($this)."::set_credite Erreur 1");
$error++;
@@ -394,7 +394,7 @@ class BonPrelevement extends CommonObject
/*
* End of procedure
*/
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 0;
@@ -425,7 +425,7 @@ class BonPrelevement extends CommonObject
public function set_infocredit($user, $date)
{
// phpcs:enable
- global $conf,$langs;
+ global $conf, $langs;
$error = 0;
@@ -436,12 +436,12 @@ class BonPrelevement extends CommonObject
if ($this->db->begin())
{
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
- $sql.= " SET fk_user_credit = ".$user->id;
- $sql.= ", statut = 2";
- $sql.= ", date_credit = '".$this->db->idate($date)."'";
- $sql.= " WHERE rowid=".$this->id;
- $sql.= " AND entity = ".$conf->entity;
- $sql.= " AND statut = 1";
+ $sql .= " SET fk_user_credit = ".$user->id;
+ $sql .= ", statut = 2";
+ $sql .= ", date_credit = '".$this->db->idate($date)."'";
+ $sql .= " WHERE rowid=".$this->id;
+ $sql .= " AND entity = ".$conf->entity;
+ $sql .= " AND statut = 1";
if ($this->db->query($sql))
{
@@ -458,7 +458,7 @@ class BonPrelevement extends CommonObject
$facs = $this->getListInvoices(1);
// Loop on each invoice. $facs=array(0=>id, 1=>amount requested)
- $num=count($facs);
+ $num = count($facs);
for ($i = 0; $i < $num; $i++)
{
$fac = new Facture($this->db);
@@ -466,7 +466,7 @@ class BonPrelevement extends CommonObject
$amounts[$fac->id] = $facs[$i][1];
$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
- $totalpaye = $fac->getSommePaiement();
+ $totalpaye = $fac->getSommePaiement();
$totalcreditnotes = $fac->getSumCreditNotesUsed();
$totaldeposits = $fac->getSumDepositsUsed();
$alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
@@ -481,9 +481,9 @@ class BonPrelevement extends CommonObject
{
$paiement = new Paiement($this->db);
$paiement->datepaye = $date;
- $paiement->amounts = $cursoramounts; // Array with detail of dispatching of payments for each invoice
- $paiement->paiementid = 3; //
- $paiement->num_paiement = $this->ref; // Set ref of direct debit note
+ $paiement->amounts = $cursoramounts; // Array with detail of dispatching of payments for each invoice
+ $paiement->paiementid = 3; //
+ $paiement->num_paiement = $this->ref; // Set ref of direct debit note
$paiement->id_prelevement = $this->id;
$paiement_id = $paiement->create($user);
@@ -494,7 +494,7 @@ class BonPrelevement extends CommonObject
}
else
{
- $result=$paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
+ $result = $paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
if ($result < 0)
{
dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error");
@@ -509,10 +509,10 @@ class BonPrelevement extends CommonObject
// Update withdrawal line
// TODO: Translate to ligneprelevement.class.php
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
- $sql.= " SET statut = 2";
- $sql.= " WHERE fk_prelevement_bons = ".$this->id;
+ $sql .= " SET statut = 2";
+ $sql .= " WHERE fk_prelevement_bons = ".$this->id;
- if (! $this->db->query($sql))
+ if (!$this->db->query($sql))
{
dol_syslog(get_class($this)."::set_infocredit Update lines Error");
$error++;
@@ -572,7 +572,7 @@ class BonPrelevement extends CommonObject
public function set_infotrans($user, $date, $method)
{
// phpcs:enable
- global $conf,$langs;
+ global $conf, $langs;
$error = 0;
@@ -580,13 +580,13 @@ class BonPrelevement extends CommonObject
if ($this->db->begin())
{
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
- $sql.= " SET fk_user_trans = ".$user->id;
- $sql.= " , date_trans = '".$this->db->idate($date)."'";
- $sql.= " , method_trans = ".$method;
- $sql.= " , statut = 1";
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
- $sql.= " AND statut = 0";
+ $sql .= " SET fk_user_trans = ".$user->id;
+ $sql .= " , date_trans = '".$this->db->idate($date)."'";
+ $sql .= " , method_trans = ".$method;
+ $sql .= " , statut = 1";
+ $sql .= " WHERE rowid = ".$this->id;
+ $sql .= " AND entity = ".$conf->entity;
+ $sql .= " AND statut = 0";
if ($this->db->query($sql))
{
@@ -594,7 +594,7 @@ class BonPrelevement extends CommonObject
$langs->load('withdrawals');
$subject = $langs->trans("InfoTransSubject", $this->ref);
$message = $langs->trans("InfoTransMessage", $this->ref, dolGetFirstLastname($user->firstname, $user->lastname));
- $message .=$langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
+ $message .= $langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
// TODO Call trigger to create a notification using notification module
}
@@ -644,16 +644,16 @@ class BonPrelevement extends CommonObject
*/
$sql = "SELECT fk_facture";
if ($amounts) $sql .= ", SUM(pl.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
- $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
- $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pf.fk_prelevement_lignes = pl.rowid";
- $sql.= " AND pl.fk_prelevement_bons = p.rowid";
- $sql.= " AND p.rowid = ".$this->id;
- $sql.= " AND p.entity = ".$conf->entity;
- if ($amounts) $sql.= " GROUP BY fk_facture";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+ $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+ $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
+ $sql .= " AND pl.fk_prelevement_bons = p.rowid";
+ $sql .= " AND p.rowid = ".$this->id;
+ $sql .= " AND p.entity = ".$conf->entity;
+ if ($amounts) $sql .= " GROUP BY fk_facture";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -697,18 +697,18 @@ class BonPrelevement extends CommonObject
global $conf;
$sql = "SELECT sum(pfd.amount) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
//$sql.= " ,".MAIN_DB_PREFIX."c_paiement as cp";
- $sql.= " WHERE f.fk_statut = 1";
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- $sql.= " AND f.rowid = pfd.fk_facture";
- $sql.= " AND f.paye = 0";
- $sql.= " AND pfd.traite = 0";
- $sql.= " AND f.total_ttc > 0";
+ $sql .= " WHERE f.fk_statut = 1";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ $sql .= " AND f.rowid = pfd.fk_facture";
+ $sql .= " AND f.paye = 0";
+ $sql .= " AND pfd.traite = 0";
+ $sql .= " AND f.total_ttc > 0";
$resql = $this->db->query($sql);
- if ( $resql )
+ if ($resql)
{
$obj = $this->db->fetch_object($resql);
@@ -739,21 +739,21 @@ class BonPrelevement extends CommonObject
global $conf;
$sql = "SELECT count(f.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " WHERE f.entity IN (".getEntity('invoice').")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " WHERE f.entity IN (".getEntity('invoice').")";
if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
{
- $sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+ $sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
}
- $sql.= " AND f.rowid = pfd.fk_facture";
- $sql.= " AND pfd.traite = 0";
- $sql.= " AND f.total_ttc > 0";
+ $sql .= " AND f.rowid = pfd.fk_facture";
+ $sql .= " AND pfd.traite = 0";
+ $sql .= " AND f.total_ttc > 0";
dol_syslog(get_class($this)."::NbFactureAPrelever");
$resql = $this->db->query($sql);
- if ( $resql )
+ if ($resql)
{
$obj = $this->db->fetch_object($resql);
@@ -763,7 +763,7 @@ class BonPrelevement extends CommonObject
}
else
{
- $this->error=get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
+ $this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
return -1;
}
}
@@ -798,7 +798,7 @@ class BonPrelevement extends CommonObject
$datetimeprev = time();
//Choice the date of the execution direct debit
- if(!empty($executiondate)) $datetimeprev = $executiondate;
+ if (!empty($executiondate)) $datetimeprev = $executiondate;
$month = strftime("%m", $datetimeprev);
$year = strftime("%Y", $datetimeprev);
@@ -810,26 +810,26 @@ class BonPrelevement extends CommonObject
$factures = array();
$factures_prev = array();
$factures_result = array();
- $factures_prev_id=array();
- $factures_errors=array();
+ $factures_prev_id = array();
+ $factures_errors = array();
- if (! $error)
+ if (!$error)
{
$sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
- $sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
- $sql.= ", pfd.amount";
- $sql.= ", s.nom as name";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= ", ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " WHERE f.rowid = pfd.fk_facture";
- $sql.= " AND f.entity IN (".getEntity('invoice').')';
- $sql.= " AND s.rowid = f.fk_soc";
+ $sql .= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
+ $sql .= ", pfd.amount";
+ $sql .= ", s.nom as name";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " WHERE f.rowid = pfd.fk_facture";
+ $sql .= " AND f.entity IN (".getEntity('invoice').')';
+ $sql .= " AND s.rowid = f.fk_soc";
//if ($banque || $agence) $sql.= " AND s.rowid = sr.fk_soc";
- $sql.= " AND f.fk_statut = 1";
- $sql.= " AND f.paye = 0";
- $sql.= " AND pfd.traite = 0";
- $sql.= " AND f.total_ttc > 0";
+ $sql .= " AND f.fk_statut = 1";
+ $sql .= " AND f.paye = 0";
+ $sql .= " AND pfd.traite = 0";
+ $sql .= " AND f.total_ttc > 0";
//if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
//if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
@@ -844,7 +844,7 @@ class BonPrelevement extends CommonObject
while ($i < $num)
{
$row = $this->db->fetch_row($resql);
- $factures[$i] = $row; // All fields
+ $factures[$i] = $row; // All fields
$i++;
}
$this->db->free($resql);
@@ -857,9 +857,9 @@ class BonPrelevement extends CommonObject
}
}
- if (! $error)
+ if (!$error)
{
- require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
$soc = new Societe($this->db);
// Check RIB
@@ -899,8 +899,8 @@ class BonPrelevement extends CommonObject
else
{
dol_syslog(__METHOD__."::Check RIB Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_WARNING);
- $this->invoice_in_error[$fac[0]]="Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
- $this->thirdparty_in_error[$soc->id]="Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
+ $this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
+ $this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
}
}
else
@@ -920,10 +920,10 @@ class BonPrelevement extends CommonObject
}
}
- $ok=0;
+ $ok = 0;
// Withdraw invoices in factures_prev array
- $out=count($factures_prev)." invoices will be withdrawn.";
+ $out = count($factures_prev)." invoices will be withdrawn.";
//print $out."\n";
dol_syslog($out);
@@ -938,9 +938,9 @@ class BonPrelevement extends CommonObject
if (count($factures_prev) > 0)
{
- if ($mode=='real')
+ if ($mode == 'real')
{
- $ok=1;
+ $ok = 1;
}
else
{
@@ -957,7 +957,7 @@ class BonPrelevement extends CommonObject
*/
$this->db->begin();
- $now=dol_now();
+ $now = dol_now();
/*
* Traitements
@@ -967,10 +967,10 @@ class BonPrelevement extends CommonObject
$ref = substr($year, -2).$month;
$sql = "SELECT substring(ref from char_length(ref) - 1)";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
- $sql.= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
- $sql.= " AND entity = ".$conf->entity;
- $sql.= " ORDER BY ref DESC LIMIT 1";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
+ $sql .= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
+ $sql .= " AND entity = ".$conf->entity;
+ $sql .= " ORDER BY ref DESC LIMIT 1";
dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -978,21 +978,21 @@ class BonPrelevement extends CommonObject
if ($resql)
{
$row = $this->db->fetch_row($resql);
- $ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1, 0, 2), 2, "0", STR_PAD_LEFT);
+ $ref = "T".$ref.str_pad(dol_substr("00".intval($row[0]) + 1, 0, 2), 2, "0", STR_PAD_LEFT);
- $dir=$conf->prelevement->dir_output.'/receipts';
- if (! is_dir($dir)) dol_mkdir($dir);
+ $dir = $conf->prelevement->dir_output.'/receipts';
+ if (!is_dir($dir)) dol_mkdir($dir);
$this->filename = $dir.'/'.$ref.'.xml';
// Create withdraw receipt in database
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
- $sql.= " ref, entity, datec";
- $sql.= ") VALUES (";
- $sql.= "'".$this->db->escape($ref)."'";
- $sql.= ", ".$conf->entity;
- $sql.= ", '".$this->db->idate($now)."'";
- $sql.= ")";
+ $sql .= " ref, entity, datec";
+ $sql .= ") VALUES (";
+ $sql .= "'".$this->db->escape($ref)."'";
+ $sql .= ", ".$conf->entity;
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ")";
$resql = $this->db->query($sql);
if ($resql)
@@ -1046,15 +1046,15 @@ class BonPrelevement extends CommonObject
// Update invoice requests as done
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
- $sql.= " SET traite = 1";
- $sql.= ", date_traite = '".$this->db->idate($now)."'";
- $sql.= ", fk_prelevement_bons = ".$this->id;
- $sql.= " WHERE rowid = ".$fac[1];
+ $sql .= " SET traite = 1";
+ $sql .= ", date_traite = '".$this->db->idate($now)."'";
+ $sql .= ", fk_prelevement_bons = ".$this->id;
+ $sql .= " WHERE rowid = ".$fac[1];
dol_syslog(__METHOD__."::Update Orders::Sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
$error++;
dol_syslog(__METHOD__."::Update Orders::Error=".$this->db->error(), LOG_ERR);
@@ -1077,18 +1077,18 @@ class BonPrelevement extends CommonObject
$this->date_echeance = $datetimeprev;
$this->reference_remise = $ref;
- $id=$conf->global->PRELEVEMENT_ID_BANKACCOUNT;
+ $id = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
$account = new Account($this->db);
- if ($account->fetch($id)>0)
+ if ($account->fetch($id) > 0)
{
- $this->emetteur_code_banque = $account->code_banque;
+ $this->emetteur_code_banque = $account->code_banque;
$this->emetteur_code_guichet = $account->code_guichet;
$this->emetteur_numero_compte = $account->number;
- $this->emetteur_number_key = $account->cle_rib;
+ $this->emetteur_number_key = $account->cle_rib;
$this->emetteur_iban = $account->iban;
$this->emetteur_bic = $account->bic;
- $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+ $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
$this->raison_sociale = $account->proprio;
}
@@ -1107,21 +1107,21 @@ class BonPrelevement extends CommonObject
* Update total
*/
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
- $sql.= " SET amount = ".price2num($this->total);
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql .= " SET amount = ".price2num($this->total);
+ $sql .= " WHERE rowid = ".$this->id;
+ $sql .= " AND entity = ".$conf->entity;
- $resql=$this->db->query($sql);
- if (! $resql)
+ $resql = $this->db->query($sql);
+ if (!$resql)
{
$error++;
dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('DIRECT_DEBIT_ORDER_CREATE', $user);
+ $result = $this->call_trigger('DIRECT_DEBIT_ORDER_CREATE', $user);
if ($result < 0) $error++;
// End call triggers
}
@@ -1158,43 +1158,43 @@ class BonPrelevement extends CommonObject
$error = 0;
$resql1 = $resql2 = $resql3 = $resql4 = 0;
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('DIRECT_DEBIT_ORDER_DELETE', $user);
+ $result = $this->call_trigger('DIRECT_DEBIT_ORDER_DELETE', $user);
if ($result < 0) $error++;
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
- $resql1=$this->db->query($sql);
- if (! $resql1) dol_print_error($this->db);
+ $resql1 = $this->db->query($sql);
+ if (!$resql1) dol_print_error($this->db);
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
- $resql2=$this->db->query($sql);
- if (! $resql2) dol_print_error($this->db);
+ $resql2 = $this->db->query($sql);
+ if (!$resql2) dol_print_error($this->db);
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
- $resql3=$this->db->query($sql);
- if (! $resql3) dol_print_error($this->db);
+ $resql3 = $this->db->query($sql);
+ if (!$resql3) dol_print_error($this->db);
}
- if (! $error)
+ if (!$error)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
- $resql4=$this->db->query($sql);
- if (! $resql4) dol_print_error($this->db);
+ $resql4 = $this->db->query($sql);
+ if (!$resql4) dol_print_error($this->db);
}
- if ($resql1 && $resql2 && $resql3 && $resql4 && ! $error)
+ if ($resql1 && $resql2 && $resql3 && $resql4 && !$error)
{
$this->db->commit();
return 1;
@@ -1221,34 +1221,34 @@ class BonPrelevement extends CommonObject
{
global $conf, $langs, $hookmanager;
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
- $result='';
+ $result = '';
- $label = '' . $langs->trans("ShowWithdraw") . '';
- $label.= '
';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label = ''.$langs->trans("ShowWithdraw").'';
+ $label .= '
';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
if ($option != 'nolink')
{
// Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
}
- $linkclose='';
+ $linkclose = '';
if (empty($notooltip))
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowMyObject");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowMyObject");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
- $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
/*
$hookmanager->initHooks(array('myobjectdao'));
@@ -1257,22 +1257,22 @@ class BonPrelevement extends CommonObject
if ($reshook > 0) $linkclose = $hookmanager->resPrint;
*/
}
- else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+ else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
$linkstart = '';
- $linkend='';
+ $linkstart .= $linkclose.'>';
+ $linkend = '';
$result .= $linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.= $this->ref;
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= $this->ref;
$result .= $linkend;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
- global $action,$hookmanager;
+ global $action, $hookmanager;
$hookmanager->initHooks(array('myobjectdao'));
- $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
- $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $result = $hookmanager->resPrint;
else $result .= $hookmanager->resPrint;
@@ -1293,7 +1293,7 @@ class BonPrelevement extends CommonObject
$result = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
- $sql.= " WHERE rowid = '".$rowid."'";
+ $sql .= " WHERE rowid = '".$rowid."'";
if ($this->db->query($sql))
{
@@ -1347,7 +1347,7 @@ class BonPrelevement extends CommonObject
if ($this->DeleteNotification($user, $action) == 0)
{
- $now=dol_now();
+ $now = dol_now();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
$sql .= " VALUES (".$db->idate($now).",".$user.", 'NULL', 'NULL', '".$action."')";
@@ -1381,7 +1381,7 @@ class BonPrelevement extends CommonObject
*/
public function generate($format = 'ALL', $executiondate = '')
{
- global $conf,$langs,$mysoc;
+ global $conf, $langs, $mysoc;
//TODO: Optimize code to read lines in a single function
@@ -1392,11 +1392,11 @@ class BonPrelevement extends CommonObject
$this->file = fopen($this->filename, "w");
if (empty($this->file))
{
- $this->error=$langs->trans('ErrorFailedToOpenFile', $this->filename);
+ $this->error = $langs->trans('ErrorFailedToOpenFile', $this->filename);
return -1;
}
- $found=0;
+ $found = 0;
// Build file for European countries
if ($mysoc->isInEEC())
@@ -1414,9 +1414,9 @@ class BonPrelevement extends CommonObject
$dateTime_ECMA = dol_print_date($now, '%Y-%m-%dT%H:%M:%S');
$date_actu = $now;
- if (!empty($executiondate)) $date_actu=$executiondate;
+ if (!empty($executiondate)) $date_actu = $executiondate;
- $dateTime_YMD = dol_print_date($date_actu, '%Y%m%d');
+ $dateTime_YMD = dol_print_date($date_actu, '%Y%m%d');
$dateTime_YMDHMS = dol_print_date($date_actu, '%Y%m%d%H%M%S');
$fileDebiteurSection = '';
$fileEmetteurSection = '';
@@ -1428,27 +1428,27 @@ class BonPrelevement extends CommonObject
*/
$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
- $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
- $sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf,";
- $sql.= " ".MAIN_DB_PREFIX."societe as soc,";
- $sql.= " ".MAIN_DB_PREFIX."c_country as c,";
- $sql.= " ".MAIN_DB_PREFIX."societe_rib as rib";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
- $sql.= " AND soc.fk_pays = c.rowid";
- $sql.= " AND soc.rowid = f.fk_soc";
- $sql.= " AND rib.fk_soc = f.fk_soc";
- $sql.= " AND rib.default_rib = 1";
- $sql.= " AND rib.type = 'ban'";
+ $sql .= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+ $sql .= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
+ $sql .= " FROM";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql .= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_facture as pf,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as soc,";
+ $sql .= " ".MAIN_DB_PREFIX."c_country as c,";
+ $sql .= " ".MAIN_DB_PREFIX."societe_rib as rib";
+ $sql .= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql .= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql .= " AND pf.fk_facture = f.rowid";
+ $sql .= " AND soc.fk_pays = c.rowid";
+ $sql .= " AND soc.rowid = f.fk_soc";
+ $sql .= " AND rib.fk_soc = f.fk_soc";
+ $sql .= " AND rib.default_rib = 1";
+ $sql .= " AND rib.type = 'ban'";
//print $sql;
// Define $fileDebiteurSection. One section DrctDbtTxInf per invoice.
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -1464,7 +1464,7 @@ class BonPrelevement extends CommonObject
}
else
{
- fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
+ fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
$result = -2;
}
@@ -1475,7 +1475,7 @@ class BonPrelevement extends CommonObject
}
else
{
- fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
+ fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
}
/**
@@ -1504,10 +1504,10 @@ class BonPrelevement extends CommonObject
fputs($this->file, ' '.$CrLf);
// SEPA File Emetteur
if ($result != -2)
- { fputs($this-> file, $fileEmetteurSection);}
+ { fputs($this-> file, $fileEmetteurSection); }
// SEPA File Debiteurs
if ($result != -2)
- { fputs($this-> file, $fileDebiteurSection);}
+ { fputs($this-> file, $fileDebiteurSection); }
// SEPA FILE FOOTER
fputs($this->file, ' '.$CrLf);
fputs($this->file, ' '.$CrLf);
@@ -1515,21 +1515,21 @@ class BonPrelevement extends CommonObject
}
// Build file for Other Countries with unknow format
- if (! $found)
+ if (!$found)
{
$this->total = 0;
$sql = "SELECT pl.amount";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
+ $sql .= " FROM";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql .= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql .= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql .= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql .= " AND pf.fk_facture = f.rowid";
//Lines
$i = 0;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -1553,7 +1553,7 @@ class BonPrelevement extends CommonObject
}
fclose($this->file);
- if (! empty($conf->global->MAIN_UMASK))
+ if (!empty($conf->global->MAIN_UMASK))
@chmod($this->file, octdec($conf->global->MAIN_UMASK));
return $result;
}
@@ -1643,7 +1643,7 @@ class BonPrelevement extends CommonObject
public static function buildRumNumber($row_code_client, $row_datec, $row_drum)
{
global $langs;
- $pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
+ $pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
return $pre.'-'.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
}
@@ -1687,46 +1687,46 @@ class BonPrelevement extends CommonObject
// Define date of RUM signature
$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
- $XML_DEBITOR ='';
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
+ $XML_DEBITOR = '';
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
// $XML_DEBITOR .=' '.('AS-'.dol_trunc($row_ref,20).'-'.$Rowing).''.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
- $XML_DEBITOR .=' '.(($conf->global->PRELEVEMENT_END_TO_END != "" ) ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).''.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.round($row_somme, 2).''.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$Rum.''.$CrLf;
- $XML_DEBITOR .=' '.$DtOfSgntr.''.$CrLf;
- $XML_DEBITOR .=' false'.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$row_bic.''.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).''.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$row_country_code.''.$CrLf;
+ $XML_DEBITOR .= ' '.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).''.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.round($row_somme, 2).''.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$Rum.''.$CrLf;
+ $XML_DEBITOR .= ' '.$DtOfSgntr.''.$CrLf;
+ $XML_DEBITOR .= ' false'.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$row_bic.''.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).''.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$row_country_code.''.$CrLf;
$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
- $addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town)?' ':''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
- if (trim($addressline1)) $XML_DEBITOR .=' '.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).''.$CrLf;
- if (trim($addressline2)) $XML_DEBITOR .=' '.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).''.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.preg_replace('/\s/', '', $row_iban).''.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
+ $addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
+ if (trim($addressline1)) $XML_DEBITOR .= ' '.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).''.$CrLf;
+ if (trim($addressline2)) $XML_DEBITOR .= ' '.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).''.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.preg_replace('/\s/', '', $row_iban).''.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
// $XML_DEBITOR .=' '.($row_ref.'/'.$Rowing.'/'.$Rum).''.$CrLf;
// $XML_DEBITOR .=' '.dol_trunc($row_ref, 135).''.$CrLf; // 140 max
- $XML_DEBITOR .=' '.(($conf->global->PRELEVEMENT_USTRD != "" ) ? $conf->global->PRELEVEMENT_USTRD : dol_trunc($row_ref, 135) ).''.$CrLf; // 140 max
- $XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.$CrLf;
+ $XML_DEBITOR .= ' '.(($conf->global->PRELEVEMENT_USTRD != "") ? $conf->global->PRELEVEMENT_USTRD : dol_trunc($row_ref, 135)).''.$CrLf; // 140 max
+ $XML_DEBITOR .= ' '.$CrLf;
+ $XML_DEBITOR .= ' '.$CrLf;
return $XML_DEBITOR;
}
@@ -1755,11 +1755,11 @@ class BonPrelevement extends CommonObject
// Raison Sociale C2
- fputs($this->file, substr($this->raison_sociale. " ", 0, 24));
+ fputs($this->file, substr($this->raison_sociale." ", 0, 24));
// Reference de la remise creancier D1 sur 7 caracteres
- fputs($this->file, substr($this->reference_remise. " ", 0, 7));
+ fputs($this->file, substr($this->reference_remise." ", 0, 7));
// Zone Reservee D1-2
@@ -1822,29 +1822,29 @@ class BonPrelevement extends CommonObject
$dateTime_YMDHMS = dol_print_date($ladate, '%Y-%m-%dT%H:%M:%S');
// Get data of bank account
- $id=$configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
+ $id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
$account = new Account($this->db);
- if ($account->fetch($id)>0)
+ if ($account->fetch($id) > 0)
{
- $this->emetteur_code_banque = $account->code_banque;
+ $this->emetteur_code_banque = $account->code_banque;
$this->emetteur_code_guichet = $account->code_guichet;
$this->emetteur_numero_compte = $account->number;
- $this->emetteur_number_key = $account->cle_rib;
+ $this->emetteur_number_key = $account->cle_rib;
$this->emetteur_iban = $account->iban;
$this->emetteur_bic = $account->bic;
- $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+ $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
$this->raison_sociale = $account->proprio;
}
// Récupération info demandeur
$sql = "SELECT rowid, ref";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_bons as pb";
- $sql.= " WHERE pb.rowid = ".$this->id;
+ $sql .= " FROM";
+ $sql .= " ".MAIN_DB_PREFIX."prelevement_bons as pb";
+ $sql .= " WHERE pb.rowid = ".$this->id;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
@@ -1876,7 +1876,7 @@ class BonPrelevement extends CommonObject
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$country[1].''.$CrLf;
$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
- $addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN)?' ':'').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
+ $addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
if ($addressline1) $XML_SEPA_INFO .= ' '.$addressline1.''.$CrLf;
if ($addressline2) $XML_SEPA_INFO .= ' '.$addressline2.''.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index aa56428db30..35170e0d830 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -829,7 +829,7 @@ else
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print "
";
@@ -1162,12 +1162,12 @@ else
}
// Other attributes
- $parameters = array('colspan' => ' colspan="3"', 'cols'=>3);
+ $parameters = array('colspan' => ' colspan="3"', 'cols'=> '3');
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
$object->load_ref_elements();
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 724a19bdbb8..efd521e9ec0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,39 +40,39 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("contracts","orders","companies","bills","products",'compta'));
+$langs->loadLangs(array("contracts", "orders", "companies", "bills", "products", 'compta'));
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
$socid = GETPOST('socid', 'int');
$id = GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$origin=GETPOST('origin', 'alpha');
-$originid=GETPOST('originid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$origin = GETPOST('origin', 'alpha');
+$originid = GETPOST('originid', 'int');
-$datecontrat='';
-$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
+$datecontrat = '';
+$usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
// Security check
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'contrat', $id);
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'contrat', $id);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
$object = new Contrat($db);
$extrafields = new ExtraFields($db);
// Load object
-if ($id > 0 || ! empty($ref) && $action!='add') {
+if ($id > 0 || !empty($ref) && $action != 'add') {
$ret = $object->fetch($id, $ref);
if ($ret > 0)
$ret = $object->fetch_thirdparty();
@@ -444,8 +444,8 @@ if (empty($reshook))
$error++;
}
- $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
- $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+ $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+ $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
{
setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
@@ -528,46 +528,46 @@ if (empty($reshook))
{
if ($price_base_type != 'HT')
{
- $pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
+ $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
}
else
{
- $pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
+ $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
}
}
- $desc=$prod->description;
- $desc=dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+ $desc = $prod->description;
+ $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
$fk_unit = $prod->fk_unit;
}
else
{
- $pu_ht=GETPOST('price_ht');
+ $pu_ht = GETPOST('price_ht');
$price_base_type = 'HT';
- $tva_tx=GETPOST('tva_tx')?str_replace('*', '', GETPOST('tva_tx')):0; // tva_tx field may be disabled, so we use vat rate 0
- $tva_npr=preg_match('/\*/', GETPOST('tva_tx'))?1:0;
- $desc=$product_desc;
- $fk_unit= GETPOST('units', 'alpha');
+ $tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
+ $tva_npr = preg_match('/\*/', GETPOST('tva_tx')) ? 1 : 0;
+ $desc = $product_desc;
+ $fk_unit = GETPOST('units', 'alpha');
}
- $localtax1_tx=get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
- $localtax2_tx=get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
+ $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+ $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
// ajout prix achat
$fk_fournprice = $_POST['fournprice'];
- if ( ! empty($_POST['buying_price']) )
+ if (!empty($_POST['buying_price']))
$pa_ht = $_POST['buying_price'];
else
$pa_ht = null;
- $info_bits=0;
+ $info_bits = 0;
if ($tva_npr) $info_bits |= 0x01;
- if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
- || empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+ if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
+ || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
{
$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
- $result = -1 ;
+ $result = -1;
}
else
{
@@ -1239,39 +1239,39 @@ if ($action == 'create')
print "";
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load('projects');
- $formproject=new FormProjets($db);
+ $formproject = new FormProjets($db);
print '| '.$langs->trans("Project").' | ';
- $formproject->select_projects(($soc->id>0?$soc->id:-1), $projectid, "projectid", 0, 0, 1, 1);
- print ' id).'">' . $langs->trans("AddProject") . '';
+ $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
+ print ' id).'">'.$langs->trans("AddProject").'';
print " |
";
}
print '| '.$langs->trans("NotePublic").' | ';
- $doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
if (empty($user->socid))
{
print '| '.$langs->trans("NotePrivate").' | ';
- $doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
}
// Other attributes
- $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3');
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Other attributes
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'edit', $parameters);
}
print "\n";
@@ -1389,62 +1389,62 @@ else
// Contract card
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- if (! empty($modCodeContract->code_auto)) {
- $morehtmlref.=$object->ref;
+ $morehtmlref = '';
+ if (!empty($modCodeContract->code_auto)) {
+ $morehtmlref .= $object->ref;
} else {
- $morehtmlref.=$form->editfieldkey("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 3);
- $morehtmlref.=$form->editfieldval("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 2);
+ $morehtmlref .= $form->editfieldkey("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 3);
+ $morehtmlref .= $form->editfieldval("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 2);
}
- $morehtmlref.='';
+ $morehtmlref .= '
';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
// Ref supplier
- $morehtmlref.='
';
- $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
+ $morehtmlref .= '
';
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
// Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
- if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (
'.$langs->trans("OtherContracts").')';
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+ if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (
'.$langs->trans("OtherContracts").')';
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ $morehtmlref .= '
'.$langs->trans('Project').' ';
if ($user->rights->contrat->creer)
{
if ($action != 'classify') {
- $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
+ $morehtmlref .= '
';
} else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='';
+ $morehtmlref .= '
';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= '';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.='
';
+ $morehtmlref .= '
'.$objp->qty.' | ';
// Unit
- if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).' | ';
+ if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).' | ';
// Discount
if ($objp->remise_percent > 0)
{
@@ -1717,32 +1717,32 @@ else
print '';
if ($objp->fk_product)
{
- $productstatic->id=$objp->fk_product;
- $productstatic->type=$objp->ptype;
- $productstatic->ref=$objp->pref;
- $productstatic->entity=$objp->pentity;
+ $productstatic->id = $objp->fk_product;
+ $productstatic->type = $objp->ptype;
+ $productstatic->ref = $objp->pref;
+ $productstatic->entity = $objp->pentity;
print $productstatic->getNomUrl(1, '', 32);
- print $objp->label?' - '.dol_trunc($objp->label, 32):'';
+ print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
print '
';
}
else
{
- print $objp->label?$objp->label.'
':'';
+ print $objp->label ? $objp->label.'
' : '';
}
// editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $nbrows=ROWS_2;
- if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
- $doleditor=new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
+ $nbrows = ROWS_2;
+ if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+ $enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+ $doleditor = new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
$doleditor->Create();
print ' | ';
// VAT
print '';
- print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
+ print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
print ' | ';
// Price
@@ -1767,7 +1767,7 @@ else
// Discount
print '% | ';
- if (! empty($usemargins))
+ if (!empty($usemargins))
{
print '';
if ($objp->fk_product) print '';
@@ -1885,27 +1885,27 @@ else
// Area with status and activation info of line
if ($object->statut > 0)
{
- print '';
+ print '';
print '';
- print '| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' | ';
+ print ''.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).' | ';
print '';
if ($user->socid == 0)
{
if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
{
- $tmpaction='activateline';
- $tmpactionpicto='play';
- $tmpactiontext=$langs->trans("Activate");
+ $tmpaction = 'activateline';
+ $tmpactionpicto = 'play';
+ $tmpactiontext = $langs->trans("Activate");
if ($objp->statut == 4)
{
- $tmpaction='unactivateline';
- $tmpactionpicto='playstop';
- $tmpactiontext=$langs->trans("Disable");
+ $tmpaction = 'unactivateline';
+ $tmpactionpicto = 'playstop';
+ $tmpactiontext = $langs->trans("Disable");
}
- if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
+ if (($tmpaction == 'activateline' && $user->rights->contrat->activer) || ($tmpaction == 'unactivateline' && $user->rights->contrat->desactiver))
{
- print '';
+ print '';
print img_picto($tmpactiontext, $tmpactionpicto);
print '';
}
@@ -2060,24 +2060,24 @@ else
// Form to add new line
if ($user->rights->contrat->creer && ($object->statut == 0))
{
- $dateSelector=1;
+ $dateSelector = 1;
print "\n";
- print ' | |