Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur 2024-06-23 13:57:35 +02:00
parent 3ef67a68cc
commit 62a7c7728b
5 changed files with 63 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
dev/initdemo/mysqldump_dolibarr_20.0.0.sql
View File

File diff suppressed because one or more lines are too long

2
htdocs/admin/system/database-tables.php
View File

@ -138,7 +138,7 @@ if (!$base) {
print '<tr class="oddeven">';
print '<td>'.($i+1).'</td>';
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>';
print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($obj->Name).'"><a href="dbtable.php?table='.urlencode($obj->Name).'">'.$obj->Name.'</a>';
$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
if (in_array($tablename.'.sql', $arrayoffiles)) {

3
htdocs/install/mysql/tables/llx_product_stock_entrepot.sql → htdocs/install/mysql/tables/llx_product_warehouse_properties-stock.sql
View File

@ -18,6 +18,8 @@
--
-- ============================================================================
-- Table used when STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE is set.
create table llx_product_warehouse_properties
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
@ -28,4 +30,3 @@ create table llx_product_warehouse_properties
desiredstock float DEFAULT '0',
import_key varchar(14) -- Import key
)ENGINE=innodb;

15
htdocs/product/stock/class/productstockentrepot.class.php
View File

@ -22,9 +22,8 @@
/**
* \file htdocs/product/stock/class/productstockentrepot.class.php
* \ingroup ProductEntrepot
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
* Put some comments here
* \ingroup ProductStockEntrepot
* \brief Table used to store limit of stock of product per warehouse
*/
// Put here all includes required by your class file
@ -32,11 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
/**
* Class ProductStockEntrepot
*
* Put here description of your class
*
* @see CommonObject
*/
class ProductStockEntrepot extends CommonObject
@ -508,13 +506,9 @@ class ProductStockEntrepot extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
{
global $langs, $conf, $db;
global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager;
global $langs;
$result = '';
$companylink = '';
$label = '<u>'.$langs->trans("MyModule").'</u>';
$label .= '<div width="100%">';
@ -532,6 +526,7 @@ class ProductStockEntrepot extends CommonObject
}
}
$result .= $link.$this->ref.$linkend;
return $result;
}

2
htdocs/reception/dispatch.php
View File

@ -688,7 +688,7 @@ if ($id > 0 || !empty($ref)) {
print '<td></td>'; // Warehouse column
$sql = "SELECT cfd.rowid, cfd.qty, cfd.fk_entrepot, cfd.batch, cfd.eatby, cfd.sellby, cfd.fk_product";
$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd"; // commande_fournisseur_dispatch should be named receptiondet_batch
$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
$sql .= " WHERE cfd.fk_reception = ".((int) $object->id);
$sql .= " AND cfd.fk_element = ".((int) $objectsrc->id);
$sql .= " AND cfd.fk_elementdet = ".(int) $objp->rowid;