Laurent Destailleur
|
370965a0bb
|
Rename build_path_from_id_categ into buildPathFromId and set it private
|
2022-04-06 13:30:56 +02:00 |
|
Laurent Destailleur
|
143660799b
|
Clean code using dolGetFirstLineOfText()
|
2022-03-16 21:22:03 +01:00 |
|
Laurent Destailleur
|
97ed94fbda
|
NEW Support html content for multiselect component.
|
2022-02-21 16:54:07 +01:00 |
|
Laurent Destailleur
|
69730838f4
|
Merge pull request #20061 from Hystepik/develop#2
Close #19930 : tag management in KM list
|
2022-02-17 19:32:59 +01:00 |
|
Frédéric FRANCE
|
c8640f329e
|
add missing global
|
2022-02-15 18:31:05 +01:00 |
|
Frédéric FRANCE
|
0ba912b1e5
|
add missing global
|
2022-02-15 18:14:44 +01:00 |
|
Frédéric FRANCE
|
71d2d6194f
|
Update categorie.class.php
|
2022-02-15 11:06:49 +01:00 |
|
lmarcouiller
|
a3c1c707a4
|
Close #19930 : tag management in KM list
|
2022-02-14 12:09:57 +01:00 |
|
Laurent Destailleur
|
a887e41600
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/compta/bank/info.php
htdocs/compta/bank/line.php
htdocs/compta/bank/releve.php
htdocs/compta/bank/various_payment/card.php
htdocs/fourn/class/fournisseur.product.class.php
|
2022-01-04 09:45:31 +01:00 |
|
Laurent Destailleur
|
807f2841d4
|
FIX Navigation on bank transaction list
|
2022-01-04 09:33:52 +01:00 |
|
Laurent Destailleur
|
f7871be6cd
|
Debug v15
|
2022-01-03 03:06:18 +01:00 |
|
Laurent Destailleur
|
108df3726a
|
Fix php syntax
|
2021-12-30 18:46:26 +01:00 |
|
Laurent Destailleur
|
0387b9922e
|
FIX error message on sqlfilter in API
|
2021-12-20 20:49:32 +01:00 |
|
Laurent Destailleur
|
69cd7ae2ab
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
|
2021-12-08 18:27:03 +01:00 |
|
Laurent Destailleur
|
c3bfd5caa4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
|
2021-12-08 18:21:20 +01:00 |
|
Laurent Destailleur
|
f1dac82a53
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
|
2021-12-08 17:56:05 +01:00 |
|
Quentin VIAL-GOUTEYRON
|
826bde0656
|
FIX set optional from post
|
2021-12-06 11:19:12 +01:00 |
|
Laurent Destailleur
|
a298a845f1
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
|
2021-11-30 16:24:18 +01:00 |
|
Laurent Destailleur
|
c41578a3c3
|
Fix php compatibility
|
2021-11-28 15:43:22 +01:00 |
|
Laurent Destailleur
|
441af6b6fb
|
Fix add rel="noopener noreferrer"
|
2021-11-22 02:35:55 +01:00 |
|
Laurent Destailleur
|
ae103f20ca
|
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
Fix introduced scrutinizer
|
2021-10-31 17:37:31 +01:00 |
|
Laurent Destailleur
|
df5b2b6728
|
Update viewcat.php
|
2021-10-31 17:36:56 +01:00 |
|
Laurent Destailleur
|
d891dd8ddc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
|
2021-10-31 16:19:10 +01:00 |
|
Florian HENRY
|
96f08082a2
|
fix: getFilterSelectQuery get correct table
|
2021-10-26 18:25:49 +02:00 |
|
Scrutinizer Auto-Fixer
|
5567310e44
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2021-10-25 20:07:31 +00:00 |
|
Florian HENRY
|
fddcaf6945
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_introduced_scrutinizer
|
2021-10-25 21:45:08 +02:00 |
|
Florian HENRY
|
8803fe64dc
|
fix scrutinizer
|
2021-10-25 21:45:00 +02:00 |
|
Laurent Destailleur
|
5d6ba8a2d5
|
Merge pull request #19157 from frederic34/patch-4
replace deprecated
|
2021-10-24 00:38:15 +02:00 |
|
Frédéric FRANCE
|
993226000a
|
Update viewcat.php
|
2021-10-23 22:39:27 +02:00 |
|
Laurent Destailleur
|
a503a4dcc6
|
Fix scrutinizer
|
2021-10-23 22:12:57 +02:00 |
|
Frédéric FRANCE
|
3a7ae07896
|
replace deprecated
|
2021-10-23 21:21:16 +02:00 |
|
Laurent Destailleur
|
98f1637e0f
|
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories
Fix link object to categories
|
2021-10-23 11:21:41 +02:00 |
|
Laurent Destailleur
|
4b83affa2c
|
Merge pull request #19107 from evarisk-theo/fix-error-return-after-assigning-category
fix: error return when adding a category to an object
|
2021-10-22 19:11:20 +02:00 |
|
stickler-ci
|
070a03724a
|
Fixing style errors.
|
2021-10-22 15:46:16 +00:00 |
|
Theo
|
03030685f6
|
add: quick link categories to account
|
2021-10-22 17:15:51 +02:00 |
|
Theo
|
f4a48e46ff
|
add: quick link categories to user
|
2021-10-22 16:54:31 +02:00 |
|
Theo
|
d5fc28f9b5
|
add: quick link categories to contacts
|
2021-10-22 16:46:55 +02:00 |
|
Theo
|
a36c966f15
|
add: quick link categories to adherent
|
2021-10-22 16:13:54 +02:00 |
|
Theo
|
29f847c13a
|
add: quick link categories to project
|
2021-10-22 15:48:39 +02:00 |
|
Theo
|
311522bf04
|
fix: error return when adding a category to an object
|
2021-10-22 15:33:57 +02:00 |
|
Laurent Destailleur
|
ce1880b12d
|
Merge pull request #19090 from evarisk-theo/fix-delete-categories-when-linked-to-some-objects
Fix: can't delete categories when linked to some objects
|
2021-10-22 11:32:39 +02:00 |
|
Theo
|
0d868aa0d9
|
Fix: can't delete categories when linked to some objects
|
2021-10-22 11:14:04 +02:00 |
|
Laurent Destailleur
|
6c870bb3d1
|
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
fix: scrutinizer
|
2021-10-21 22:52:20 +02:00 |
|
Florian HENRY
|
96722d55ef
|
fix scrutinzer
|
2021-10-21 19:13:05 +02:00 |
|
Florian HENRY
|
2e260d75d9
|
fix: scrutinizer
|
2021-10-21 15:57:54 +02:00 |
|
Laurent Destailleur
|
f8010dfcbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
|
2021-10-16 13:01:03 +02:00 |
|
lvessiller
|
be4a00213c
|
FIX optional visibility on create card
|
2021-10-08 15:58:08 +02:00 |
|
Laurent Destailleur
|
d064ab2b17
|
Add more action to GET action to check
|
2021-10-02 12:58:15 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Laurent Destailleur
|
5c8fb38426
|
Fix add del* action into list of sensitive actions
|
2021-09-19 14:41:46 +02:00 |
|