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

9750 Commits

Author SHA1 Message Date
Laurent Destailleur
16ee47b12c Fix warning. 
Reduce memory need for getmin/max on large graphs.
 2021-07-08 11:13:15 +02:00
Laurent Destailleur
34c7295cbc Make code more jquery compliant 2021-07-07 21:01:30 +02:00
Christophe Battarel
7e174412b7 FIX display of extrafields on shipping lines 2021-07-07 10:30:01 +02:00
Florian Mortgat
9f7be989c2 FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter() 2021-07-06 17:38:37 +02:00
Laurent Destailleur
5444d45e68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8 Fix phpunit 2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Théo David
079608fe00 NEW #18046 Add ticket ticket categories functions 2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value 2021-07-01 15:15:35 +02:00
Laurent Destailleur
aec4d6016c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Christophe Battarel
3b4ea5c5af use formintervention 2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab Merge branch 'develop' into timespent2inter 2021-06-30 10:34:22 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
lmarcouiller
3d41c00199 New : selectGroupTicket multilevel >1 level 2021-06-29 16:13:03 +02:00
Christophe Battarel
c8f55907eb stickler 2021-06-29 15:52:50 +02:00
Christophe Battarel
d423e47d3b stickler 2021-06-29 15:50:41 +02:00
Christophe Battarel
ef8aaa7fd7 generate intervention from time spent 2021-06-29 15:26:04 +02:00
Francis Appels
9b59f264fd Fix some php 8 warning 2021-06-28 20:00:10 +02:00
Laurent Destailleur
2fd47615eb Fix load of conf when using alternative $db 2021-06-26 01:46:14 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
4327d53c60 Fix closing linkto section when js on. 2021-06-23 14:38:24 +02:00
Laurent Destailleur
82ee5c2825 Clean code 2021-06-23 10:42:27 +02:00
Laurent Destailleur
40b35cc44a Fix upload file form has disappear 2021-06-23 02:45:06 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c Fix php8 2021-06-23 01:34:14 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
bcffbe3d67 Test fix 2021-06-22 17:09:02 +02:00
ATM john
b8244edb89 Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object 2021-06-21 21:54:53 +02:00
ATM john
4d043b713c WIP - create validation method for common object 2021-06-21 21:54:03 +02:00
Laurent Destailleur
6014e4407f Clean code 2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Frédéric FRANCE
4739694ad7
fix php warning 2021-06-20 16:24:58 +02:00
Laurent Destailleur
a9dd5e8764 Fix css hidoneprint 2021-06-20 12:52:04 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690 Debug v14 2021-06-20 04:10:25 +02:00
Laurent Destailleur
8df9815049 Add warning to help understand bug of post_max_size. 2021-06-20 01:04:16 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f Better info on upload size limit 2021-06-19 22:11:16 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9 Fix name of field 2021-06-17 00:59:11 +02:00
Laurent Destailleur
f850f058fa Look and feel v14 2021-06-16 21:06:55 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php 2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d fix wrong display on extrafields type = double 2021-06-16 14:21:23 +02:00
Laurent Destailleur
1c87420895 Fix #yogosha6411 2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
stickler-ci
82f195dc30 Fixing style errors. 2021-06-14 19:15:53 +00:00
ATM john
be367c589f WIP - create validation method for common object 2021-06-14 21:12:48 +02:00
ATM john
23765bf459 WIP - create validation method for common object 2021-06-14 20:59:46 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
ATM john
43ecba2e63 WIP - create validation method for common object 2021-06-12 14:16:40 +02:00
ATM john
578dc9adde WIP - create validation method for common object 2021-06-12 12:58:20 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13 
fix warnings
 2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2 FIX #17649 2021-06-11 17:58:52 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php 2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings 2021-06-10 22:26:58 +02:00
Frédéric FRANCE
759472f5d1
fix warning 2021-06-10 20:58:56 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade 
FIX : childtablesoncascade doc
 2021-06-10 12:59:19 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
