Commit Graph

525 Commits

Author SHA1 Message Date
atm-lena
e716c9abd6 Force to warehouse for consume produt in mo 2022-05-11 12:38:24 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
kevin
6a8e3761c3 Resolve merge conflicts 2022-04-08 09:54:17 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
stickler-ci
de6e3c6d55 Fixing style errors. 2022-04-06 13:19:34 +00:00
kevin
69eaf1e708 Rework some code 2022-04-06 14:59:18 +02:00
kevin
8be5cccb4e Reverse stock movements on mo consumed product 2022-04-06 12:32:10 +02:00
Laurent Destailleur
0fde73b4bc Merge pull request #20405 from elsp1991/fix/pmp_price_of_produced_prod_mrp
FIX MO produced product WAP calculation when MO is based on BOM (not free lines)
2022-03-24 14:29:33 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Laurent Destailleur
ef204b2620 Fix column conditions 2022-03-24 12:52:04 +01:00
Ilias Patsiaouras
b666ec2142 removing dead code free and bom lines are MO lines 2022-03-18 13:46:40 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/products.lang
2022-03-17 00:16:14 +01:00
Regis Houssin
193a073b16 FIX missing multientity managed 2022-03-11 11:18:09 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
John Livingston
1ece554c92 Fix: typo in template name
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
atm-lena
ce12442c36 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:22:41 +01:00
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
stickler-ci
cf2f2c283b Fixing style errors. 2022-02-21 09:17:20 +00:00
atm-lena
27c70466c2 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:14:19 +01:00
atm-lena
f177973efe Don't create Mo Child if it's only a product line on BOM 2022-02-21 10:13:25 +01:00
stickler-ci
e02b82e346 Fixing style errors. 2022-02-21 09:09:39 +00:00
atm-lena
0cbf374fa5 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:06:30 +01:00
atm-lena
c4a8bffa48 FIX Travis : global $db 2022-02-21 10:05:18 +01:00
stickler-ci
7e6a5d5792 Fixing style errors. 2022-02-17 10:13:30 +00:00
atm-lena
c2bc3b20bb Don't display collapse if no bom on bomline 2022-02-17 11:05:03 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
atm-lena
398927f2c8 Clean Code 2022-02-15 16:24:39 +01:00
atm-lena
382aaf8538 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 16:08:32 +01:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
stickler-ci
bbd0925c9e Fixing style errors. 2022-02-15 14:41:54 +00:00
atm-lena
452ec0bdfb WIP : search MOParent in MO List 2022-02-15 15:38:24 +01:00
atm-lena
c40b7afca2 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 15:04:02 +01:00
atm-lena
9e5d5a6295 WIP : fix fetch mo parent to create mo child 2022-02-15 15:03:21 +01:00
stickler-ci
26eb0fbf82 Fixing style errors. 2022-02-15 13:52:45 +00:00
atm-lena
81e75f401e Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 14:49:34 +01:00
atm-lena
2ba0af0d0b Parent MO List Mo : wip 2022-02-15 14:49:16 +01:00
stickler-ci
915a135c64 Fixing style errors. 2022-02-15 11:46:50 +00:00
atm-lena
1931ad3bab Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 12:43:42 +01:00
atm-lena
0f4b1e1d7a WIP 2022-02-15 11:46:30 +01:00
stickler-ci
b80e9a9bdc Fixing style errors. 2022-02-08 15:37:23 +00:00
atm-lena
27cbd16bb9 Clean code 2022-02-08 16:01:18 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
atm-lena
6a94a6ebac Ajout case à cocher "Générer OF Enfant" 2022-02-07 17:00:49 +01:00
atm-lena
f921c10e3a Gestion js : déroulement des sous bom 2022-02-07 16:28:58 +01:00