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

Merge

Browse Source
This commit is contained in:
Laurent Destailleur 2023-09-13 03:04:22 +02:00
parent 22e08835a2
commit 69bf082125
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/js/lib_dispatch.js.php
View File

@ -156,7 +156,7 @@ function addDispatchLine(index, type, mode) {
$('tr[name="' + type + '_' + idrow + '"').remove();
$("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
} else {
console.log("Reset trigger for id = #qty_" + idrow);
console.log("fourn/js/lib_dispatch.js.php Reset trigger for id = #qty_" + idrow);
$("#qty_" + idrow).val("");
}
});

4
htdocs/install/mysql/migration/18.0.0-19.0.0.sql
View File

@ -101,7 +101,7 @@ ALTER TABLE llx_societe_rib ADD COLUMN online_sign_name varchar(64) AFTER onlin
INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('PROPOSAL_ALLOW_ONLINESIGN', 1, '1', 'string', 0);
ALTER TABLE llx_bookcal_availabilities ADD COLUMN fk_bookcal_calendar integer NOT NULL;
ALTER TABLE llx_bookcal_calendar ADD COLUMN visibility integer NOT NULL DEFAULT 1;
ALTER TABLE llx_expeditiondet_batch ADD COLUMN fk_warehouse DEFAULT NULL;

12
htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
View File

@ -26,19 +26,19 @@
create table llx_commande_fournisseur_dispatch
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_commande integer,
fk_product integer,
fk_commande integer,
fk_commandefourndet integer,
fk_projet integer DEFAULT NULL,
fk_reception integer DEFAULT NULL,
qty float, -- qty
fk_entrepot integer,
fk_user integer,
comment varchar(255), -- comment on movement
batch varchar(128) DEFAULT NULL,
qty float, -- qty to move
fk_entrepot integer, -- ID of warehouse to use for the stock change
comment varchar(255), -- comment on movement
batch varchar(128) DEFAULT NULL, -- serial/lot number
eatby date DEFAULT NULL,
sellby date DEFAULT NULL,
status integer,
fk_user integer,
datec datetime,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
cost_price double(24,8) DEFAULT 0

11
htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
View File

@ -14,16 +14,17 @@
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
--
-- Similar for supplier to llx_commande_fournisseur_dispatch=llx_receptiondet_batch
-- Similar for supplier with llx_commande_fournisseur_dispatch=llx_receptiondet_batch
-- ============================================================================
CREATE TABLE llx_expeditiondet_batch (
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_expeditiondet int NOT NULL,
fk_expeditiondet int NOT NULL, -- line ID in shipment line table
eatby date DEFAULT NULL,
sellby date DEFAULT NULL,
batch varchar(128) DEFAULT NULL,
qty double NOT NULL DEFAULT '0',
fk_origin_stock integer NOT NULL -- id into table llx_product_batch (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
batch varchar(128) DEFAULT NULL, -- serial/lot number
qty double NOT NULL DEFAULT '0', -- qty to move
fk_origin_stock integer NOT NULL, -- Not useful. ID into table llx_product_batch (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
fk_warehouse DEFAULT NULL -- ID of warehouse to use for the stock change
) ENGINE=innodb;