Commit Graph

91956 Commits

Author SHA1 Message Date
Frédéric FRANCE
9ca8dfcef9
fix warning 2021-10-22 22:05:04 +02:00
Frédéric FRANCE
2780bb73c3
fix warning 2021-10-22 21:57:34 +02:00
Laurent Destailleur
d45052a6b7
Merge pull request #19101 from atm-kevin/FIX_Missing_Ticket_Property
FIX - Missing ticket's class property
2021-10-22 19:12:15 +02:00
Laurent Destailleur
4b83affa2c
Merge pull request #19107 from evarisk-theo/fix-error-return-after-assigning-category
fix: error return when adding a category to an object
2021-10-22 19:11:20 +02:00
Laurent Destailleur
91a4326462
Merge pull request #19098 from Hystepik/develop#5
Fix : knowledgerecord_card clone part
2021-10-22 19:03:44 +02:00
Laurent Destailleur
c2afd1be9d
Merge pull request #19109 from nicolas-eoxia/fix_creating_folder_in_manual_GED_tree
fix: error sql creating folder in manual GED tree #19108
2021-10-22 18:59:56 +02:00
Laurent Destailleur
bf098330fe
Merge pull request #19114 from nicolas-eoxia/fix_creation_new_member
fix: error on the creation of a new member #19112
2021-10-22 18:59:24 +02:00
Laurent Destailleur
ac661c67b3
Merge pull request #19104 from frederic34/patch-4
fix warning
2021-10-22 18:47:54 +02:00
Laurent Destailleur
370642213f Fix warning 2021-10-22 18:44:39 +02:00
stickler-ci
070a03724a Fixing style errors. 2021-10-22 15:46:16 +00:00
Theo
03030685f6 add: quick link categories to account 2021-10-22 17:15:51 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Theo
f4a48e46ff add: quick link categories to user 2021-10-22 16:54:31 +02:00
Alexandre SPANGARO
0cbfdb4219 Merge remote-tracking branch 'upstream/develop' into 15a25 2021-10-22 16:49:47 +02:00
Theo
d5fc28f9b5 add: quick link categories to contacts 2021-10-22 16:46:55 +02:00
Laurent Destailleur
622304126e Fix phpcs 2021-10-22 16:35:23 +02:00
Nicolas Domenech
d7dd54549a fix: error on the creation of a new member 2021-10-22 16:34:51 +02:00
Theo
a36c966f15 add: quick link categories to adherent 2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +02:00
Nicolas Domenech
9772168067 fix: error sql creating folder in manual GED tree 2021-10-22 15:57:03 +02:00
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
bede1116a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 15:42:32 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +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
Laurent Destailleur
9ea60e5a1d
Merge pull request #19102 from frederic34/patch-2
fix warning
2021-10-22 15:36:12 +02:00
Laurent Destailleur
fc03d2f106
Merge pull request #19103 from moreauftheobald/develop
Fix scrutinizer FHENRY
2021-10-22 15:35:47 +02:00
Theo
311522bf04 fix: error return when adding a category to an object 2021-10-22 15:33:57 +02:00
MOREAU FRANCK
6855d8e91a Fix scrutinizer FHENRY 2021-10-22 15:32:24 +02:00
Frédéric FRANCE
34b9890110
fix warning 2021-10-22 15:29:38 +02:00
Frédéric FRANCE
cd52c3da75
fix warning 2021-10-22 15:27:09 +02:00
MOREAU FRANCK
101ec9b3fe Fix scrutinizer FHENRY 2021-10-22 15:25:19 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00
kevin
0a278416f4 Add missing ticket class property 2021-10-22 15:12:56 +02:00
Lucas Marcouiller
db779c2175 Fix : knowledgerecord_card clone part 2021-10-22 14:34:40 +02:00
Laurent Destailleur
744fe688aa
Merge pull request #19075 from lmag/FIXResponsive-list---classforhorizontalscrolloftabs
FIX : Listing responsive for ticket
2021-10-22 14:33:45 +02:00
Laurent Destailleur
58db2ca628
Merge pull request #19078 from frederic34/patch-1
fix display
2021-10-22 14:32:59 +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
Lucas Marcouiller
f7923003e1 better fix for api_mos.class.php 2021-10-22 14:27:42 +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
0f6cafb719
Merge pull request #19088 from frederic34/fixdoubleextrafieldbug
fix more than one extrafield cause bug sql
2021-10-22 11:45:49 +02:00
rfranks-securenet
7ba8cad2aa
Merge branch 'Dolibarr:14.0' into 14.0 2021-10-22 10:42:00 +01:00
Laurent Destailleur
52d3c2aa57
Merge pull request #19084 from dpriskorn/patch-12
api_supplier_invoices.class.php: Add 2 examples
2021-10-22 11:41:37 +02:00
Laurent Destailleur
8137612b61
Merge pull request #19080 from frederic34/patch-2
fix missing code comment
2021-10-22 11:40:46 +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
Richard Franks
98eb07d6f2 FIX #18695 Added ref_ext to supplier invoice
Added ref_ext to the fields for create, fetch and update functions
on fournisseur.facture class. This enables the REST API to use
this field for additional information.
2021-10-22 10:39:14 +01:00
Laurent Destailleur
ce1880b12d
Merge pull request #19090 from evarisk-theo/fix-delete-categories-when-linked-to-some-objects
Fix: can't delete categories when linked to some objects
2021-10-22 11:32:39 +02:00
Theo
0d868aa0d9 Fix: can't delete categories when linked to some objects 2021-10-22 11:14:04 +02:00
Frédéric FRANCE
c789b12715 fix more than one extrafield cause bug sql 2021-10-22 11:07:38 +02:00
Florian HENRY
6c71cc1e14 better correction from modulebuilder source of #19081 2021-10-22 11:03:35 +02:00
Florian HENRY
0c770b8810 fix various warning 2021-10-22 10:54:33 +02:00
Florian HENRY
9a9ed8989e fix various warning 2021-10-22 10:50:54 +02:00
Florian HENRY
444f7703a6 fix various warning 2021-10-22 10:50:24 +02:00
stickler-ci
ba8ef15916 Fixing style errors. 2021-10-22 08:50:15 +00:00
Florian HENRY
64bb2e6ece fix various warning 2021-10-22 10:49:47 +02:00
Laurent Destailleur
f0394c42d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 10:49:29 +02:00
Laurent Destailleur
962aa9f977 Fix #yogosha7494 2021-10-22 10:49:01 +02:00
stickler-ci
4d63586e2a Fixing style errors. 2021-10-22 08:22:23 +00:00
Dennis Priskorn
e2e3e8ef7b
Update api_supplier_invoices.class.php
Add 2 examples
2021-10-22 10:18:23 +02:00
Frédéric FRANCE
0adb910e56
fix sql error 2021-10-22 07:27:10 +02:00
Frédéric FRANCE
d1c9877c41
fix missing code comment 2021-10-22 07:02:44 +02:00
javieralapps4up
0020a5c61c
Update card.php
When you edit a user (with read others and change password others), the form allows the civility_code to be changed but the changes are not saved. I will propose a change in the user card to avoid this
2021-10-22 02:53:37 +02:00
Frédéric FRANCE
7c449892bb
fix display 2021-10-22 00:19:10 +02:00
Laurent Destailleur
8bb8e92ff2
Merge pull request #19034 from prietojc/patch-17
FIX card.php
2021-10-22 00:02:35 +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
Laurent Magnin
3f5d8d9a20 Fix : Listing responsive for ticket
PR for responsive table
2021-10-22 00:00:47 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Maxime Kohlhaas
860fb21d2d Fix expense report warning display + translations 2021-10-21 23:52:05 +02:00
Laurent Destailleur
80aebef63f
Merge pull request #19024 from daraelmin/daraelmin-patch-5
Fix adhtype amount as default on new subscription
2021-10-21 23:48:58 +02:00
Laurent Destailleur
2741e12376
Merge pull request #19033 from hregis/fix_wrong_sql_index
FIX compatibility with Multicompany
2021-10-21 23:47:44 +02:00
Laurent Destailleur
2d2d1538a5
Merge pull request #19038 from frederic34/patch-1
doxygen
2021-10-21 23:35:44 +02:00
Laurent Destailleur
9f6cfc5a07
Merge pull request #19036 from hregis/fix_missing_sql_filter_by_entity
FIX missing sql filter by entity
2021-10-21 23:35:29 +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
0d4d192b3c
Merge pull request #19071 from ns-info90/patch-1
Fix can't generate pdf last_main_doc
2021-10-21 23:21:39 +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
42fa0c3025
Merge pull request #19048 from frederic34/patch-12
doxygen
2021-10-21 23:05:20 +02:00
Laurent Destailleur
7ea993e448
Merge pull request #19045 from frederic34/patch-9
doxygen
2021-10-21 23:03:55 +02:00
Laurent Destailleur
47ae8dbde0
Merge pull request #19047 from frederic34/patch-11
doxygen
2021-10-21 23:03:32 +02:00
Laurent Destailleur
e71f3e6d80
Merge pull request #19049 from frederic34/patch-13
doxygen
2021-10-21 23:03:22 +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
bb7e3ba5dd
Merge pull request #19050 from frederic34/patch-14
doxygen
2021-10-21 23:02:42 +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
Laurent Destailleur
54ab0fe5da
Merge pull request #19056 from OPEN-DSI/new-takepos-max-terminals-number
NEW max terminals number on cash desk setup
2021-10-21 22:59:34 +02:00
Maxime Kohlhaas
ae6cae0313 Fix MAIN_USE_EXPENSE_RULE is now stable 2021-10-21 22:57:50 +02:00
Laurent Destailleur
459c57e370
Merge pull request #19054 from frederic34/patch-18
fix doxygen nested comment
2021-10-21 22:57:32 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Nicolas SILOBRE
9630b07b42
Update 14.0.0-15.0.0.sql 2021-10-21 22:49:02 +02:00
Nicolas SILOBRE
09c8b96696
Fix can't generate pdf last_main_doc 2021-10-21 22:44:57 +02:00
Laurent Destailleur
99c309b517
Merge pull request #19066 from atm-florianm/FIX_issue_19014_modulebuilder_obj_prop_update
FIX #19014 - the properties of some fields are not updated on form submission
2021-10-21 22:42:53 +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
7970f4ba5c fix scrutinzer 2021-10-21 22:24:35 +02:00
Laurent Destailleur
b2a4bd8854
Merge pull request #19069 from evarisk-theo/develop
FIX: #19068 - Ticket categories edit
2021-10-21 22:19:58 +02:00
Laurent Destailleur
ee9eb4803f
Merge pull request #19063 from FHenry/fix_conferenceorbooth_preparehead
fix: EventOrganization prepare head href link
2021-10-21 22:10:22 +02:00
Florian HENRY
df25880d55 fix scrutinzer 2021-10-21 19:18:01 +02:00
Florian HENRY
96722d55ef fix scrutinzer 2021-10-21 19:13:05 +02:00
Florian HENRY
3bdec20364 fix scrutinzer 2021-10-21 19:09:13 +02:00
Florian HENRY
ac27532d62 fix scrutinzer 2021-10-21 19:06:40 +02:00
Theo
2780f30d58 fix: ticket tags/categories edit 2021-10-21 19:05:13 +02:00
Florian HENRY
24cc74cd3a fix scrutinizer 2021-10-21 19:00:48 +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
atm-florian
2468c0e120 FIX #19014 - the properties of some fields are not updated when you submit the form
+ reformatting (one line per array item)
2021-10-21 18:24:03 +02:00
Florian HENRY
d4690ddbdd fix scrutinizer 2021-10-21 18:20:07 +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
b1be1ceff1 fix scrutinizer 2021-10-21 18:07:02 +02:00
Florian HENRY
dd9402960d remove not use code that implementd error 2021-10-21 18:03:50 +02:00
Florian HENRY
03fcda6b43 fix prepare head href link 2021-10-21 17:48:29 +02:00
Florian HENRY
4acf5a1bce fix prepare head href link 2021-10-21 17:45:54 +02:00
Florian HENRY
4e0170dc88 fix: scrutinizer 2021-10-21 17:45:10 +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
Florian HENRY
10a518749d fix: scrutinizer 2021-10-21 16:46:04 +02:00
Vincent Dieltiens
3a48fe2d66 Allow hook 'checkSecureAccess' to change original_file 2021-10-21 16:06:18 +02:00
Florian HENRY
258d0c3a69 fix: scrutinizer 2021-10-21 16:05:37 +02:00
Florian HENRY
2e260d75d9 fix: scrutinizer 2021-10-21 15:57:54 +02:00
Florian HENRY
0589c9c3ca fix: scrutinizer 2021-10-21 15:55:11 +02:00
Florian HENRY
f783dd56a4 fix: scrutinizer 2021-10-21 15:54:23 +02:00
lvessiller
d71d33939b NEW max terminals number on cash desk setup 2021-10-21 14:17:23 +02:00
Frédéric FRANCE
49d8f85ae7
fix doxygen nested comment 2021-10-21 12:33:48 +02:00
Frédéric FRANCE
3d5d2f0558
fix doxygen nested comment 2021-10-21 12:33:17 +02:00
Frédéric FRANCE
1157d7edfb
fix doxygen nested comment 2021-10-21 12:32:28 +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
e61b207074
doxygen 2021-10-21 12:07:06 +02:00
Frédéric FRANCE
14a355ebba
doxygen 2021-10-21 12:03:26 +02:00
Frédéric FRANCE
e42287ec2c
doxygen 2021-10-21 12:01:36 +02:00
Frédéric FRANCE
c3e8f6d8b1
doxygen 2021-10-21 12:00:18 +02:00
Frédéric FRANCE
c161eb198e
doxygen 2021-10-21 11:58:21 +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
Frédéric FRANCE
a4555d6304
doxygen 2021-10-21 11:53:17 +02:00