Commit Graph

457 Commits

Author SHA1 Message Date
Laurent Destailleur
7a277d9560 Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
UT from dolibit
e6b5ef99a9 Update card.php 2022-09-08 19:47:17 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +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
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Philippe GRAND
1ab949b3c4 update code 2022-08-31 21:48:32 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
72a0725fec Fix phpcs 2022-08-25 13:52:30 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
4fb3a2e296 Fix scrutinizer 2022-08-11 00:52:08 +02:00
Laurent Destailleur
78ee02408e Merge pull request #21431 from fboitel/NEW-recursive-envents
NEW : Recurrent events on agenda v1
2022-07-27 11:01:26 +02:00
Faustin
1f9afaadb1 Removing daily event for the moment 2022-07-20 13:08:28 +02:00
Faustin
87b80912df merge 2022-07-19 20:42:53 +02:00
Laurent Destailleur
75b8246578 Merge branch 'develop' into NEW-recursive-envents 2022-07-19 19:40:48 +02:00
lvessiller
6aade2e506 NEW hook formConfirm on action comm card 2022-07-13 11:19:07 +02:00
Laurent Destailleur
1cbeaf6ac0 Fix php8 2022-07-11 20:05:49 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +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
Faustin
572f1f0fee NEW : Recurrent events on agenda v2 2022-07-07 00:07:15 +02:00
Faustin
259224c3be NEW : Recurrent events on agenda v1 2022-07-02 18:48:35 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
BENKE Charlene
35a1f9ac4b php V8 warning 2022-05-27 16:30:26 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
0d7386ab89 Fix select projet on event creation 2022-05-21 01:23:39 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
106e3072dc Update card.php 2022-04-01 13:20:40 +02:00
Florian HENRY
e7db103b57 fix: on update with action reminder in future there is user key error 2022-03-31 18:55:54 +02:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Florian HENRY
a028e795f7 add missing colspan 2022-03-16 13:54:21 +01:00
Florian HENRY
801402f46a fix: #20267 2022-03-04 11:58:52 +01:00
Laurent Destailleur
271e9da425 Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event 2022-02-11 15:15:50 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Laurent Destailleur
254ed31fb1 Fix combo 2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149 Clean code 2022-01-17 22:52:56 +01:00
Laurent Destailleur
9d067d74ab Fix responsive 2022-01-17 17:51:03 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0 Fix responsive 2022-01-02 13:51:30 +01:00
Laurent Destailleur
a7d4aa9fb3 Responsive 2022-01-02 12:49:15 +01:00
Laurent Destailleur
e2e2e69379 Fix bad link 2021-12-19 03:54:04 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +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