Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
104,144 Commits 36 Branches 189 Tags
8c08786182701b19ffc901bdbb1f7cf7156d98d0
Commit Graph

25750 Commits

Author SHA1 Message Date
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a Merge pull request #19094 from Hystepik/scrutinizerfix 
Fix: scrutinizer errors + boxes activation
 2021-10-22 15:37:17 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00
Laurent Destailleur
a55497561f Merge pull request #19096 from Hystepik/develop#4 
Fix : french labels of box_graph_new_vs_close
 2021-10-22 14:31:39 +02:00
Laurent Destailleur
c1b2778ffc Merge pull request #19093 from Hystepik/develop#3 
Fix : Error on fetchAll on line
 2021-10-22 14:23:05 +02:00
Lucas Marcouiller
1ecd0a2be7 Fix : french labels of box_graph_new_vs_close 2021-10-22 14:17:47 +02:00
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Laurent Destailleur
42dceeafd4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 11:58:17 +02:00
Laurent Destailleur
f354427b3c Fix warning 2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc Fix : Error on fetchAll on line 2021-10-22 11:55:21 +02:00
Laurent Destailleur
e4a757ff9e Merge pull request #19086 from FHenry/14_fix_various_warning 
fix: fix various php warning
 2021-10-22 11:39:48 +02:00
Florian HENRY
0c770b8810 fix various warning 2021-10-22 10:54:33 +02:00
Florian HENRY
64bb2e6ece fix various warning 2021-10-22 10:49:47 +02:00
Frédéric FRANCE
d1c9877c41 fix missing code comment 2021-10-22 07:02:44 +02:00
Laurent Destailleur
f7b12208d1 Merge pull request #18802 from javieralapps4up/14.0 
Close: #18801 Jan-30 + 1m IS NOT Mar-2
 2021-10-22 00:01:42 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Laurent Destailleur
18e421448c Merge pull request #19041 from frederic34/patch-5 
doxygen
 2021-10-21 23:34:42 +02:00
Laurent Destailleur
556a6eaaf3 Merge pull request #19040 from frederic34/patch-4 
doxygen
 2021-10-21 23:22:06 +02:00
Laurent Destailleur
0b5d63aabe Merge pull request #19043 from frederic34/patch-7 
doxygen
 2021-10-21 23:21:55 +02:00
Laurent Destailleur
9a989ca308 Merge pull request #19044 from frederic34/patch-8 
doxygen
 2021-10-21 23:20:32 +02:00
Laurent Destailleur
16d2a9c1bd Merge pull request #19046 from frederic34/patch-10 
doxygen
 2021-10-21 23:20:17 +02:00
Laurent Destailleur
988f208dff Merge pull request #19042 from frederic34/patch-6 
doxygen
 2021-10-21 23:20:03 +02:00
Laurent Destailleur
82be96e254 Merge pull request #19039 from frederic34/patch-2 
doxygen
 2021-10-21 23:07:13 +02:00
Laurent Destailleur
7ea993e448 Merge pull request #19045 from frederic34/patch-9 
doxygen
 2021-10-21 23:03:55 +02:00
Laurent Destailleur
ffd954b454 Merge pull request #19053 from frederic34/patch-17 
fix doxygen nested comment
 2021-10-21 23:02:54 +02:00
Laurent Destailleur
232616fc77 Merge pull request #19052 from frederic34/patch-16 
fix doxygen nested comment
 2021-10-21 23:02:20 +02:00
Laurent Destailleur
c126c48a92 Merge pull request #19072 from atm-maxime/fix_expense_report_rules 
Fix MAIN_USE_EXPENSE_RULE is now stable
 2021-10-21 23:02:05 +02:00
Maxime Kohlhaas
ae6cae0313 Fix MAIN_USE_EXPENSE_RULE is now stable 2021-10-21 22:57:50 +02:00
Laurent Destailleur
6c870bb3d1 Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Laurent Destailleur
88f870c6e3 Merge pull request #19060 from vincentjdc/original-file-hook-checkSecureAccess 
Allow hook 'checkSecureAccess' to change original_file
 2021-10-21 22:39:29 +02:00
Laurent Destailleur
da4ecb46b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-21 22:32:10 +02:00
Laurent Destailleur
db6c793044 Text in english 2021-10-21 22:31:51 +02:00
Florian HENRY
96722d55ef fix scrutinzer 2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa Clean 2021-10-21 18:54:07 +02:00
atm-lena
03765528e1 Contract line : update boolean 2021-10-21 18:42:06 +02:00
javieralapps4up
f50dfe8571 Update security.lib.php 2021-10-21 18:20:06 +02:00
javieralapps4up
5d854dcce1 FIX #19064 
Access forbidden when the password of other users is changed

Steps to reproduce the behavior

User with lire and password (user) perms, but no creer.

When this user saves or cancels the edition of the password of another user, he is sent to the prohibited page
 2021-10-21 18:17:43 +02:00
Florian HENRY
85ec2c408c fix scrutinizer 2021-10-21 18:15:15 +02:00
Florian HENRY
f66f5cbfb8 fix: scrutinizer 2021-10-21 17:10:39 +02:00
Florian HENRY
4795190a75 fix: scrutinizer 2021-10-21 17:09:48 +02:00
Florian HENRY
e9fe668725 fix: scrutinizer 2021-10-21 16:48:04 +02:00
Vincent Dieltiens
3a48fe2d66 Allow hook 'checkSecureAccess' to change original_file 2021-10-21 16:06:18 +02:00
Frédéric FRANCE
2eb524cc31 fix doxygen nested comment 2021-10-21 12:31:08 +02:00
Frédéric FRANCE
8778296784 fix doxygen nested comment 2021-10-21 12:29:27 +02:00
Frédéric FRANCE
89f4066ead doxygen 2021-10-21 11:57:02 +02:00
Frédéric FRANCE
d83485cc7b doxygen 2021-10-21 11:55:24 +02:00
Frédéric FRANCE
a082dc6504 doxygen 2021-10-21 11:54:15 +02:00