diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 4e2d5e37242..03e816a63f9 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1667,7 +1667,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, // Show information for lot if (!empty($dbatch)) { // $object is a shipment. - //var_dump($object->lines[$i]->details_entrepot); // array from llx_expeditiondet (we can have seral lines for one fk_origin_line) + //var_dump($object->lines[$i]->details_entrepot); // array from llx_expeditiondet (we can have several lines for one fk_origin_line) //var_dump($object->lines[$i]->detail_batch); // array from llx_expeditiondet_batch (each line with a lot is linked to llx_expeditiondet) include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index 058a74eea19..869225a534c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -18,9 +18,9 @@ -- particular supplier order. A movement with same information is also done -- into stock_movement so this table may be useless. -- --- Detail of each lines of a reception (qty, batch and into wich warehouse is --- received a purchase order line). --- This table should be also name llx_receptiondet. +-- Detail of each lines of a reception (qty, batch and into which warehouse must be +-- received or has been receveived a purchase order line). +-- This table should have been named llx_receptiondet_batch -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql index 2c85521ea84..d8720358cec 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql @@ -14,6 +14,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- +-- This table should have been named llx_receptiondet_batch_extrafields -- =================================================================== create table llx_commande_fournisseur_dispatch_extrafields diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 4a8a5423ce3..cccee9e5747 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -16,6 +16,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- +-- doe not contains the batch -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql index 43b64451364..a4bd120503d 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql @@ -14,7 +14,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- +-- Similar for supplier to llx_commande_fournisseur_dispatch=llx_receptiondet_batch -- ============================================================================ + CREATE TABLE llx_expeditiondet_batch ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_expeditiondet int NOT NULL, @@ -22,6 +24,6 @@ CREATE TABLE llx_expeditiondet_batch ( sellby date DEFAULT NULL, batch varchar(128) DEFAULT NULL, qty double NOT NULL DEFAULT '0', - fk_origin_stock integer NOT NULL + fk_origin_stock integer NOT NULL -- id into table llx_product_batch (may be renamed into llx_product_stock_batch in another version). TODO We should add and use instead a fk_warehouse field ) ENGINE=innodb;