314 Commits

Author	SHA1	Message	Date
Philippe GRAND	1ec7f640a7	FIX php8 compatibility	2022-08-28 13:40:32 +02:00
stickler-ci	8f336b1e50	Fixing style errors.	2022-08-24 10:20:16 +00:00
atm-lena	f5d7f66ca0	Ajout gestion fk_unit	2022-08-24 11:53:25 +02:00
atm-lena	6e5d395ac8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation	2022-08-24 11:38:19 +02:00
Laurent Destailleur	5ada158e03	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-08-22 13:20:10 +02:00
Christian Humpel	326c8762bb	Fix #21761 Correct numbering by adding/updating the BomLine and clean code.	2022-08-19 17:29:05 +02:00
stickler-ci	f0dd152f11	Fixing style errors.	2022-08-18 16:12:40 +00:00
Christian Humpel	17c5f30689	New #21774 extend REST with PUT and DELETE for BOM-Lines. Otherwise some changes for correct ranking of BOM-Lines.	2022-08-18 18:07:56 +02:00
atm-lena	9ec0c9963a	FIX : total cost line => bad convert	2022-08-17 10:26:25 +02:00
Laurent Destailleur	8c7c4d6408	Merge pull request #21750 from Humml87/15.0 ... NEW: Added "Get lines and Post lines from BOM" at the REST Service	2022-08-16 20:29:00 +02:00
Christian Humpel	10bd0b4cc5	Merge remote-tracking branch 'origin/15.0' into 15.0	2022-08-15 16:26:30 +02:00
Christian Humpel	91094d48e6	#21750 NEW: Added "Get lines and Post lines from BOM" at the REST Service	2022-08-15 16:25:42 +02:00
stickler-ci	015f179acb	Fixing style errors.	2022-08-15 13:19:16 +00:00
Christian Humpel	0576f31592	#21750 NEW: Added "Get lines and Post lines from BOM" at the REST Service	2022-08-15 15:18:08 +02:00
Christian Humpel	a204165018	#21750 NEW: Added "Get lines from BOM" at the REST Service	2022-08-14 15:58:49 +02:00
Christian Humpel	32fe761f01	NEW: Added "Get lines from BOM" at the REST Service	2022-08-14 12:55:48 +02:00
atm-lena	462352b957	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation	2022-07-29 12:06:43 +02:00
Laurent Destailleur	3da20beeb5	Fix warning	2022-07-28 18:06:37 +02:00
atm-lena	7f1a17bcc9	Change fk_unit service lines management	2022-07-20 15:38:37 +02:00
atm-lena	cc5a5e40d9	FIX	2022-07-12 14:56:25 +02:00
atm-lena	b5d2e0f4bc	Clean travis return	2022-07-12 12:23:23 +02:00
stickler-ci	a41dee9e06	Fixing style errors.	2022-07-12 08:09:45 +00:00
atm-lena	c068eebc43	Add function "convertDurationtoHour"	2022-07-12 10:03:31 +02:00
atm-lena	db5c5b9020	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation	2022-07-12 09:21:22 +02:00
atm-lena	d42d910c08	FIX Retours	2022-07-08 16:02:31 +02:00
atm-lena	7c82fc5da6	WIP	2022-07-08 10:04:16 +02:00
atm-lena	16415a1c92	Clean Code	2022-07-06 17:28:29 +02:00
atm-lena	503e2310ea	WIP	2022-07-06 16:51:50 +02:00
atm-lena	dadff083a4	Change unit dynamic	2022-07-06 16:17:22 +02:00
atm-lena	6925dc2ae1	Edit unit bom line service	2022-07-06 15:00:07 +02:00
atm-lena	55f0dada34	WIP	2022-07-06 13:55:43 +02:00
Laurent Destailleur	4c4e081997	Debug v16	2022-06-28 13:09:53 +02:00
Laurent Destailleur	cbead0fa5a	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/class/productbatch.class.php	2022-06-02 19:39:42 +02:00
jyhere	f582814c0f	Update bom.class.php	2022-06-02 09:46:26 +02:00
Laurent Destailleur	3751fc92ca	Clean code	2022-06-01 20:47:14 +02:00
Laurent Destailleur	0b9d4de20d	Fix warning	2022-05-31 14:20:59 +02:00
lmarcouiller	cf2c46b583	Fix : php 8.0 warnings	2022-05-18 12:31:09 +02:00
Laurent Destailleur	26c3e235cf	Merge pull request #19459 from frederic34/productmerge ... can merge products	2022-04-07 15:02:03 +02:00
Laurent Destailleur	a22d66b021	css	2022-03-24 13:31:03 +01:00
Frédéric FRANCE	b277ab9ee3	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-22 21:49:17 +01:00
Laurent Destailleur	6e5c7358de	Merge branch 'develop' into NEW_Needs_net_tab_on_bom	2022-02-17 20:06:38 +01:00
Adrien Raze	f16567a44a	Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_total_cost_for_sub_bom	2022-02-17 10:45:19 +01:00
Frédéric FRANCE	eb77f10d7b	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-15 19:11:24 +01:00
Frédéric FRANCE	a613553f37	Merge branch 'hookgetnomurl' into patch-1	2022-02-15 18:44:06 +01:00
Adrien Raze	34d2e0b8b4	FIX : Fixed sub bom costs problems	2022-02-15 10:29:42 +01:00
Quentin VIAL-GOUTEYRON	dd0202de47	fix comment doc	2022-02-10 10:46:04 +01:00
stickler-ci	7cf9448609	Fixing style errors.	2022-02-10 09:22:53 +00:00
Quentin VIAL-GOUTEYRON	9e667e0155	NEW Needed nets bom	2022-02-09 15:55:21 +01:00
Laurent Destailleur	902246e50b	Fix phpcs	2022-01-31 14:05:30 +01:00
stickler-ci	9342fa8781	Fixing style errors.	2022-01-26 14:15:53 +00:00