lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

26113 Commits

Author SHA1 Message Date
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
John BOTELLA
cdf1538ffa fix save using template 2021-10-30 16:36:51 +02:00
John BOTELLA
41beffccde Merge branch 'new_setup_form_help_class' of github.com:atm-john/dolibarr into new_setup_form_help_class 2021-10-30 12:55:26 +02:00
John BOTELLA
3a86221290 add more customisation 2021-10-30 12:54:13 +02:00
Laurent Destailleur
be6b1e29ad Add logs 2021-10-29 13:32:32 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Regis Houssin
8df90a1f54 FIX missing service access right 2021-10-29 08:28:41 +02:00
Frédéric FRANCE
787cef4440
fix warnings 2021-10-28 20:34:05 +02:00
stickler-ci
134e5cb5e6 Fixing style errors. 2021-10-28 13:52:29 +00:00
Regis Houssin
390d5eccaf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server 2021-10-28 15:47:31 +02:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +02:00
Laurent Destailleur
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Regis Houssin
ae6d16c830 FIX mhash function is deprecated since php 8.1.0 2021-10-28 13:36:53 +02:00
Regis Houssin
72484961ab FIX show connected server if we have a primary and secondary ldap server 2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Florian HENRY
46119c99a2 fix: warning dol_print_date setTimeStamp when time empty 2021-10-27 09:23:54 +02:00
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02:00
stickler-ci
6fd08bc5ef Fixing style errors. 2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c FIX restrictedArea for payment delete 2021-10-26 16:47:16 +02:00
fr69400
761ec7b790 Update functions.lib.php 2021-10-26 16:45:40 +02:00
fr69400
e4b3dda7f0 Update functions.lib.php 
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
 2021-10-26 15:27:12 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Florian HENRY
cfd88cb6e5 fix scrutinizer error 2021-10-25 21:50:27 +02:00
Laurent Destailleur
f64cd9d859 Fix bookmarks page 2021-10-25 21:28:52 +02:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
02632e9e88 Fix need write permission on object to link/remove resource 2021-10-25 16:32:37 +02:00
Laurent Destailleur
7533d4495d Fix bug huntr.dev 2021-10-25 15:39:02 +02:00
Laurent Destailleur
d916fe121a css 2021-10-25 13:57:02 +02:00
Laurent Destailleur
15c80327b1 data-key for extrafielsds has prefix of element 2021-10-25 13:29:08 +02:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Laurent Destailleur
940c69b46d Clean code 2021-10-25 12:09:17 +02:00
Laurent Destailleur
98f4f0b1c9 Merge 2021-10-25 11:52:24 +02:00
Florian HENRY
b282673f61 fix php8 warning 2021-10-25 09:01:05 +02:00
Frédéric FRANCE
03a8c5f0cb
Update commonfields_edit.tpl.php 2021-10-24 19:21:58 +02:00
Frédéric FRANCE
72a665b901
fix warning 2021-10-24 19:19:32 +02:00
Laurent Destailleur
b8250be237 css for toolitp 2021-10-24 16:35:42 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list 2021-10-24 14:34:47 +02:00
Laurent Destailleur
55d30884b8 Remove strange code 2021-10-24 13:15:01 +02:00
Laurent Destailleur
d3f630e4b5 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7 Code comment 2021-10-24 13:02:45 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification 
[NEW]  Add option for notification in message form
 2021-10-24 13:00:39 +02:00
Laurent Destailleur
a26539c3e4
Merge pull request #19173 from frederic34/patch-1 
Fix Undefined array key
 2021-10-24 12:33:44 +02:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist 
fix warnings in ticket list
 2021-10-24 12:31:57 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Frédéric FRANCE
6d2cedb439
Fix Undefined array key 
Fix Undefined array key 1 in htdocs/core/lib/project.lib.php on line 314
 2021-10-24 09:33:54 +02:00
stickler-ci
61576dad53 Fixing style errors. 2021-10-24 00:17:18 +00:00
John BOTELLA
fdcb9674d8 Remove prints 2021-10-24 02:09:49 +02:00
John BOTELLA
aaa7fd5b3a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-10-24 01:38:42 +02:00
John BOTELLA
d3d3a87ce9 Add new class to help setup generation 2021-10-24 01:38:13 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal 
can specify default in getDolGlobalString and getDolGlobalInt
 2021-10-23 22:42:40 +02:00
