Commit Graph

111141 Commits

Author SHA1 Message Date
lmarcouiller
1e282aaded FIX : js injection in stockmovement.php 2022-07-25 10:49:19 +02:00
Laurent Destailleur
3262426b84 Trans 2022-07-25 08:59:01 +02:00
Laurent Destailleur
6d3059d2a8 Add type ip 2022-07-24 22:20:41 +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
747c10f2ac Css 2022-07-24 22:14:11 +02:00
Laurent Destailleur
f024dcdb1a Doc 2022-07-24 22:13:36 +02:00
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field
NEW Can use products categories to make inventory
2022-07-24 22:06:55 +02:00
Laurent Destailleur
adde84a508
Merge pull request #21232 from defrance/patch-207
php V8 warning
2022-07-24 20:32:22 +02:00
Laurent Destailleur
d622bfd774
Update modulehelp.php 2022-07-24 20:32:06 +02:00
Laurent Destailleur
db0ef784cd
Merge pull request #21450 from Easya-Solutions/new-mail-template-substitute-project-title
NEW substitue project title in mail template
2022-07-24 20:28:37 +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
40d31d9b8b Update combinations.php 2022-07-24 20:18:10 +02:00
This Charlène
f9cce93fc9 fix php 8 warning (and error) 2022-07-24 20:17:54 +02:00
This Charlène
69626875fc PHP - cannot use a scalar as an array warning
generate an error :  cannot use a scalar as an array warning (even on php V7)
2022-07-24 20:16:59 +02:00
Laurent Destailleur
44ae25b4cd
Merge pull request #21534 from defrance/patch-216
Some Fix on Variant module
2022-07-24 20:15:56 +02:00
Laurent Destailleur
083b785ec8
Update combinations.php 2022-07-24 20:13:48 +02:00
Laurent Destailleur
54c24dd74a
Merge pull request #21554 from defrance/patch-217
fix php 8 warning (and error)
2022-07-24 20:11:07 +02:00
Laurent Destailleur
a02c0f55fb Debug v16 2022-07-24 19:58:11 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
e465c0f34b Debug v16 2022-07-24 19:05:55 +02:00
Laurent Destailleur
fe7346a9c6 Hide var not usefull and dangerous 2022-07-24 18:31:55 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
Laurent Destailleur
394bfed965 Debug v16 2022-07-24 17:39:01 +02:00
Laurent Destailleur
40ae516034 Debug v16 2022-07-24 17:37:02 +02:00
Laurent Destailleur
89999d0138 Fix update description of skills 2022-07-24 17:31:30 +02:00
Laurent Destailleur
432468950b CSS 2022-07-24 17:16:39 +02:00
Laurent Destailleur
68234c4097 Fix css z-index of dialog 2022-07-24 16:40:33 +02:00
Laurent Destailleur
89f7e5ad30 Fix export of website. allowed_in_frames must be an int 2022-07-24 16:08:27 +02:00
Laurent Destailleur
e9892fdc32 css 2022-07-24 15:47:55 +02:00
Laurent Destailleur
99f632b3ff Add transaction db missing 2022-07-24 15:40:55 +02:00
Laurent Destailleur
481bd93ab8 Fix var_dump 2022-07-24 15:12:08 +02:00
Laurent Destailleur
e7161edffe Fix missing @ in dolEval 2022-07-24 15:11:00 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Laurent Destailleur
af73f2b683 Fix php8 2022-07-24 14:32:35 +02:00
Laurent Destailleur
0bcc03cd5d css 2022-07-24 14:32:13 +02:00
Laurent Destailleur
a945c89041 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:30:55 +02:00
Laurent Destailleur
c3016c6175 Fix php8 2022-07-24 13:44:47 +02:00
Laurent Destailleur
505531c9d6
Merge pull request #21552 from spooky360/15.0
FIX : fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
2022-07-24 11:39:00 +02:00
Florian HENRY
c342d0cde9 fix: display message only if change 2022-07-24 11:37:42 +02:00
Laurent Destailleur
336960453f
Merge pull request #21555 from FHenry/15_fix_message_only_when_updtae
fix: display message only if change (with emballage on)
2022-07-24 11:36:39 +02:00
Laurent Destailleur
9463f24a73 Better fix 2022-07-24 11:35:56 +02:00
Laurent Destailleur
fbf70beedb
Merge pull request #21557 from emheyarssi/15.0.2
Fix #21449
2022-07-24 11:35:24 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
f20aaee731 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-24 11:22:00 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
e9c42bf715 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2022-07-24 11:15:44 +02:00
Laurent Destailleur
f93a4ce0c0
Merge pull request #21560 from aspangaro/14p35
FIX Accountancy - Label of VAT account is empty
2022-07-24 11:13:44 +02:00
Laurent Destailleur
147b7516dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 11:10:23 +02:00