Commit Graph

101271 Commits

Author SHA1 Message Date
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
f73394435e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expensereport/card.php
	htdocs/societe/list.php
2021-07-31 16:32:24 +02:00
Laurent Destailleur
9811569b2b FIX #18289 #18294 2021-07-31 16:22:50 +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
1e8f27975d
Merge pull request #18207 from dolibit-ut/patch-363
Update llx_20_c_departements.sql
2021-07-31 13:30:53 +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
6f5e412bd5
Merge pull request #18299 from Hystepik/develop_v14#3
Fix error in website module -> sitemap v14
2021-07-31 12:15:42 +02:00
Laurent Destailleur
8e068f1018
Merge pull request #18301 from leninrivas/patch-3
tva change too in facture
2021-07-31 12:14:44 +02:00
Lenin Rivas
5339154654
tva change too in facture 2021-07-30 17:47:05 -05: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
Laurent Destailleur
0f191e57f4
Merge pull request #18281 from cfoellmann/extend-getElementList-hook
extend the hook `getElementList` to make $ids in the hooked function
2021-07-30 15:20:25 +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
lmarcouiller
0d70c81897 ix error in website module -> sitemap 2021-07-30 15:16:38 +02:00
Laurent Destailleur
a9f5fd497a
Merge pull request #18291 from FHenry/14_fix_add_missing_hook_translationproductpage
fix: add hook management into product translation tab
2021-07-30 15:07:01 +02:00
Laurent Destailleur
252cfb8207
Merge pull request #18298 from ATM-Consulting/FIX_admin_pdf_page_saving_resets_all_boolean_consts
FIX: on admin/pdf.php (with javascript enabled) if you set some boole…
2021-07-30 14:59:30 +02:00
atm-florian
63898426d2 FIX: on admin/pdf.php (with javascript enabled) if you set some boolean confs then click on "save", all boolean values are reset 2021-07-30 13:36:54 +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
Florian HENRY
8ea6fc3174 fix: add hook management into product translation tab 2021-07-30 09:38:29 +02:00
Laurent Destailleur
57d637ac71 Fix set status of a ticket 2021-07-30 01:49:43 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Laurent Destailleur
593e84906b FIX bad closing div on error message 2021-07-30 01:16:04 +02:00
Laurent Destailleur
0c3bf536f2 Fix field resolution 2021-07-30 01:10:15 +02:00
Laurent Destailleur
9954a0e4bb Fix status of tickets 2021-07-30 00:40:06 +02:00
Laurent Destailleur
26a7130376 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-29 23:48:28 +02:00
Laurent Destailleur
f02dee2e21 Fix test on missing install.lock 2021-07-29 23:47:59 +02:00
Christian Foellmann
b5c30126cb extend the hook getElementList to make $ids in the hooked function 2021-07-29 14:49:41 +02:00
ptibogxiv
da482018d2
Fix for php 8 2021-07-29 10:51:51 +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
Laurent Destailleur
50f3960d80
Merge pull request #18276 from fappels/14_fix_update_product_lot
FIX update product lot
2021-07-28 23:01:02 +02:00
Laurent Destailleur
583f1ccc1a
Merge pull request #18243 from Robin-Yann/13-hook
13 - add hook product part
2021-07-28 22:46:20 +02:00
Francis Appels
f6d03fe28e Fix update product lot 2021-07-28 21:45:11 +02:00
Laurent Destailleur
9734fced56
Merge pull request #18221 from aspangaro/14p8
FIX: Accountancy - Search date on journal
2021-07-28 19:48:38 +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
e406d80338
Merge pull request #18233 from ptibogxiv/patch-431
fix for php8
2021-07-28 19:37:00 +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
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf
fix: expense report line, on update qty must/can be decimal
2021-07-28 19:31:16 +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
Laurent Destailleur
20217806c6
Merge pull request #18227 from Hystepik/develop_v13#1
Fix #18185 : Filter fk_stcomm fixed
2021-07-28 19:11:04 +02:00
Laurent Destailleur
fea4210570
Merge pull request #18272 from laurantines/patch-3
Fix opp status required even if PROJECT_USE_OPPORTUNITIES off
2021-07-28 18:57:03 +02:00
Laurent Destailleur
78a28e884d
Merge pull request #18274 from joseplluis/patch-9
FIX totalDayAll hours in tasks
2021-07-28 18:53:32 +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
57b18a6bed
Merge pull request #18218 from aspangaro/14p6
Security
2021-07-28 17:55:54 +02:00