Laurent Destailleur
5078e3d863
Merge pull request #19161 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2021-10-23 22:38:15 +02:00
Laurent Destailleur
06c1d79c05
Update html.form.class.php 2021-10-23 22:36:55 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Frédéric FRANCE
635cb34606
fix warning 2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt 2021-10-23 21:06:37 +02:00
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Lucas Marcouiller
385d2c8d72 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2021-10-23 16:13:42 +02:00
Lucas Marcouiller
b3e9aeef7a Fix : PHP 8.0 warnings 2021-10-23 16:12:44 +02:00
Lucas Marcouiller
bc4373a5de Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-10-23 11:47:06 +02:00
Lucas Marcouiller
6ccd8ce83a Fix : PHP errors 8.0 2021-10-23 11:45:06 +02:00
Laurent Destailleur
f5aebbf6b8
Merge pull request #19127 from frederic34/usermyactions 
fix warnings
 2021-10-23 11:38:18 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Laurent Destailleur
a9bba23ef5
Merge pull request #19138 from Hystepik/scrutinizerfix 
Fix : scrutinizer errors
 2021-10-23 11:23:13 +02:00
Laurent Destailleur
7b496add01
Merge pull request #19137 from Hystepik/develop#3 
Fix: PHP 8.0 Warnings
 2021-10-23 11:22:04 +02:00
Laurent Destailleur
98f1637e0f
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories 
Fix link object to categories
 2021-10-23 11:21:41 +02:00
Lucas Marcouiller
d1ec71197a Fix : scrutinizer errors 2021-10-23 11:10:58 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings 2021-10-23 07:20:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings 2021-10-23 07:04:13 +02:00
John BOTELLA
55cdb8ac6f Fix numeric value 2021-10-23 01:00:24 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Laurent Destailleur
81882f8243
Merge pull request #19065 from javieralapps4up/develop 
Access forbidden when the password of other users is changed
 2021-10-22 22:52:55 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
fafabe3be2
fix multiple warnings 2021-10-22 22:22:55 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +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
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
Florian HENRY
87ac58efb6 fix php 8 2021-10-22 15:27:36 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00
Florian HENRY
b94d74f194 fix php8 warning 2021-10-22 14:58:09 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +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
Florian HENRY
3f211417c2 review 2021-10-22 12:19:16 +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
Lucas Marcouiller
4d2b96d029 fix inventory scan 2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +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
Florian HENRY
f68c3c17aa fix php warning 2021-10-21 15:50:04 +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
Frédéric FRANCE
a4555d6304
doxygen 2021-10-21 11:53:17 +02:00
Frédéric FRANCE
a528f8e98b
doxygen 2021-10-21 11:52:18 +02:00
Frédéric FRANCE
82b9dc6c87
doxygen 2021-10-21 11:50:48 +02:00
Frédéric FRANCE
bca3bcf8c9
doxygen 2021-10-21 11:49:24 +02:00
Frédéric FRANCE
d41c1393ba
Update box_graph_new_vs_close_ticket.php 2021-10-21 11:48:20 +02:00
Frédéric FRANCE
197818684b
doxygen 2021-10-21 11:47:32 +02:00
atm-lena
806c53d4c4 FIX Ret PR 2021-10-21 09:49:14 +02:00
Laurent Destailleur
a3d81f0ddd Move module as stable 2021-10-20 16:05:13 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
4a5293fc9c Rewrite getDictionaryValue (Use a cache file and consistent return code) 2021-10-20 14:41:40 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
Alexandre SPANGARO
632751cebc Use getDolGlobalInt() 2021-10-20 12:37:49 +02:00
kamel
7b41d1d87f Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into fix_00008 2021-10-20 09:35:30 +02:00
Alexandre SPANGARO
bee6abd6fc Merge branch '14.0' into 14p24 2021-10-20 07:38:54 +02:00
javieralapps4up
2ca0a1facf
Update date.lib.php 2021-10-20 00:36:24 +02:00
Laurent Destailleur
421b692942 Clean last br for wysiwyg 2021-10-19 21:48:25 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants 
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
 2021-10-19 19:04:09 +02:00
Laurent Destailleur
121cb8f708
Merge pull request #19019 from Hystepik/develop#2 
Fix: selectGroupTickets multilevel
 2021-10-19 19:02:35 +02:00
kamel
f328bb32f6 Corrections 2021-10-19 17:34:03 +02:00
Laurent Destailleur
bfdf88ca6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
lmarcouiller
f5942300e0 fix CI bot error 2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55 Fix autoselect multilevel 2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt 
NEW Added linked files page and send mail possibility in payments
 2021-10-19 12:25:37 +02:00
Regis Houssin
acbae5cafb FIX add possibility to bypass MAIN_ANTIVIRUS_* constants 2021-10-19 12:14:42 +02:00
lmarcouiller
dd6457b259 FIX: boxes php 8.0 errors and warnings 2021-10-19 10:24:59 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt 2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2 
NEW: Online proposal signature
 2021-10-18 19:41:58 +02:00
