Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-10 19:12:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
113,415 Commits 38 Branches 191 Tags
cabfc61ba3fb3f569d4d49ed89f2b3d32ec6b6d2
Commit Graph

168 Commits

Author SHA1 Message Date
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +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
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
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
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
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
Christian Humpel
29df21d768 Fix #21761 Remove dopple +1 on $ranktouse. 2022-08-16 22:25: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
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
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
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
3056635aaf css 2022-03-24 14:04:03 +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
13cfe858f2 Fixing style errors. 2022-02-17 09:53:02 +00:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
Adrien Raze
34d2e0b8b4 FIX : Fixed sub bom costs problems 2022-02-15 10:29:42 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
Laurent Destailleur
ffbeda50bd Better picto for collpase of sub-bom 2022-01-29 00:07:04 +01:00
Laurent Destailleur
d72538506f Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop 
NEW : Sub-bom
 2022-01-28 19:01:30 +01:00
stickler-ci
9342fa8781 Fixing style errors. 2022-01-26 14:15:53 +00:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
Adrien Raze
f37c04bc2f NEW : Add the possibility to add sub-BOMs to BOM 2022-01-25 12:06:40 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
5baba69970 Fix regressions 2021-10-28 15:05:50 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
0e1cc2b096 Fix cost price is 0. 2021-09-27 18:46:27 +02: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
45c5abea69 FIX calculateCosts of BOM must not be included into fetch 2021-09-20 15:29:55 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +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