Christian Humpel
|
78b12c8298
|
Fix: #23415 correct numbering on 'ref'.
|
2023-01-04 16:33:39 +01:00 |
|
Laurent Destailleur
|
43a0ccce2b
|
Clean code
|
2023-01-04 11:37:24 +01:00 |
|
Laurent Destailleur
|
268f0b7c36
|
Merge pull request #23375 from grandoc/new_branch_30_12_2022
update code toward php8 compliance
|
2023-01-04 08:33:25 +01:00 |
|
atm-lena
|
6dbffb5398
|
Add price() to pricetonum() on bomline view
|
2023-01-02 09:48:34 +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 |
|
Laurent Destailleur
|
54936c916c
|
Fix MO hang when no thirdparties are set
|
2022-12-30 13:27:12 +01:00 |
|
Philippe GRAND
|
4c51b2bb6b
|
update code toward php8 compliance
|
2022-12-30 12:43:57 +01:00 |
|
Philippe GRAND
|
f6765fcd98
|
update code toward php8 compliance
|
2022-12-30 12:43:12 +01:00 |
|
Philippe GRAND
|
e5f08f6984
|
update code toward php8 compliance
|
2022-12-30 12:07:05 +01:00 |
|
Philippe GRAND
|
5b94ee35da
|
update code toward php8 compliance
|
2022-12-30 12:04:55 +01:00 |
|
Laurent Destailleur
|
9319f56599
|
Fix css
|
2022-12-30 03:10:37 +01:00 |
|
Laurent Destailleur
|
a37c74374d
|
Merge pull request #23340 from Easya-Solutions/new-agenda-event-new-url-percentage-default
NEW remove default percentage for event creation url
|
2022-12-27 14:47:06 +01:00 |
|
VESSILLER
|
144a7e01b4
|
NEW remove default percentage for event creation url
|
2022-12-26 14:33:30 +01:00 |
|
Frédéric FRANCE
|
a08d84b995
|
fix code
|
2022-12-23 14:11:13 +01:00 |
|
Frédéric France
|
637fc95265
|
clean code
|
2022-12-22 22:29:24 +01:00 |
|
Laurent Destailleur
|
91f725447a
|
Merge pull request #23305 from lamrani002/kanbanBomList
New mode view "Kanban" for BOM list
|
2022-12-21 20:46:05 +01:00 |
|
Lamrani Abdel
|
cfced376ef
|
New mode view for BOM list
|
2022-12-21 18:18:38 +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 |
|
Laurent Destailleur
|
3b87aadc48
|
Debug v17
|
2022-12-16 12:59:47 +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 |
|
stickler-ci
|
d522e96744
|
Fixing style errors.
|
2022-12-05 11:33:44 +00:00 |
|
atm-lena
|
816fea753e
|
Extrafields BomLine
|
2022-12-05 12:30:26 +01:00 |
|
Maxime Kohlhaas
|
eb7222227d
|
Fix : use count() in lists - part 3
|
2022-11-26 01:53:18 +01:00 |
|
Faustin
|
fadc54b9dc
|
checkbox colum on left for bom list
|
2022-11-19 16:43:02 +01:00 |
|
lmarcouiller
|
bbebdbb840
|
Fix php 8.1 warnings
|
2022-10-28 15:48:46 +02:00 |
|
Laurent Destailleur
|
221b2dc288
|
Standardize code
|
2022-10-10 10:46:46 +02:00 |
|
Laurent Destailleur
|
bdeac7b7ab
|
Merge pull request #22185 from dolibit-ut/patch-555
Update bom_note.php
|
2022-09-25 17:14:28 +02:00 |
|
Laurent Destailleur
|
259ef24cef
|
Merge pull request #22189 from dolibit-ut/patch-559
Update bom_card.php
|
2022-09-25 17:14:18 +02:00 |
|
Laurent Destailleur
|
3e8d1181fe
|
Merge pull request #22401 from aspangaro/17p6
Use isModEnabled
|
2022-09-25 17:03:42 +02:00 |
|
Alexandre SPANGARO
|
d06fef47f8
|
Use isModEnabled
|
2022-09-25 15:28:36 +02:00 |
|
Alexandre SPANGARO
|
c674f00cb2
|
Use isModEnabled
|
2022-09-25 15:27:42 +02:00 |
|
Laurent Destailleur
|
2fddba4a3b
|
Merge pull request #22186 from dolibit-ut/patch-556
Update bom_net_needs.php
|
2022-09-25 14:48:52 +02:00 |
|
Laurent Destailleur
|
5e4e3265a3
|
Merge pull request #22187 from dolibit-ut/patch-557
Update bom_list.php
|
2022-09-25 14:48:32 +02:00 |
|
Laurent Destailleur
|
3adb60660c
|
Merge branch 'develop' into patch-559
|
2022-09-25 14:33:36 +02:00 |
|
Laurent Destailleur
|
58e96a1db8
|
Merge pull request #22188 from dolibit-ut/patch-558
Update bom_document.php
|
2022-09-25 14:27:37 +02:00 |
|
Laurent Destailleur
|
b3e0fddb1b
|
Merge pull request #22190 from dolibit-ut/patch-560
Update bom_agenda.php
|
2022-09-25 14:27:16 +02:00 |
|
Alexandre SPANGARO
|
aec9a7a60d
|
Use isModEnabled
|
2022-09-25 06:30:09 +02:00 |
|
Laurent Destailleur
|
388dd6395b
|
Clean code
|
2022-09-22 14:06:50 +02:00 |
|
Laurent Destailleur
|
6fb9a4713c
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-09-21 01:30:40 +02:00 |
|
atm-lena
|
5843cc8cb6
|
Bom services : fix calcul of cost for line without workstation
|
2022-09-16 11:11:20 +02: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 |
|
Laurent Destailleur
|
6cf5c51f0b
|
Fix phpunit
|
2022-09-13 02:33:49 +02:00 |
|
Laurent Destailleur
|
d911f13ca0
|
Update ajax.php
|
2022-09-13 01:40:37 +02:00 |
|
Laurent Destailleur
|
7dbde6f934
|
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation
|
2022-09-13 01:38:49 +02:00 |
|
Laurent Destailleur
|
69fbd6be40
|
Merge branch 'develop' into patch-511
|
2022-09-13 01:32:48 +02:00 |
|
UT from dolibit
|
2acfa41b16
|
Update bom_card.php
|
2022-09-11 10:20:51 +02:00 |
|
UT from dolibit
|
181ad927a4
|
Update bom_agenda.php
|
2022-09-10 20:59:06 +02:00 |
|
UT from dolibit
|
8c9159ae04
|
Update bom_card.php
|
2022-09-10 20:54:24 +02:00 |
|
UT from dolibit
|
a7fff0be48
|
Update bom_document.php
|
2022-09-10 20:50:00 +02:00 |
|
UT from dolibit
|
ee8ea00a5b
|
Update bom_list.php
|
2022-09-10 20:44:08 +02:00 |
|
UT from dolibit
|
8c3c817b23
|
Update bom_net_needs.php
|
2022-09-10 20:30:48 +02:00 |
|
UT from dolibit
|
231270d781
|
Update bom_note.php
|
2022-09-10 20:27:25 +02:00 |
|
Laurent Destailleur
|
6b3095ae9a
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-09-08 14:10:28 +02:00 |
|
atm-lena
|
6c0f5d3e64
|
Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation
|
2022-09-08 11:59:45 +02:00 |
|
atm-lena
|
1b5636ff66
|
Fix stickler
|
2022-09-08 11:58:18 +02:00 |
|
stickler-ci
|
d0429ad8a1
|
Fixing style errors.
|
2022-09-08 09:48:48 +00:00 |
|
atm-lena
|
8152e3f82a
|
Clean code
|
2022-09-08 11:43:48 +02:00 |
|
atm-lena
|
444ba4bf46
|
FIX Returns
|
2022-09-08 11:40:40 +02:00 |
|
atm-lena
|
81ed97e9fc
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
|
2022-09-08 11:21:05 +02:00 |
|
Laurent Destailleur
|
83bb78f981
|
Merge pull request #22045 from frederic34/pr/grandoc/22009
Pr/grandoc/22009
|
2022-09-03 11:39:39 +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 |
|
Frédéric FRANCE
|
9150f5102e
|
Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009
|
2022-09-02 11:44:45 +02:00 |
|
Laurent Destailleur
|
0cbd1d7d9f
|
Merge pull request #22041 from dolibit-ut/patch-510
Update bom_agenda.php
|
2022-09-02 11:39:54 +02:00 |
|
stickler-ci
|
21517cf578
|
Fixing style errors.
|
2022-09-02 08:33:27 +00:00 |
|
UT from dolibit
|
db7bb77d03
|
Update bom_card.php
|
2022-09-02 10:31:56 +02: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 |
|
UT from dolibit
|
e450d464aa
|
Update bom_agenda.php
|
2022-09-02 10:26:30 +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 |
|
Frédéric France
|
8e66b7207e
|
replace ! empty by !empty
|
2022-08-31 22:14:20 +02:00 |
|
Philippe GRAND
|
04679ac000
|
update code
|
2022-08-31 21:47:33 +02:00 |
|
Philippe GRAND
|
4dbb6cfa6e
|
update code
|
2022-08-31 21:47:03 +02:00 |
|
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
|
ab2b445b53
|
FIX accolade et gestion fk_unit
|
2022-08-24 12:15:28 +02:00 |
|
atm-lena
|
44caf380cf
|
Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation
|
2022-08-24 11:56:04 +02:00 |
|
atm-lena
|
f5d7f66ca0
|
Ajout gestion fk_unit
|
2022-08-24 11:53:25 +02:00 |
|
stickler-ci
|
1a15582c49
|
Fixing style errors.
|
2022-08-24 09:43:48 +00: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 |
|
Frédéric France
|
582f6b196e
|
use isModEnabled
|
2022-08-23 20:02:37 +02:00 |
|
Frédéric France
|
4bef0f5745
|
use isModEnabled
|
2022-08-23 20:01:34 +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 |
|
Christian Humpel
|
e1de08467b
|
Merge branch 'Dolibarr:develop' into develop_#21761
|
2022-08-19 14:17:01 +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 |
|
stickler-ci
|
115a2cdc9e
|
Fixing style errors.
|
2022-08-17 22:02:20 +00:00 |
|
Christian Humpel
|
9db7c210df
|
Merge branch 'develop_HUSCH' into develop_#21761
|
2022-08-18 00:01:37 +02:00 |
|
stickler-ci
|
01d7f558ba
|
Fixing style errors.
|
2022-08-17 09:11:09 +00:00 |
|
Christian Humpel
|
474d82b19c
|
Clean Code: Remove duplicate code form bom_card.php
|
2022-08-17 11:02:26 +02:00 |
|
atm-lena
|
9ec0c9963a
|
FIX : total cost line => bad convert
|
2022-08-17 10:26:25 +02:00 |
|
Christian Humpel
|
29df21d768
|
Fix #21761 Remove dopple +1 on $ranktouse.
|
2022-08-16 22:25:52 +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
|
c66489e2e0
|
Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation
|
2022-07-21 14:34:14 +02:00 |
|
atm-lena
|
e4ec999b45
|
Retour stickler
|
2022-07-21 14:33:50 +02:00 |
|
stickler-ci
|
9ef883e7b0
|
Fixing style errors.
|
2022-07-20 13:42:33 +00: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
|
6564333e55
|
Change sjquery on select2
|
2022-07-12 09:16:52 +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 |
|
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
|
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 |
|