Laurent Destailleur
a81d6ef405 Debug v15 2021-10-18 19:13:36 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
lvessiller
98a613edec FIX show end hours in events linked to objects 2021-10-18 14:31:37 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Alexandre SPANGARO
053740792f Update accounting.lib.php 2021-10-18 10:19:50 +02:00
kamel
152aab4903 Add test if actual entity is different to the entity provided 2021-10-18 10:10:31 +02:00
lmarcouiller
c3a45dabad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-18 09:51:45 +02:00
stickler-ci
4c5e959911 Fixing style errors. 2021-10-17 23:52:24 +00:00
Polkiko
074b5589bd NEW Added documents page and send mail possibility in payments 
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
 2021-10-18 01:15:12 +02:00
Laurent Destailleur
7bcc76c1aa Fix margin rates and mark rates are 2 different columns 2021-10-17 19:41:02 +02:00
Laurent Destailleur
b318ccb2af Fix margin rates and mark rates are 2 different columns 2021-10-17 19:39:56 +02:00
Laurent Destailleur
099b2da2dc FIX #18974 2021-10-17 18:58:34 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
0727e182ac
Merge pull request #18997 from hregis/fix_add_zstd_compression 
NEW add support for zstd compression
 2021-10-17 13:49:06 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
 2021-10-17 13:30:13 +02:00
Laurent Destailleur
b30d7371a4 Fix allow ' - ' into file name 2021-10-17 12:21:22 +02:00
stickler-ci
9fa6a8daa7 Fixing style errors. 2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820 NEW add zstd compression 2021-10-17 11:59:25 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986 
NEW: Add budget field into task #18986
 2021-10-16 21:16:01 +02:00
Laurent Destailleur
830e067eff Fix for tzuser 2021-10-16 21:03:47 +02:00
Laurent Destailleur
94c48d3573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
25967da832
Merge pull request #18970 from hregis/fix_avoid_warning_non_numeric 
FIX avoid non-numeric warning
 2021-10-16 19:22:16 +02:00
Laurent Destailleur
1bee543eef
Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField 
NEW : we need to be able to put more filters on deleteByParentField() function
 2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b
Update commonobject.class.php 2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9
Update commonobject.class.php 2021-10-16 19:06:50 +02:00
Laurent Destailleur
a28d01ca83 Use PDF/A format instead of PDF 2021-10-16 18:59:01 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lmarcouiller
9eb8dadfd9 WIP : signature of propal 2021-10-15 16:58:59 +02:00
Florian HENRY
ab9ba4e0a2 NEW: feature #18986 2021-10-15 10:53:17 +02:00
Gauthier PC portable 024
5ef681ef91 FIX : stickler 2021-10-15 10:36:47 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Gauthier PC portable 024
412746ec8f NEW : we need to be able to put more filters on deleteByParentField() function 2021-10-15 10:18:32 +02:00
atm-lena
ff7727466a Function updateExtrafield : replace empty value to null 2021-10-14 17:13:44 +02:00
lvessiller
5d22eeeff2 FIX user date timezone offset 2021-10-14 16:06:22 +02:00
Regis Houssin
f14de50bd7 FIX check if numeric value 2021-10-13 14:26:43 +02:00
Regis Houssin
ce37323f69 FIX avoid non-numeric warning 2021-10-13 14:14:30 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Laurent Destailleur
4fc93ca7fa Fix css 2021-10-13 02:36:23 +02:00
Laurent Destailleur
e6c451cdae Fix responsive 2021-10-12 23:50:23 +02:00
Laurent Destailleur
f3ea05b701
Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture 
NEW when multiple order linked to facture, show list into note.
 2021-10-12 14:30:34 +02:00
Laurent Destailleur
faf3700dcc
Merge pull request #18947 from altairisfr/TICKETS_MESSAGE_FORCE_MAIL 
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
 2021-10-12 12:38:20 +02:00
Laurent Destailleur
791a7206ee Fix var not defined 2021-10-12 11:48:51 +02:00
Laurent Destailleur
6168e844bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-12 01:43:20 +02:00
Laurent Destailleur
2e32254574 Fix rul to shipment files 2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-11 20:18:46 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Christophe Battarel
96bdd61684 NEW : add constant TICKETS_MESSAGE_FORCE_MAIL 2021-10-11 17:36:31 +02:00
Laurent Destailleur
3a32787f15 Fix for backward compatibility 2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1 Fix for backward compatibility 2021-10-11 16:13:55 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Indelog
94875cdc77 Fix : Re-add bloc to set $withtargettype and $withsourcetype 2021-10-11 13:37:37 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select 
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
 2021-10-11 11:50:35 +02:00
