Commit Graph

24972 Commits

Author SHA1 Message Date
Philippe GRAND
3c05cd0757 fix typo and translation 2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0 backward 2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3 fix typo and translation 2021-08-02 12:35:46 +02:00
Laurent Destailleur
d8a9a0cfb8 Merge pull request #18188 from frederic34/patch-11
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0 Merge pull request #18196 from FHenry/develop_addexport
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd Merge pull request #18200 from frederic34/notify
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
b67487b2ca Fix reposition 2021-07-31 17:28:43 +02:00
Laurent Destailleur
7eb8232b75 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
Laurent Destailleur
b332d02d20 Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel
NEW add agenda auto creation on supplier_order cancellation
2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615 Merge pull request #18288 from FHenry/14_deveventorg
NEW: EventOrganization Module #FoundationFunding
2021-07-31 16:57:07 +02:00
Laurent Destailleur
530a773eaa Merge pull request #18300 from cfoellmann/fix-tomail-field
fix `tomail` param in mail form usage
2021-07-31 16:55:01 +02:00
Laurent Destailleur
af95169d1d Update actions_sendmails.inc.php 2021-07-31 16:54:18 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
0c024ca96b Merge pull request #18297 from cfoellmann/hook-menu
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
9f293066ab Merge pull request #18206 from Hystepik/develop#2
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
58fa6ac4ab Merge pull request #18215 from netdrag/order_supplier_email_sender-patch-1
Order Supplier Email Sender Extension
2021-07-31 12:29:49 +02:00
Laurent Destailleur
04911bde25 Merge pull request #18277 from atm-florianm/FIX_forum_post_37369_wrong_conf_used
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-31 12:20:18 +02:00
Laurent Destailleur
9dc61adcc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-30 18:44:15 +02:00
Laurent Destailleur
9c626bede4 Fix dol_hash for sha256 2021-07-30 18:43:35 +02:00
Christian Foellmann
f830a0f5e2 fix tomail param in mail form usage 2021-07-30 15:20:41 +02:00
Laurent Destailleur
5995e01bd1 Merge pull request #18280 from ptibogxiv/patch-439
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6 fix hook name 2021-07-30 15:19:05 +02:00
stickler-ci
3ceb451734 Fixing style errors. 2021-07-30 11:19:18 +00:00
Christian Foellmann
0102e73306 add hook 'menu_LeftMenuArray' to filter the leftmenu items 2021-07-30 13:15:01 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Laurent Destailleur
0c3bf536f2 Fix field resolution 2021-07-30 01:10:15 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
ptibogxiv
da482018d2 Fix for php 8 2021-07-29 10:51:51 +02:00
Christian Foellmann
b9cb04d4b7 Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
atm-florian
fdd0ab8461 FIX $conf->task used but it does not exist, use $conf->projet instead 2021-07-28 23:56:44 +02:00
Josep Lluís
e7af8e9d5e FIX totalDayAll hours in tasks
The extra days hours were not considered in total hours
2021-07-28 19:40:33 +02:00
Frédéric FRANCE
ae5d17815f Update dolreceiptprinter.class.php 2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947 Merge pull request #18245 from frederic34/patch-12
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
Laurent Destailleur
d2311bcdeb Merge pull request #18234 from ptibogxiv/patch-432
fix for php 8
2021-07-28 19:36:13 +02:00
Laurent Destailleur
07c4c36520 Merge pull request #18271 from Hystepik/develop_v14#2
Fix a bug in ecm for v14
2021-07-28 19:16:33 +02:00
ptibogxiv
99e256a417 Update functions.lib.php 2021-07-28 18:22:26 +02:00
Josep Lluís
20add7d3fc FIX totalDayAll hours in tasks
The extra days hours were not considered in total hours
2021-07-28 18:02:55 +02:00
Laurent Destailleur
2b2c8f076b Merge pull request #18231 from ptibogxiv/patch-429
Fix for php 8
2021-07-28 17:37:07 +02:00
Laurent Destailleur
fe2d229ba9 Merge pull request #18235 from ptibogxiv/patch-433
Fix for php8
2021-07-28 17:35:01 +02:00
Laurent Destailleur
0476b36c6c Merge pull request #18238 from ptibogxiv/patch-436
Fix for php8
2021-07-28 17:29:54 +02:00
Laurent Destailleur
12a0029fb7 Merge pull request #18240 from ptibogxiv/patch-438
Fix for php 8
2021-07-28 17:28:49 +02:00
lmarcouiller
df8f099857 Fix a bug in ecm for v14 2021-07-28 15:57:12 +02:00
Laurent Destailleur
9dc45ac6ec Merge pull request #18251 from cfoellmann/improve-makeorder
Improve makeorder
2021-07-28 15:41:09 +02:00
kamel
b4ccb1b355 Corrections stickler-ci 2021-07-28 12:29:17 +02:00
kamel
2cd7513936 NEW: add link to a element by ref 2021-07-28 12:18:35 +02:00