Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 11:43:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
129,525 Commits 38 Branches 191 Tags
b1492818f61ba4e9ee97eed24ae827e69c8d64fc
Commit Graph

231 Commits

Author SHA1 Message Date
Florian HENRY
1895fb3394 fix: missing token on delete line on MO 2024-12-17 17:27:27 +01:00
HENRY Florian
686f48c615 fix: display batch ref in OF during production (#30886) 
* fix: display batch ref in OF on prod

* fix: display batch ref in OF on prod

* Update global.inc.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-09 03:12:50 +02:00
Laurent Destailleur
b870a84d8a FIX #28564 2024-03-01 20:19:37 +01:00
Laurent Destailleur
6e7263a047 Revert "FIX #28533 Mo::deleteLine removes the "main" MoLine if consumed line …" (#28564) 
This reverts commit c069f3f161.
 2024-03-01 19:25:06 +01:00
Christian Humpel
c069f3f161 FIX #28533 Mo::deleteLine removes the "main" MoLine if consumed line is delete (#28535) 
* fix #28533

* qual for github actions

* fix use $this->db in classes

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>
 2024-03-01 12:47:37 +01:00
Laurent Destailleur
ff2d609814 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_production.php
 2024-02-12 03:35:39 +01:00
atm-sami
b2fad54f1f FIX : add new hook context for mo production card (#28037) 
* add new hook context for mo production card

* Update mo_production.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-07 18:51:06 +01:00
Laurent Destailleur
5870e62fce Debug v19 2023-12-23 12:33:19 +01:00
Laurent Destailleur
1c9429643a Fix php-cs 2023-12-04 13:46:42 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
atm-sami
5a5483a610 New add extrafields for mo line (#26395) 
* added recursive deletion option for child MOs + added recursive recovery method for child MOs

* add number of MOs in form_confirm

* update to delete number of mo childs if is null

* added checking of an infinity loop

* review PR

* add extrafields for mo lines

* update

* update for travis

* Update 18.0.0-19.0.0.sql

* Update functions.sql

* Delete htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql

* Delete htdocs/install/mysql/tables/llx_mrp_production_extrafields.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-18 23:17:57 +01:00
Laurent Destailleur
8909223452 Fix CSS 2023-11-17 01:13:00 +01:00
atm-lena
85beb3ea5d Unit Management for MO lines (#26120) 
* Unit Management for products in bom and mo

* WIP

* Unit in to produce tab

* FIX wip

* float val

* Fix Travis

* fk_unit type int

* Clean code

* Clean code

* FIX code sniffer

* Update llx_mrp_production.sql

* Update 18.0.0-19.0.0.sql

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 11:15:43 +01:00
Laurent Destailleur
9fc5accd81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-26 15:58:41 +02:00
atm-lucas
3f75077f5e NEW - Add edit line on MO (#26122) 
* Added the possibility of editing lines

* Review code

* add exit

* Add same action

* check Travis

* Travis

* Update mo_production.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-26 14:11:27 +02:00
kkhelifa-opendsi
91ff39d2e6 NEW: Add option for cancel consumed and produced lines (delete lines and rollback stocks) when delete or cancel an manufacturing order (#26254) 2023-10-20 03:09:58 +02:00
Laurent Destailleur
3f8e343b10 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:10:42 +02:00
Laurent Destailleur
8646b826e0 Debug v18 2023-08-05 14:09:11 +02:00
Laurent Destailleur
74acbcf72d Fix phpcs 2023-07-26 02:46:43 +02:00
Laurent Destailleur
1bb649bc7e Fix phpcs 2023-07-24 22:54:45 +02:00
UT from dolibit
c643f3c712 Update mo_production.php (#25451) 2023-07-24 18:46:47 +02:00
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/receipt.php
 2023-07-19 04:19:15 +02:00
kkhelifa-opendsi
765dd665f8 FIX: Fix delete consumed line of a Mo with movement stock (#25343) 
* FIX: Fix delete consumed line of a Mo with movement stock

* Fix langs
 2023-07-12 12:53:27 +02:00
Laurent Destailleur
700dd5d3f0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-10 02:31:48 +02:00
Kamel Khelifa
8a3c0491ec FIX: Fix errors or missing langs for MO and BOM 2023-07-07 16:46:11 +02:00
Laurent Destailleur
8990b47390 Fix css 2023-07-06 19:35:57 +02:00
Kamel Khelifa
2c39cc4de3 NEW: Add context for the movement stock (role toconsume/toproduce) on mrp 2023-07-05 17:43:32 +02:00
Laurent Destailleur
80b6e78679 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-27 14:19:09 +02:00
Laurent Destailleur
302c6a0ab9 Fix serious regression in creating MO. 2023-04-27 14:02:59 +02:00
stickler-ci
a5c4ec5dcf Fixing style errors. 2023-04-19 16:22:47 +00:00
x
ff33e3c367 Add line mo : fk_default_workstation 2023-04-19 12:17:04 +02:00
stickler-ci
eb27a81bfd Fixing style errors. 2023-04-05 22:34:51 +00:00
Vincent de Grandpré
7a60c57fc5 Aligned copyrights 2023-04-05 18:30:34 -04:00
Vincent de Grandpré
5d45e1ca3a #24447 added defaulting to manufacturing warehouse 2023-04-05 18:28:48 -04:00
Laurent Destailleur
86445cdd83 NEW Dynamic choice of warehouse and batch in MO production. 2023-04-05 01:08:23 +02:00
Laurent Destailleur
0365af4fe6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-05 00:48:45 +02:00
Laurent Destailleur
6777c27c5b Look and feel v17 2023-04-04 23:36:24 +02:00
Laurent Destailleur
2d728b4cbb Update mo_production.php 2023-04-04 23:31:30 +02:00
stickler-ci
4e46be4e7d Fixing style errors. 2023-04-04 21:29:03 +00:00
Laurent Destailleur
306871fa80 Merge branch 'develop' into develop_of_consumption_selectbatch 2023-04-04 22:58:15 +02:00
Laurent Destailleur
d0a8d0aaaa Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-24 13:54:43 +01:00
Laurent Destailleur
a2a5f75aa3 Fix position of column 2023-03-23 18:13:40 +01:00
Laurent Destailleur
f034b12ec1 Clean code 2023-02-23 20:07:53 +01:00
Frédéric FRANCE
9f23bac505 use hasRight 2023-02-20 18:55:52 +01:00
priojk
c90e509445 NEW: Possibility to link to German pages in help 2023-02-13 10:09:48 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Christian Humpel
5152a77208 Fix #23108: - Set NULL on fk_warehouse if stockmovement is empty. 
- Fix deletion on lines without stockmovement -> set the correct rowid of the line.
- Fix stock qty and warnings correct.
 2023-01-09 01:29:27 +01:00
Christian Humpel
fc0ef489e6 Fix #23108: - Set NULL on fk_warehouse if stockmovement is empty. 
- Fix deletion on lines without stockmovement -> set the correct rowid of the line.
- Fix stock qty and warnings correct.
 2023-01-09 00:49:24 +01:00
Laurent Destailleur
cdb9aa5ba0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 13:29:06 +01:00