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
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

497 Commits

Author SHA1 Message Date
Laurent Destailleur
6cb6098d3c
Merge pull request #23818 from altairis-benjamin/discountOnBom 
FIX discount wasn't taken into account when adding a line in BOM
 2023-02-09 15:27:46 +01:00
Benjamin Falière
016d1117a6 added my name to the file 2023-02-06 18:02:28 +01:00
Benjamin Falière
fc767cbfbe FIX discount wasn't taken into account when adding a line in BOM 2023-02-06 17:56:21 +01:00
Laurent Destailleur
dd0f885765
Merge pull request #23217 from atm-lena/16.0_FIXBOM_CalculatePrice 
16.0 FIX Bom Calculate Price
 2023-01-13 20:43:55 +01:00
atm-lena
6dbffb5398 Add price() to pricetonum() on bomline view 2023-01-02 09:48:34 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
stickler-ci
48b4caaa70 Fixing style errors. 2022-12-19 09:41:39 +00:00
atm-lena
654b75de9f Merge branch '16.0_FIXBOM_CalculatePrice' of github.com:atm-lena/dolibarr into 16.0_FIXBOM_CalculatePrice 2022-12-19 10:40:17 +01:00
atm-lena
1ebd2135e0 Fix stickler error 2022-12-15 15:00:27 +01:00
stickler-ci
b597a43b21 Fixing style errors. 2022-12-14 08:37:30 +00:00
atm-lena
92bff0fcfb Missing Unit TD for sub-bom lines 2022-12-12 11:41:54 +01:00
atm-lena
7c352c9cef BOM : calculate total cost of lines 2022-12-09 17:00:11 +01:00
atm-lena
2c017d4f78 Clean 2022-09-15 16:04:32 +02:00
atm-lena
6a15962477 CalculateCosts function : add hook 2022-09-15 16:02:49 +02:00
Gauthier PC portable 024
4c15dafa14 Merge branch 'FIX/check_if_allowed_to_add_bom_as_bomline' of github.com:atm-gauthier/dolibarr into FIX/check_if_allowed_to_add_bom_as_bomline 2022-09-02 11:57:44 +02:00
Gauthier PC portable 024
360bfed601 FIX : return void 2022-09-02 11:57:29 +02:00
stickler-ci
21517cf578 Fixing style errors. 2022-09-02 08:33:27 +00:00
Gauthier PC portable 024
c28407a1c9 FIX : default value for bom_id with $this->id and protection against infinite loop 2022-09-02 10:28:19 +02:00
Gauthier PC portable 024
f1e98f2d35 Merge branch 'FIX/check_if_allowed_to_add_bom_as_bomline' of github.com:atm-gauthier/dolibarr into FIX/check_if_allowed_to_add_bom_as_bomline 2022-09-02 08:44:29 +02:00
Gauthier PC portable 024
1269e1b86e FIX : cast 2022-09-02 08:44:16 +02:00
stickler-ci
d4122278bd Fixing style errors. 2022-09-01 15:23:40 +00:00
Gauthier PC portable 024
e1bf5a5e6b FIX : Recursively retrieves all parent bom in the tree that leads to the $bom_id bom to check if we're allowed to add bom as bomline 2022-09-01 17:16:59 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
aba122a52b Debug v16 2022-06-11 21:47:00 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +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
a035449cc5 Debug v16 2022-06-01 19:53:13 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
Laurent Destailleur
168d1d4334
Merge pull request #20890 from Hystepik/develop#1 
Fix : php 8.0 warnings
 2022-05-20 19:41:20 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11: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
3056635aaf css 2022-03-24 14:04:03 +01:00
Laurent Destailleur
8f25477db6 Debug v16 2022-03-24 13:41:11 +01:00
Laurent Destailleur
a22d66b021 css 2022-03-24 13:31:03 +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
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +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
Laurent Destailleur
6e5c7358de
Merge branch 'develop' into NEW_Needs_net_tab_on_bom 2022-02-17 20:06:38 +01:00