Laurent Destailleur
2681d58107 FIx CVE ID: CVE-2021-33816 2021-06-09 16:41:31 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
ATM john
801f6cab2d WIP - create validation method for common object 2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1 WIP - create validation method for common object 2021-06-06 21:53:17 +02:00
ATM john
aa94d40ad0 WIP - create validation method for common object 2021-06-06 21:12:03 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
fb0d2cdddc Debug v14 2021-06-05 15:27:49 +02:00
Laurent Destailleur
b6ba1de3b3 Fix remove use of captcha on backoffice for ticket creation 2021-06-05 02:18:45 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20 
fix warnings
 2021-06-04 11:52:53 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14 
fix warnings
 2021-06-04 11:51:01 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4 
New : add of a new param in selectGroupTicket
 2021-06-04 10:37:18 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
ATM john
a7300d01b0 WIP - create validation method for common object 2021-06-03 09:49:07 +02:00
lmarcouiller
ab64f467f5 add of a new param in selectGroupTicket 2021-05-31 09:31:38 +02:00
Frédéric FRANCE
ca0654323f
fix warnings 2021-05-27 23:11:05 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings 2021-05-27 22:28:59 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php 2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php 2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018 lint(stickler) 2021-05-26 17:10:12 +02:00
Antonin MARCHAL
8dd2af42df fix(param) select_produits_fournisseur_list 2021-05-26 16:44:35 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5 
fix allowed preview
 2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php 2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php 2021-05-25 22:09:58 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1 
Compatibility phpv8
 2021-05-25 20:36:56 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm 
fix: formconfim if type radio must be :checked to get correct value
 2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1 2021-05-25 19:45:56 +02:00
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
d4310f49c4 FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES 2021-05-24 19:46:19 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php 
Fix #16100
End French Forum : 

https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
 2021-05-22 21:28:45 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Florian HENRY
609d405685 fix: formconfim if type radio must be :checked to get correct value 2021-05-21 15:38:03 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
5191a419d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1 
Compatibility phpv8
 2021-05-20 14:29:18 +02:00
Florian HENRY
62bc6e9e1f on going 2021-05-20 13:15:32 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877 Look and feel v14 2021-05-19 14:04:01 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
75f7ab41f0 css 2021-05-19 12:13:21 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
Florian Mortgat
6cccd77508 FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance) 2021-05-18 17:57:23 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
303d60a0bd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c Fix sql error 2021-05-18 12:44:56 +02:00
Laurent Destailleur
5babd107a0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:43:52 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php 2021-05-18 12:35:30 +02:00
Bastien Schils
1a38d075a6 html.form.class.php: Fixed SQL error (projects) 
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
 2021-05-17 18:35:50 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php 2021-05-17 07:11:41 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by 
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
 2021-05-14 18:30:56 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Laurent Destailleur
aa2d85276e Debug v14 2021-05-12 18:38:22 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php 2021-05-11 22:12:15 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class 2021-05-11 18:34:43 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
stickler-ci
3ee26fc881 Fixing style errors. 2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix 2021-05-09 22:53:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template 
Very important in restaurant orders
 2021-05-09 22:37:00 +02:00
daraelmin
bfac47c84e
Too much underscore 2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip 2021-05-07 17:14:33 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
daraelmin
729a5677ad
Group tooltip by key type 2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys 2021-05-04 01:41:32 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db Fix add of box 2021-04-29 10:13:43 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect 
13 fix combo prospect
 2021-04-27 01:18:57 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423 
NEW : Update doleditor.class.php for easily activate SCAYT
 2021-04-26 23:38:23 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30 
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
 2021-04-26 21:18:48 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +02:00
Robin
04c97d2695 FIX combo Prospect / Customers / Supplier in society list 2021-04-26 09:05:47 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Dorian Vabre
b441c600bb fixing error introduced in a previous commit 2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for 
(English below)
Bonjour,

Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT)  de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Amicalement,
Gaëtan.

(English below)
Hello,

Here is a proposal to add functionality to easily activate the  SpellCheckAsYouType (SCAYT)  plugins of CKEditor, for the history see this thread on the Dolibarr forum:

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Kind regards,
Gaëtan.
 2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00