Commit Graph

7774 Commits

Author SHA1 Message Date
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
2022-07-28 02:36:57 +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
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
aaee8ff0ca Debug v16 2022-07-25 18:03:07 +02:00
Florian HENRY
266b0213a5 fix: filter Status Not applicable into is not correctly manage on Agenda list 2022-07-25 13:18:03 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
2022-07-24 22:17:25 +02:00
Laurent Destailleur
25d01b2be5
Merge pull request #21502 from Easya-Solutions/new-comm-action-card-hook-formconfirm
NEW hook formConfirm on action comm card
2022-07-24 20:23:40 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
lmarcouiller
eb38875119 Fix : PHP 8.1 warnings 2022-07-20 16:35:51 +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
comaiteseb
877ed17d4c
Merge branch 'Dolibarr:15.0' into 15.0 2022-07-19 15:35:21 +02:00
comaiteseb
888328b03b
FIX issue Dolibarr#21495 for v15
FIX #21495

Error when calculate the date when AGENDA_EXPORT_FIX_TZ is set.
The resulting date is 1969-12-31
2022-07-19 15:31:29 +02:00
Regis Houssin
7db5f7eb1c FIX regression + add $forceentity parameter 2022-07-18 19:26:13 +02:00
Regis Houssin
ade854a469 FIX security breach if we have same ref number in multiple entities 2022-07-18 16:48:53 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
71045cbe83 Fix popup message 2022-07-13 14:00:19 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
lvessiller
6aade2e506 NEW hook formConfirm on action comm card 2022-07-13 11:19:07 +02:00
comaiteseb
f2a294965a Update actioncomm.class.php
FIX issue #21495
2022-07-12 18:44:21 +02:00
Laurent Destailleur
5ac0cfb39d
Merge pull request #21496 from comaiteseb/develop
Update actioncomm.class.php
2022-07-12 18:42:28 +02:00
Laurent Destailleur
eeb967b540 Fix missing link to invoice 2022-07-12 11:59:33 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
comaiteseb
4b5b0bd163
Update actioncomm.class.php
FIX issue #21495
2022-07-11 21:25:49 +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
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +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
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action
FIX default to create on card.php if $action is empty
2022-07-10 18:50:48 +02:00
Laurent Destailleur
ca3cf1de9f NEW Add " as enclusore by default for CSV export. Keep removing CR/LF.
Fix export of invoice.
2022-07-10 02:25:46 +02:00
Laurent Destailleur
547a7cdea2 Fix trans 2022-07-10 01:18:06 +02:00
Laurent Destailleur
5e54639749 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 10:23:47 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
8360ea9711 Fix hide link to doc if doc never generated 2022-07-08 00:20:33 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650
NEW #20650 Checkbox column on left for lists
2022-07-07 21:48:51 +02:00
Faustin
572f1f0fee NEW : Recurrent events on agenda v2 2022-07-07 00:07:15 +02:00
Christian Foellmann
1a31704e18 remove old commented code 2022-07-06 19:20:04 +02:00
Laurent Destailleur
daf8c0ff1e Cherry pick 2022-07-06 19:19:47 +02:00
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles
fix page titles
2022-07-06 15:55:10 +02:00
Laurent Destailleur
b4c2a5a6f4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-06 15:48:35 +02:00
Laurent Destailleur
a644504faf
Merge pull request #21429 from OPEN-DSI/develop_new_add_option_keep_old_signature_info_on_propal
NEW: Add new global variable for keeping the previous signature information on proposale
2022-07-06 13:33:13 +02:00
Laurent Destailleur
f6b0710baf FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 21:04:24 +02:00
Laurent Destailleur
5e451e1155 FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 20:59:42 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00