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
|
1b5636ff66
|
Fix stickler
|
2022-09-08 11:58:18 +02:00 |
|
atm-lena
|
8152e3f82a
|
Clean code
|
2022-09-08 11:43:48 +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 |
|
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 |
|
Frédéric France
|
8e66b7207e
|
replace ! empty by !empty
|
2022-08-31 22:14:20 +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
|
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 |
|
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 |
|
Adrien Raze
|
36068d4279
|
FIX : Fixing total errors
|
2022-01-26 14:41:36 +01:00 |
|
ptibogxiv
|
61e6e33387
|
FIX bom.class.php
|
2022-01-11 20:37:20 +01:00 |
|
Laurent Destailleur
|
564bae453e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-01-10 21:00:38 +01:00 |
|
Laurent Destailleur
|
c334c3cd58
|
Update bom.class.php
|
2022-01-10 20:58:08 +01:00 |
|
Florian HENRY
|
f5c04c81a9
|
Merge branch 'new_refproduct_bom_tooltip' of github.com:FHenry/dolibarr into new_refproduct_bom_tooltip
|
2022-01-07 08:28:40 +01:00 |
|
Florian HENRY
|
59b1feaf2e
|
fix include
|
2022-01-07 08:27:49 +01:00 |
|
stickler-ci
|
f71092e05c
|
Fixing style errors.
|
2022-01-06 20:56:51 +00:00 |
|
Florian HENRY
|
a0fb0b8741
|
NEW: add ref product into BOM tooltips
|
2022-01-06 21:48:12 +01:00 |
|
Frédéric FRANCE
|
c56f180515
|
can merge products but experimental
|
2021-11-23 21:52:40 +01:00 |
|
Frédéric FRANCE
|
dc3bfcfb87
|
can modify tooltip by reference
|
2021-11-22 19:57:26 +01:00 |
|
Laurent Destailleur
|
c90af50585
|
Merge branch 'develop' into NEW_develop_sub_BOM
|
2021-09-24 13:39:20 +02:00 |
|
Laurent Destailleur
|
deb1965cd5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
|
2021-09-20 17:15:12 +02:00 |
|
Laurent Destailleur
|
1e735c48aa
|
Code comment
|
2021-09-20 15:31:57 +02:00 |
|
Laurent Destailleur
|
45c5abea69
|
FIX calculateCosts of BOM must not be included into fetch
|
2021-09-20 15:29:55 +02:00 |
|
Laurent Destailleur
|
ee362a42bd
|
css
|
2021-09-19 21:06:09 +02:00 |
|
Laurent Destailleur
|
62b721a904
|
Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
|
2021-09-18 19:34:46 +02:00 |
|
Laurent Destailleur
|
97bb04c5b0
|
Merge branch 'develop' into NEW_develop_sub_BOM
|
2021-09-18 16:31:51 +02:00 |
|
Laurent Destailleur
|
8909702619
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
|
2021-09-16 13:40:05 +02:00 |
|
Laurent Destailleur
|
b1cb32c743
|
Fix some sql
|
2021-09-15 20:03:38 +02:00 |
|
Laurent Destailleur
|
b04ea59a51
|
More sql sanitizing
|
2021-09-02 13:58:42 +02:00 |
|
Laurent Destailleur
|
a8f4eef0f6
|
Merge pull request #18445 from erikvanberkum/develop
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
|
2021-08-28 18:40:54 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Erik van Berkum
|
a0dc6ca394
|
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. Adjusted visible to -2
|
2021-08-24 23:12:04 +09:00 |
|
Adrien Raze
|
6de7d9b0af
|
NEW : Add sub-BOM lines on BOM card
|
2021-08-20 13:37:28 +02:00 |
|
Erik van Berkum
|
e570c22398
|
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
|
2021-08-19 17:09:18 +09:00 |
|
Laurent Destailleur
|
5853aa4c1e
|
Look and feel v14
|
2021-07-04 20:08:34 +02:00 |
|
Laurent Destailleur
|
594f7c8e9e
|
Fix code for v14
|
2021-06-24 09:54:30 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
1e657b8621
|
Fix value of showoncombobox
|
2021-06-05 15:14:10 +02:00 |
|
Laurent Destailleur
|
f655cab5eb
|
Clean code
|
2021-05-06 21:11:39 +02:00 |
|
Laurent Destailleur
|
655056ed31
|
Debug v14
|
2021-04-29 12:10:55 +02:00 |
|
Laurent Destailleur
|
a8c34a5b05
|
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
MAIN_EXTRAFIELDS_DISABLE_SELECT2
|
2021-03-15 14:16:55 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
lmarcouiller
|
c00d64855a
|
Fix #16524 : Add support disassemble BOM
|
2021-03-05 09:47:38 +01:00 |
|
Frédéric FRANCE
|
3c8089af0d
|
code syntax bom directory
|
2021-02-23 17:51:46 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
3588781180
|
Debug v13
|
2020-11-26 14:15:20 +01:00 |
|
Frédéric FRANCE
|
154f0c7e8d
|
doxygen
|
2020-11-24 21:28:57 +01:00 |
|
Laurent Destailleur
|
d9f66e95b5
|
Fix missing field
|
2020-11-13 10:26:16 +01:00 |
|