*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -279,6 +280,177 @@ class Boms extends DolibarrApi
);
}
+ /**
+ * Get lines of an BOM
+ *
+ * @param int $id Id of BOM
+ *
+ * @url GET {id}/lines
+ *
+ * @return array
+ */
+ public function getLines($id)
+ {
+ if (!DolibarrApiAccess::$user->rights->bom->read) {
+ throw new RestException(401);
+ }
+
+ $result = $this->bom->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'BOM not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $this->bom->getLinesArray();
+ $result = array();
+ foreach ($this->bom->lines as $line) {
+ array_push($result, $this->_cleanObjectDatas($line));
+ }
+ return $result;
+ }
+
+ /**
+ * Add a line to given BOM
+ *
+ * @param int $id Id of BOM to update
+ * @param array $request_data BOMLine data
+ *
+ * @url POST {id}/lines
+ *
+ * @return int
+ */
+ public function postLine($id, $request_data = null)
+ {
+ if (!DolibarrApiAccess::$user->rights->bom->write) {
+ throw new RestException(401);
+ }
+
+ $result = $this->bom->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'BOM not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $request_data = (object) $request_data;
+
+ $updateRes = $this->bom->addLine(
+ $request_data->fk_product,
+ $request_data->qty,
+ $request_data->qty_frozen,
+ $request_data->disable_stock_change,
+ $request_data->efficiency,
+ $request_data->position,
+ $request_data->fk_bom_child,
+ $request_data->import_key
+ );
+
+ if ($updateRes > 0) {
+ return $updateRes;
+ } else {
+ throw new RestException(400, $this->bom->error);
+ }
+ }
+
+ /**
+ * Update a line to given BOM
+ *
+ * @param int $id Id of BOM to update
+ * @param int $lineid Id of line to update
+ * @param array $request_data BOMLine data
+ *
+ * @url PUT {id}/lines/{lineid}
+ *
+ * @return array|bool
+ */
+ public function putLine($id, $lineid, $request_data = null)
+ {
+ if (!DolibarrApiAccess::$user->rights->bom->write) {
+ throw new RestException(401);
+ }
+
+ $result = $this->bom->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'BOM not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $request_data = (object) $request_data;
+
+ $updateRes = $this->bom->updateLine(
+ $lineid,
+ $request_data->qty,
+ $request_data->qty_frozen,
+ $request_data->disable_stock_change,
+ $request_data->efficiency,
+ $request_data->position,
+ $request_data->import_key
+ );
+
+ if ($updateRes > 0) {
+ $result = $this->get($id);
+ unset($result->line);
+ return $this->_cleanObjectDatas($result);
+ }
+ return false;
+ }
+
+ /**
+ * Delete a line to given BOM
+ *
+ *
+ * @param int $id Id of BOM to update
+ * @param int $lineid Id of line to delete
+ *
+ * @url DELETE {id}/lines/{lineid}
+ *
+ * @return int
+ *
+ * @throws RestException 401
+ * @throws RestException 404
+ * @throws RestException 500
+ */
+ public function deleteLine($id, $lineid)
+ {
+ if (!DolibarrApiAccess::$user->rights->bom->write) {
+ throw new RestException(401);
+ }
+
+ $result = $this->bom->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'BOM not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ //Check the rowid is a line of current bom object
+ $lineIdIsFromObject = false;
+ foreach ($this->bom->lines as $bl) {
+ if ($bl->id == $lineid) {
+ $lineIdIsFromObject = true;
+ break;
+ }
+ }
+ if (!$lineIdIsFromObject) {
+ throw new RestException(500, 'Line to delete (rowid: '.$lineid.') is not a line of BOM (id: '.$this->bom->id.')');
+ }
+
+ $updateRes = $this->bom->deleteline(DolibarrApiAccess::$user, $lineid);
+ if ($updateRes > 0) {
+ return $this->get($id);
+ } else {
+ throw new RestException(405, $this->bom->error);
+ }
+ }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 8adcac855c2..50d97150d6a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -502,6 +502,207 @@ class BOM extends CommonObject
//return $this->deleteCommon($user, $notrigger, 1);
}
+ /**
+ * Add an BOM line into database (linked to BOM)
+ *
+ * @param int $fk_product Id of product
+ * @param float $qty Quantity
+ * @param int $qty_frozen Frozen quantity
+ * @param int $disable_stock_change Disable stock change on using in MO
+ * @param float $efficiency Efficiency in MO
+ * @param int $position Position of BOM-Line in BOM-Lines
+ * @param int $fk_bom_child Id of BOM Child
+ * @param string $import_key Import Key
+ * @return int <0 if KO, Id of created object if OK
+ */
+ public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null)
+ {
+ global $mysoc, $conf, $langs, $user;
+
+ $logtext = "::addLine bomid=$this->id, qty=$qty, fk_product=$fk_product, qty_frozen=$qty_frozen, disable_stock_change=$disable_stock_change, efficiency=$efficiency";
+ $logtext .= ", fk_bom_child=$fk_bom_child, import_key=$import_key";
+ dol_syslog(get_class($this).$logtext, LOG_DEBUG);
+
+ if ($this->statut == self::STATUS_DRAFT) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+ // Clean parameters
+ if (empty($qty)) {
+ $qty = 0;
+ }
+ if (empty($qty_frozen)) {
+ $qty_frozen = 0;
+ }
+ if (empty($disable_stock_change)) {
+ $disable_stock_change = 0;
+ }
+ if (empty($efficiency)) {
+ $efficiency = 1.0;
+ }
+ if (empty($fk_bom_child)) {
+ $fk_bom_child = null;
+ }
+ if (empty($import_key)) {
+ $import_key = null;
+ }
+ if (empty($position)) {
+ $position = -1;
+ }
+
+ $qty = price2num($qty);
+ $efficiency = price2num($efficiency);
+ $position = price2num($position);
+
+ $this->db->begin();
+
+ // Rank to use
+ $rangMax = $this->line_max();
+ $rankToUse = $position;
+ if ($rankToUse <= 0 or $rankToUse > $rangMax) { // New line after existing lines
+ $rankToUse = $rangMax + 1;
+ } else { // New line between the existing lines
+ foreach ($this->lines as $bl) {
+ if ($bl->position >= $rankToUse) {
+ $bl->position++;
+ $bl->update($user);
+ }
+ }
+ }
+
+ // Insert line
+ $this->line = new BOMLine($this->db);
+
+ $this->line->context = $this->context;
+
+ $this->line->fk_bom = $this->id;
+ $this->line->fk_product = $fk_product;
+ $this->line->qty = $qty;
+ $this->line->qty_frozen = $qty_frozen;
+ $this->line->disable_stock_change = $disable_stock_change;
+ $this->line->efficiency = $efficiency;
+ $this->line->fk_bom_child = $fk_bom_child;
+ $this->line->import_key = $import_key;
+ $this->line->position = $rankToUse;
+
+ $result = $this->line->create($user);
+
+ if ($result > 0) {
+ $this->calculateCosts();
+ $this->db->commit();
+ return $result;
+ } else {
+ $this->error = $this->line->error;
+ dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+ $this->db->rollback();
+ return -2;
+ }
+ } else {
+ dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR);
+ return -3;
+ }
+ }
+
+ /**
+ * Update an BOM line into database
+ *
+ * @param int $rowid Id of line to update
+ * @param float $qty Quantity
+ * @param int $qty_frozen Frozen quantity
+ * @param int $disable_stock_change Disable stock change on using in MO
+ * @param float $efficiency Efficiency in MO
+ * @param int $position Position of BOM-Line in BOM-Lines
+ * @param string $import_key Import Key
+ * @return int <0 if KO, Id of updated BOM-Line if OK
+ */
+ public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null)
+ {
+ global $mysoc, $conf, $langs, $user;
+
+ $logtext = "::updateLine bomid=$this->id, qty=$qty, qty_frozen=$qty_frozen, disable_stock_change=$disable_stock_change, efficiency=$efficiency";
+ $logtext .= ", import_key=$import_key";
+ dol_syslog(get_class($this).$logtext, LOG_DEBUG);
+
+ if ($this->statut == self::STATUS_DRAFT) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+ // Clean parameters
+ if (empty($qty)) {
+ $qty = 0;
+ }
+ if (empty($qty_frozen)) {
+ $qty_frozen = 0;
+ }
+ if (empty($disable_stock_change)) {
+ $disable_stock_change = 0;
+ }
+ if (empty($efficiency)) {
+ $efficiency = 1.0;
+ }
+ if (empty($import_key)) {
+ $import_key = null;
+ }
+ if (empty($position)) {
+ $position = -1;
+ }
+
+ $qty = price2num($qty);
+ $efficiency = price2num($efficiency);
+ $position = price2num($position);
+
+ $this->db->begin();
+
+ //Fetch current line from the database and then clone the object and set it in $oldline property
+ $line = new BOMLine($this->db);
+ $line->fetch($rowid);
+ $line->fetch_optionals();
+
+ $staticLine = clone $line;
+ $line->oldcopy = $staticLine;
+ $this->line = $line;
+ $this->line->context = $this->context;
+
+ // Rank to use
+ $rankToUse = (int) $position;
+ if ($rankToUse != $line->oldcopy->position) { // check if position have a new value
+ foreach ($this->lines as $bl) {
+ if ($bl->position >= $rankToUse AND $bl->position < ($line->oldcopy->position + 1)) { // move rank up
+ $bl->position++;
+ $bl->update($user);
+ }
+ if ($bl->position <= $rankToUse AND $bl->position > ($line->oldcopy->position)) { // move rank down
+ $bl->position--;
+ $bl->update($user);
+ }
+ }
+ }
+
+
+ $this->line->fk_bom = $this->id;
+ $this->line->qty = $qty;
+ $this->line->qty_frozen = $qty_frozen;
+ $this->line->disable_stock_change = $disable_stock_change;
+ $this->line->efficiency = $efficiency;
+ $this->line->import_key = $import_key;
+ $this->line->position = $rankToUse;
+
+ $result = $this->line->update($user);
+
+ if ($result > 0) {
+ $this->calculateCosts();
+ $this->db->commit();
+ return $result;
+ } else {
+ $this->error = $this->line->error;
+ dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+ $this->db->rollback();
+ return -2;
+ }
+ } else {
+ dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR);
+ return -3;
+ }
+ }
+
/**
* Delete a line of object in database
*
@@ -517,7 +718,38 @@ class BOM extends CommonObject
return -2;
}
- return $this->deleteLineCommon($user, $idline, $notrigger);
+ $this->db->begin();
+
+ //Fetch current line from the database and then clone the object and set it in $oldline property
+ $line = new BOMLine($this->db);
+ $line->fetch($idline);
+ $line->fetch_optionals();
+
+ $staticLine = clone $line;
+ $line->oldcopy = $staticLine;
+ $this->line = $line;
+ $this->line->context = $this->context;
+
+ $result = $this->line->delete($user, $notrigger);
+
+ //Positions (rank) reordering
+ foreach ($this->lines as $bl) {
+ if ($bl->position > ($line->oldcopy->position)) { // move rank down
+ $bl->position--;
+ $bl->update($user);
+ }
+ }
+
+ if ($result > 0) {
+ $this->calculateCosts();
+ $this->db->commit();
+ return $result;
+ } else {
+ $this->error = $this->line->error;
+ dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+ $this->db->rollback();
+ return -2;
+ }
}
/**
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 0a3a3b34e7a..e895d534fac 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -87,7 +87,7 @@ $coldisplay++;
print '| ';
// Predefined product/service
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+if (isModEnabled("product") || isModEnabled("service")) {
if (!empty($conf->global->BOM_SUB_BOM)) {
print $langs->trans("Product");
}
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 02e6892b571..f7022477d97 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -67,7 +67,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
* View
*/
-$help_url = 'EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías';
+$help_url = 'EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías|DE:Modul_Kategorien';
$linkback = ''.$langs->trans("BackToModuleList").'';
llxHeader('', $langs->trans("Categories"), $help_url);
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 7dbf31835ca..2a1879135d6 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -63,7 +63,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject = $langs->transnoentitiesnoconv("Categories");
-$help_url = 'EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías';
+$help_url = 'EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías|DE:Modul_Kategorien';
llxHeader('', $langs->trans("Categories"), $help_url);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 8d26b5583d4..b222f70110a 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -703,13 +703,14 @@ class Categorie extends CommonObject
$type = $obj->element;
}
+ dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
+
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
$sql .= " VALUES (".((int) $this->id).", ".((int) $obj->id).")";
- dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
if ($this->db->query($sql)) {
if (!empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 512f25a67e2..69a27c5cff5 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -20,9 +20,9 @@
*/
/**
- * \file htdocs/product/traduction.php
- * \ingroup product
- * \brief Page of translation of products
+ * \file htdocs/categories/traduction.php
+ * \ingroup categories
+ * \brief Page of translation of categories
*/
require '../main.inc.php';
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Load translation files required by the page
$langs->loadLangs(array('categories', 'languages'));
-$id = GETPOST('id', 'int');
-$label = GETPOST('label', 'alpha');
+$id = GETPOST('id', 'int');
+$label = GETPOST('label', 'alpha');
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
@@ -56,21 +56,23 @@ if ($result <= 0) {
$type = $object->type;
if (is_numeric($type)) {
- $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+ $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
}
+
/*
* Actions
*/
+
$error = 0;
-// retour a l'affichage des traduction si annulation
+// return to translation view if cancelled
if ($cancel == $langs->trans("Cancel")) {
$action = '';
}
-// Validation de l'ajout
+// validation of addition
if ($action == 'vadd' &&
$cancel != $langs->trans("Cancel") &&
($user->rights->categorie->creer)) {
@@ -94,7 +96,7 @@ $cancel != $langs->trans("Cancel") &&
}
if (!$error) {
- // update de l'objet
+ // update the object
if ($forcelangprod == $current_lang) {
$object->label = $libelle;
$object->description = dol_htmlcleanlastbr($desc);
@@ -103,7 +105,7 @@ $cancel != $langs->trans("Cancel") &&
$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
}
- // sauvegarde en base
+ // save in base / sauvegarde en base
$res = $object->setMultiLangs($user);
if ($res < 0) {
$error++;
@@ -119,14 +121,14 @@ $cancel != $langs->trans("Cancel") &&
}
}
-// Validation de l'edition
+// validation of the edition
if ($action == 'vedit' &&
$cancel != $langs->trans("Cancel") &&
($user->rights->categorie->creer)) {
$object->fetch($id);
$current_lang = $langs->getDefaultLang();
- foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
+ foreach ($object->multilangs as $key => $value) { // recording of new values in the object
$libelle = GETPOST('libelle-'.$key, 'alpha');
$desc = GETPOST('desc-'.$key);
@@ -164,7 +166,7 @@ $cancel != $langs->trans("Cancel") &&
* View
*/
-$form = new Form($db);
+$form = new Form($db);
$formadmin = new FormAdmin($db);
$formother = new FormOther($db);
@@ -223,10 +225,10 @@ print dol_get_fiche_end();
-
/*
* Action bar
*/
+
print "\n \n";
if ($action == '') {
@@ -243,7 +245,7 @@ print "\n \n";
if ($action == 'edit') {
- //WYSIWYG Editor
+ // WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
print ' |