Laurent Destailleur
05ddcf5132
Merge pull request #18927 from vincentjdc/supplier-order-export-validation-date-user 
NEW Allow exporting supplier order validation date + validation user
 2021-10-11 11:09:31 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Benjamin Chantalat
65c0167d07 ADD : info of number of product still to dispatched in a supplier order 2021-10-10 20:50:51 +02:00
Florian HENRY
5d393f201c fix sql 2021-10-08 13:17:09 +02:00
Vincent Dieltiens
592fff1cfa Allow exporting supplier order validation date + validation user 2021-10-08 13:09:16 +02:00
Laurent Destailleur
1b504b3e2c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-08 12:15:18 +02:00
Laurent Destailleur
806d832549 Fix canonical url for open graph 2021-10-08 12:00:13 +02:00
Laurent Destailleur
a057c7c2a7 Add og graph 2021-10-08 11:49:28 +02:00
Laurent Destailleur
da0a9e13f5 Fix twitter tag 2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac Allow twitter cards per page. 2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6 Comment 2021-10-08 10:59:11 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6 Fix missing invoice in stats when due date is unknown/null 2021-10-06 20:10:36 +02:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
520a4f55f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Indelog
18fb3a352b Add hook to overide sourcetype and targettype for linked object 
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
 2021-10-06 17:18:45 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list 
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
 2021-10-06 15:33:46 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Francis Appels
dceb2b5341 Fix fatal error 2021-10-06 13:36:11 +02:00
Laurent Destailleur
329bc331db
Merge pull request #18899 from fappels/14_fix_espadon 
FIX fatal error on expedition espadon model
 2021-10-06 13:29:47 +02:00
Laurent Destailleur
ea3e3b133d Debug eventorganization modules 2021-10-06 12:55:07 +02:00
Indelog
45e6ea45dc Fix stickler 2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e Fix Add module part in llx_element_element on CommonObject::add_object_linked() 
Add module part to target type if object has $module property and is'nt
in core modules.
 2021-10-06 12:14:46 +02:00
Laurent Destailleur
93b4853f8e Fix var_dump 2021-10-06 11:52:12 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Gauthier PC portable 024
1d4d4dfe18 FIX : ihm 2021-10-05 15:43:57 +02:00
Laurent Destailleur
413164f5c0 NEW can upload the odt file for product doc template 2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
3f26ab195b HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802 Missing language key 2021-10-05 06:26:19 +02:00
Francis Appels
d3cbda08dc Fix fatal error 2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop 
New : Add showdocument hook
 2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23 
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
 2021-10-04 15:32:40 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Gauthier PC portable 024
0dd3681e50 FIX : several debug 2021-10-04 14:08:11 +02:00
Laurent Destailleur
66310b14d7 Better way to present open invoice graph 2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9 
doxygen
 2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11 
doxygen
 2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12 
doxygen
 2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13 
doxygen
 2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Frédéric FRANCE
828c1d41e7
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:47:30 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:40:33 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800 MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
9460ad152e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-30 14:46:39 +02:00
Laurent Destailleur
d764080636 Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines 2021-09-30 14:43:19 +02:00
stickler-ci
c5ad75c7c1 Fixing style errors. 2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles 
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
 2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php 2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm 
Fix show for external module in ecm index auto page
 2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion 
Fix append module suffix on src_object_type when create ecm file
 2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array 
FIX avoid warning if $categories is an id
 2021-09-30 13:30:37 +02:00
Laurent Destailleur
1595b38498 Fix param $morecss on img_mime 2021-09-30 00:28:47 +02:00
Laurent Destailleur
a9805fbfc1 NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default 2021-09-29 17:34:31 +02:00
Laurent Destailleur
34dacca77c Css 2021-09-29 16:31:40 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Laurent Destailleur
9fe72597ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-29 12:43:27 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c Fix reposition 2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed Code comment 2021-09-28 18:07:04 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Regis Houssin
43a47999d7 FIX avoid warning if $categories is an id 2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e Fix show for external module in ecm index auto page 
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
 2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba Fix append module suffix on src_object_type when create ecm file 
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.

When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it  use
this sql filter to find the file related to the object which is removed
:

```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```

We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.

This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
 2021-09-28 15:26:08 +02:00
Alexandre SPANGARO
9426af8f6a NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-28 13:16:44 +02:00
Laurent Destailleur
0c52817426
Merge pull request #18821 from aspangaro/15a20 
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
 2021-09-28 13:14:16 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00