8984 Commits

Author	SHA1	Message	Date
Laurent Destailleur	3c5ef18b36	FIX #15390	2020-11-14 00:47:28 +01:00
Frédéric FRANCE	42ddf7e27b	doxygen	2020-11-13 20:45:03 +01:00
Laurent Destailleur	5498800ad6	Update commonobject.class.php	2020-11-13 10:02:34 +01:00
Günter Lukas	2da8fb75a8	Fix #15371 ... Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371	2020-11-12 15:59:42 +01:00
Laurent Destailleur	1dbc91e343	Clean code	2020-11-12 13:44:57 +01:00
Laurent Destailleur	767f07d02e	Debug function to show list of files in ECM module	2020-11-11 22:47:06 +01:00
Laurent Destailleur	03e60bf084	Fix warning	2020-11-11 20:27:21 +01:00
Laurent Destailleur	90884d8085	Fix compatibility with date_delivery	2020-11-11 18:08:40 +01:00
Laurent Destailleur	db08786ddf	Add missing properties	2020-11-10 20:13:54 +01:00
Laurent Destailleur	29f0a9b784	Fix in select of user when firstname and lastname is empty	2020-11-10 15:03:35 +01:00
Laurent Destailleur	f8ddad4d4c	Fix warning	2020-11-10 13:20:45 +01:00
Scrutinizer Auto-Fixer	f6e3f58fcb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-11-09 14:18:56 +00:00
Laurent Destailleur	0f90cee597	Fix missing fields	2020-11-09 15:15:21 +01:00
Laurent Destailleur	5be634cbd4	Clean code	2020-11-09 11:34:58 +01:00
Laurent Destailleur	807d3b99c9	Fix update field when visilbity is 4 or -4	2020-11-09 09:53:56 +01:00
Laurent Destailleur	310123fe33	Merge pull request #15331 from Ahuahuachi/develop ... NEW Allow disable multiple file upload in form_attach_new_file method	2020-11-08 12:38:29 +01:00
Laurent Destailleur	e103503bb1	Fix warning php8	2020-11-08 12:34:45 +01:00
Alfredo Altamirano	f57c6dd25e	Add $disablemulti option to form_attach_new_file method ... This new option allows to disable multiple file upload for use on specific upload forms	2020-11-07 18:03:55 -06:00
Laurent Destailleur	9d3a25e2a3	Doxygen	2020-11-08 00:35:10 +01:00
Laurent Destailleur	c071dd254b	Fix warning	2020-11-07 14:35:28 +01:00
Laurent Destailleur	a72107ce06	Fix regression	2020-11-07 14:33:21 +01:00
Laurent Destailleur	2fdba3ad46	Fix warning	2020-11-07 12:53:52 +01:00
Laurent Destailleur	2da6fc1ef0	Remove warning	2020-11-07 12:06:14 +01:00
Laurent Destailleur	fe8d93f72d	Fix phpcs	2020-11-07 01:17:54 +01:00
Laurent Destailleur	c097e140cc	Fix php8	2020-11-06 15:41:34 +01:00
Laurent Destailleur	ac6f8e4e7c	Debug v13	2020-11-06 11:52:48 +01:00
Laurent Destailleur	1d9aacc7da	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commoninvoice.class.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php	2020-11-05 09:51:28 +01:00
Laurent Destailleur	824b778d51	Update commonobject.class.php	2020-11-05 09:07:06 +01:00
Francis Appels	5866facf11	Update commonobject. ... Don't think $fk_delivery_address is deprecated, also no alternative indicated. Switch of implode paramenters. showInputField preselected value for array type can be array.	2020-11-04 20:31:55 +01:00
jcp	1f483d7c28	Fix force payment mode to create withdrawal	2020-11-04 11:43:03 +01:00
Laurent Destailleur	b0e2d40533	Debug and fix v13	2020-11-03 14:19:54 +01:00
Laurent Destailleur	5f290e0de1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-02 11:41:19 +01:00
Laurent Destailleur	83a7b19333	Look and feel v13	2020-11-02 11:41:07 +01:00
Laurent Destailleur	ea3106cd07	Merge pull request #15252 from frederic34/specimencommon ... initSpecimenCommon	2020-11-02 09:29:48 +01:00
Laurent Destailleur	878b8f25de	Update commonobject.class.php	2020-11-02 09:29:26 +01:00
Frédéric FRANCE	a1016d79a2	initSpecimenCommon	2020-11-01 20:33:06 +01:00
Laurent Destailleur	ce7a96cbf1	Add more assertion	2020-11-01 20:11:09 +01:00
Laurent Destailleur	e0ed89c514	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/compta/facture/card.php htdocs/contrat/class/contrat.class.php htdocs/core/actions_addupdatedelete.inc.php htdocs/product/class/product.class.php htdocs/product/price.php htdocs/projet/tasks/time.php	2020-11-01 17:58:41 +01:00
Laurent Destailleur	63a03cdad6	FIX #15208	2020-11-01 14:34:29 +01:00
Laurent Destailleur	4feed10b75	Merge pull request #15246 from hregis/develop_bug2 ... FIX to avoid error with geoip	2020-11-01 13:54:58 +01:00
Regis Houssin	e19e56e14c	FIX to avoid error with geoip	2020-11-01 10:47:54 +01:00
Frédéric FRANCE	d9bf49c5dc	phpcs	2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Laurent Destailleur	125b94d749	Merge pull request #15234 from frederic34/patch-8 ... doxygen	2020-10-31 15:05:41 +01:00
stickler-ci	284c9bc6a8	Fixing style errors.	2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
Frédéric FRANCE	78b94c775b	Update commonobject.class.php	2020-10-31 13:59:46 +01:00
Laurent Destailleur	11f9c4cfbd	Merge pull request #15117 from atm-jpb/develop_editorRate ... # New multi-currency exchange rate editor	2020-10-31 13:55:42 +01:00
Laurent Destailleur	1af3709793	Merge pull request #15232 from frederic34/patch-6 ... doxygen	2020-10-31 13:50:28 +01:00
Laurent Destailleur	2b09b7be8e	Fix css	2020-10-31 13:47:50 +01:00
Frédéric FRANCE	85b3b5de36	Update commonobject.class.php	2020-10-31 13:24:09 +01:00
Laurent Destailleur	cea61d3b52	Fix var	2020-10-31 12:44:14 +01:00
Laurent Destailleur	a24071492e	Start fix for php8 compatibility	2020-10-30 05:56:07 +01:00
Laurent Destailleur	b3333da5c1	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/security2.lib.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/main.inc.php	2020-10-30 04:39:41 +01:00
Laurent Destailleur	840ca73464	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/class/hookmanager.class.php htdocs/main.inc.php htdocs/theme/eldy/info-box.inc.php htdocs/theme/eldy/style.css.php	2020-10-30 04:21:07 +01:00
Laurent Destailleur	f5a156ee06	Fix regression	2020-10-30 04:17:02 +01:00
Laurent Destailleur	1b5bcaccc6	Fix remove warnings	2020-10-30 04:13:31 +01:00
Laurent Destailleur	ec0c8e0c79	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/security2.lib.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:35:40 +01:00
Laurent Destailleur	263b679af4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:31:04 +01:00
Laurent Destailleur	8c646cdf4f	Merge pull request #15207 from frederic34/patch-11 ... Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER	2020-10-29 17:49:16 +01:00
Regis Houssin	032813fa19	FIX extrafield date not recover in create/edit mode	2020-10-29 11:05:45 +01:00
Frédéric FRANCE	4d716e74bd	Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER	2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Laurent Destailleur	f760b20bde	Fix double semi colon	2020-10-28 17:48:20 +01:00
Florian Mortgat	a4af2e94a9	FIX 10.0 - make formConfirm an addreplace-type hook	2020-10-28 17:08:09 +01:00
Scrutinizer Auto-Fixer	a2a9c51e50	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-27 18:46:07 +00:00
Laurent Destailleur	1b939ab8f4	Merge pull request #15183 from frederic34/dol_fiche_end ... end of dol_fiche_end	2020-10-27 19:00:32 +01:00
Laurent Destailleur	e099507594	Fix regression	2020-10-27 18:53:03 +01:00
Frédéric FRANCE	5a3780e062	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
Laurent Destailleur	fe357e17e8	Fix for ja	2020-10-27 11:00:50 +01:00
Laurent Destailleur	efce53abd1	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/expensereport/class/expensereport.class.php	2020-10-26 18:17:23 +01:00
Laurent Destailleur	2c2142ddba	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-26 18:13:47 +01:00
Laurent Destailleur	adeddc70ca	FIX Deletion of expensereport + other generated object not complete.	2020-10-26 18:10:58 +01:00
Laurent Destailleur	2638d4596a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/actions_sendmails.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2020-10-25 21:33:13 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of ... https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Laurent Destailleur	6fa174d13f	Merge pull request #15051 from laudeco/feature/11878_select_bank_account ... 11878 - select the only bank account	2020-10-25 14:56:08 +01:00
Laurent Destailleur	dbf626b92b	Update html.form.class.php	2020-10-25 14:55:52 +01:00
Laurent Destailleur	e7743948cb	Merge pull request #15120 from frederic34/patch-6 ... Update commonobject.class.php	2020-10-25 14:50:56 +01:00
Laurent Destailleur	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve ... retrieve the spelling	2020-10-25 14:48:51 +01:00
Laurent Destailleur	c6cee2f96f	Merge pull request #15128 from frederic34/patch-11 ... doxygen	2020-10-25 14:34:15 +01:00
Laurent Destailleur	bb147d2599	FIX #15140	2020-10-25 14:12:34 +01:00
Maxime Kohlhaas	bedfb7ac8d	Fix BOM position field	2020-10-24 19:19:06 +02:00
Laurent De Coninck	1d62834b2c	use the second version for default bank account	2020-10-24 17:15:48 +02:00
Frédéric FRANCE	3d3b530357	doxygen	2020-10-23 22:24:20 +02:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Frédéric FRANCE	c3863aeed8	Update commonobject.class.php	2020-10-23 18:18:01 +02:00
Laurent Destailleur	50da1cd95e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-23 17:33:57 +02:00
Laurent Destailleur	cf4ea4168d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/extrafields.class.php	2020-10-23 17:33:14 +02:00
Laurent Destailleur	f00fa93903	FIX check on required field when updating 1 extrafields.	2020-10-23 17:31:17 +02:00
Laurent Destailleur	377c44eeab	Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required ... FIX no empty value in required extrafield	2020-10-23 17:29:12 +02:00
Laurent Destailleur	572637b726	Enhance update of 1 extrafield (simple update instead of delete+insert)	2020-10-23 15:31:13 +02:00
jpb	47351c3cb3	Fix : stickler-ci	2020-10-23 13:55:55 +02:00
jpb	63c82b47fe	Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate	2020-10-23 12:27:14 +02:00
jpb	1ecff0a608	add list and crud	2020-10-23 11:58:25 +02:00
Laurent Destailleur	81543df5e4	Fix warnings	2020-10-23 04:24:54 +02:00
Laurent Destailleur	0a1e49447d	Merge pull request #15108 from frederic34/patch-4 ... Update cproductnature.class.php	2020-10-23 04:07:03 +02:00
stickler-ci	5638a49774	Fixing style errors.	2020-10-22 22:23:03 +00:00
Frédéric FRANCE	43bb812260	Update cproductnature.class.php	2020-10-23 00:22:34 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Frédéric FRANCE	ed8bfa26fb	Update cproductnature.class.php	2020-10-22 22:20:48 +02:00
Laurent Destailleur	fb7202b7f8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-22 17:55:47 +02:00
Laurent Destailleur	0616b9bc9b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/card.php htdocs/compta/prelevement/line.php htdocs/core/class/commonobject.class.php htdocs/core/lib/functions2.lib.php htdocs/core/tpl/card_presend.tpl.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2020-10-22 17:55:38 +02:00
Laurent Destailleur	a17c391efe	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php htdocs/product/composition/card.php	2020-10-22 17:38:48 +02:00
Laurent Destailleur	cfcac7e053	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/lib/functions2.lib.php	2020-10-22 17:34:48 +02:00
Laurent Destailleur	9c9d468a18	Merge pull request #15052 from andreubisquerra/master ... TakePOS connector compatibility with templates	2020-10-22 16:11:16 +02:00
Florian HENRY	d4fd71d0b3	fix #14649	2020-10-20 19:58:11 +02:00
Laurent Destailleur	ef182bed07	Fix browser reminder	2020-10-18 14:00:47 +02:00
jove@bisquerra.com	1283c6e095	TakePOS connector compatibility with templates	2020-10-18 09:29:33 +02:00
Laurent De Coninck	d2e2cad028	select by default, remove the show empty everywhere the field is required	2020-10-17 21:15:52 +02:00
Laurent Destailleur	547b3602cc	FIX refresh of tasks combo must use an ajax page not a full html page	2020-10-17 21:14:19 +02:00
Laurent De Coninck	cea7fd6894	select the only bank account ... When there is only one bank account in the dropdown of the bank account, select it by default. [see: #11878]	2020-10-17 20:45:37 +02:00
Laurent Destailleur	f2fafe04b6	Update doc	2020-10-17 18:16:03 +02:00
Laurent Destailleur	7b20e703ee	Clean code	2020-10-17 15:53:31 +02:00
Laurent Destailleur	20b6d3828e	NEW Show image of user in the combo select of users	2020-10-17 13:27:39 +02:00
Laurent Destailleur	5df1218d9f	Enhance page to setup email templates	2020-10-17 12:59:22 +02:00
Laurent Destailleur	e3552e7e02	Clean code	2020-10-16 20:17:54 +02:00
Laurent Destailleur	67785887fd	Merge pull request #15035 from andreubisquerra/master ... Change the tag char for security reasons in 'Receipt Printer' module	2020-10-16 17:20:04 +02:00
Laurent Destailleur	e74b833d7f	Look and feel v13	2020-10-16 15:40:52 +02:00
Laurent Destailleur	7504f92a41	Standardize code and look and feel	2020-10-16 13:30:20 +02:00
Laurent Destailleur	5905d3be64	Fix phpcs	2020-10-16 00:06:26 +02:00
jove@bisquerra.com	f90b236e0f	Change the tag char for security reasons in 'Receipt Printer' module	2020-10-15 23:44:13 +02:00
Laurent Destailleur	64b1a31e45	Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType ... NEW : Nature of product is now a dictionay	2020-10-15 21:07:42 +02:00
Laurent Destailleur	9bbb471b4f	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/stats/cabyprodserv.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/loan/card.php	2020-10-15 20:51:30 +02:00
Laurent Destailleur	5b37ff0bfd	Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit ... tests.	2020-10-15 19:36:08 +02:00
Laurent Destailleur	844c4dec4d	css	2020-10-15 13:16:17 +02:00
stickler-ci	05ac7c91c7	Fixing style errors.	2020-10-14 16:25:23 +00:00
Florian HENRY	4fd32325d6	cast int	2020-10-14 18:22:55 +02:00
Florian HENRY	bcb98d1d67	Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType	2020-10-14 18:16:34 +02:00
Laurent Destailleur	c079076488	Merge pull request #15010 from bafbes/abb120147 ... fix:allow const files loading from modules inside custom folders	2020-10-14 17:39:08 +02:00
Florian HENRY	fd1fa1c777	Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType	2020-10-14 16:39:54 +02:00
Florian HENRY	7d09f22afa	add correct import and dict edition	2020-10-14 16:39:42 +02:00
Florian HENRY	a2ef7bc61e	add select	2020-10-14 14:26:40 +02:00
Laurent Destailleur	a0b17635fd	NEW When creating a user from a member linked to a thirdparty, you can ... decide if it is an internal or external (default) user.	2020-10-14 14:02:07 +02:00
Laurent Destailleur	7838ca32ba	Fix sql injection reported by Jason Nordenstam	2020-10-14 01:52:53 +02:00
bahfir abbes	4ee6cedbe6	Option d’Activation du fichier global de configuration.	2020-10-13 23:33:25 +01:00
Laurent Destailleur	d3b6ada4eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/stats/cabyprodserv.php	2020-10-13 15:08:53 +02:00
Laurent Destailleur	bc6b5d919a	Better responsive	2020-10-13 10:51:51 +02:00
Laurent Destailleur	7c67dbf6d5	Better responsive	2020-10-13 10:05:47 +02:00
Laurent Destailleur	66a6415230	Merge pull request #14994 from grandoc/new_branch_12_10_2020 ... fix : undefined index	2020-10-12 19:37:37 +02:00
Laurent Destailleur	fcd4645509	Standardize code: Property product_libelle renamed into product_label ... Move common vars declaration into parent class.	2020-10-12 19:33:00 +02:00
Philippe GRAND	4da75c4251	fix : undefined index	2020-10-12 16:11:56 +02:00
Laurent Destailleur	726fd1b631	Merge pull request #11227 from aspangaro/10.0_intracommreport ... NEW module Intracomm report	2020-10-12 13:35:58 +02:00
Laurent Destailleur	29f19d9550	Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog ... NEW More filter for "View change logs"	2020-10-10 15:35:55 +02:00
Alexandre SPANGARO	8876457b54	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-10 06:47:05 +02:00
Alexandre SPANGARO	4dcd2bfcda	Fix Travis	2020-10-09 13:58:35 +02:00
Laurent Destailleur	1239152368	Update dolgraph.class.php	2020-10-09 13:54:47 +02:00
Regis Houssin	b591e6510b	FIX avoid warning "Parameter must be an array"	2020-10-09 11:03:44 +02:00
Alexandre SPANGARO	b3b37dd9ee	Fix sticklerCI	2020-10-09 09:32:50 +02:00
Alexandre SPANGARO	ca7ad35342	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-09 06:39:42 +02:00
Laurent Destailleur	e7c456f6f2	NEW Add column payment term into list of supplier invoices.	2020-10-08 19:22:21 +02:00
Laurent Destailleur	047d6f78e7	Fix status disabled of task intocombo list	2020-10-08 17:49:26 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
Sekan, Tobias	7e3a3a4cf3	Add more filter for leave log view	2020-10-08 10:30:09 +02:00
Laurent Destailleur	eb41a72e27	Properties ->titre have been renamed into ->title	2020-10-07 17:41:36 +02:00
Laurent Destailleur	c7ca99accb	Fix default value of enabled property of menu entry	2020-10-07 15:38:07 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
Laurent Destailleur	84105e996a	Fix for #14940	2020-10-07 01:03:48 +02:00
Laurent Destailleur	ea8ec4ea90	Clean code	2020-10-07 00:59:05 +02:00
Laurent Destailleur	77788a0591	Clean code	2020-10-07 00:26:03 +02:00
Laurent Destailleur	2c5d396546	Fix upload file	2020-10-06 17:45:08 +02:00
Laurent Destailleur	663f149982	Better error management	2020-10-06 16:48:48 +02:00
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Aurélien	f954e8b173	:mod livraison rename user acces right #14697	2020-10-06 16:10:48 +02:00
Aurélien	c8cd55e158	debug access right after rename class #14697	2020-10-06 15:57:50 +02:00
Aurélien	1af42b313c	rename livraison pdf and dependencies #14697	2020-10-06 13:32:02 +02:00
Aurélien	af7c23b2ac	rename folder admin/livraison.php and dependencies #14697	2020-10-06 12:05:24 +02:00
lvessiller	496150d747	FIX extrafield required error after submit	2020-10-06 10:21:24 +02:00
Laurent Destailleur	e5cdffcdec	Merge pull request #14922 from andreubisquerra/develop ... TakePOS connector compatibility with RECEIPT PRINTERS module	2020-10-05 16:38:56 +02:00
Laurent Destailleur	cfc3c01815	Factorize code to know if a parameter is used to store a secret	2020-10-05 12:13:06 +02:00
Laurent Destailleur	62177edab1	NEW Can force the antivirus from conf file or autoprepend ini setup.	2020-10-05 05:00:59 +02:00
Laurent Destailleur	800c0d2b00	Fix method must return a string not print on output	2020-10-05 02:24:45 +02:00
andreubisquerra	65c6881fc9	NEW: TakePOS connector compatibility with RECEIPT PRINTERS module	2020-10-04 22:49:47 +02:00
Laurent Destailleur	581a3d8808	FIX Add a better message when file size is too large	2020-10-03 14:02:53 +02:00
Laurent Destailleur	1a535dc77b	Clean code	2020-10-02 19:00:15 +02:00
Laurent Destailleur	bc308fc662	Look and feel v13 - Disabled users are greyed	2020-10-02 14:19:44 +02:00
Laurent Destailleur	3c6fcced8e	Clean code	2020-10-02 13:38:35 +02:00
Laurent Destailleur	86c9c28e7c	Merge pull request #14895 from hregis/12.0_ldap ... FIX missing hook 'formConfirm' in 'addreplace' $hooktype	2020-10-02 13:33:35 +02:00
Regis Houssin	f67189aaa8	FIX missing hook 'formConfirm' in 'addreplace' $hooktype	2020-10-02 13:16:42 +02:00
Laurent Destailleur	ce0fa53cb0	Fix delete of file from file manager	2020-10-02 03:07:31 +02:00
Laurent Destailleur	ece8037f42	The button "Invoice orders" switch to page with lines autoselected.	2020-10-01 18:08:46 +02:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
Laurent Destailleur	1e176fad8f	Fix GETPOST on array	2020-09-29 21:28:07 +02:00
Laurent Destailleur	879d041398	Can force the typeof check of GETPOST into $fields for type text.	2020-09-29 20:48:40 +02:00
Laurent Destailleur	8b2ba8cbba	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/bom/bom_card.php htdocs/core/class/ldap.class.php htdocs/core/lib/files.lib.php htdocs/fichinter/class/fichinterrec.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/admin.lang	2020-09-29 13:28:22 +02:00
Laurent Destailleur	43c167f0c8	Fix init var	2020-09-28 20:47:36 +02:00
Laurent Destailleur	8e59d0528e	Update html.formactions.class.php	2020-09-27 18:33:13 +02:00
Florian HENRY	f9d4a4d2ba	Merge branch 'develop' into fix_eventcreation	2020-09-27 17:58:05 +02:00
Laurent Destailleur	c659379307	Try a more complete fix than #14821	2020-09-27 17:21:49 +02:00
Laurent Destailleur	33d578a660	Fix bad management of default value in database on create form	2020-09-26 04:25:06 +02:00
Laurent Destailleur	88b4c1e766	Fix calculation of nb of top menu in CSS files.	2020-09-25 14:09:51 +02:00
Regis Houssin	d38c557fba	FIX Can create user but not update user with activedirectory	2020-09-25 12:11:13 +02:00
Laurent Destailleur	f066da1811	Minor security fixes	2020-09-24 16:19:24 +02:00
Laurent Destailleur	becf91904f	css	2020-09-24 08:55:33 +02:00
Laurent Destailleur	28d25f596b	Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt ... NEW: Added incoterms to substitution array	2020-09-23 20:10:22 +02:00
Laurent Destailleur	09c6761dae	NEW Include the tag editor of page as a popup into website editor	2020-09-23 16:36:19 +02:00
Laurent Destailleur	6c06d2f0aa	Look and feel v13	2020-09-22 15:26:29 +02:00
Laurent Destailleur	c61e8f052b	NEW Add property cssview when declaring fields of an object	2020-09-22 08:54:40 +02:00
Laurent Destailleur	e52559783f	Look and feel v13	2020-09-21 13:54:26 +02:00
Laurent Destailleur	3ca379c9e6	FIX Restore multiselect (selection of prospect level) ... Conflicts: htdocs/core/class/html.form.class.php	2020-09-21 12:22:57 +02:00
Laurent Destailleur	6380a294fc	FIX Restore multiselect (selection of prospect level)	2020-09-21 12:16:22 +02:00
Florian HENRY	0adca0a660	fix event creation same on all page	2020-09-21 11:43:08 +02:00
Tim Otte	05275a2b67	Added check if method exists	2020-09-21 08:50:39 +02:00
Laurent Destailleur	d5e6273b45	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-20 18:06:04 +02:00
Laurent Destailleur	acf28e28af	Label	2020-09-20 18:01:17 +02:00
Laurent Destailleur	ab94224d0c	Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed ... NEW : Email configuration - Allow auto signed certificat when smtp ssl activated	2020-09-20 17:56:23 +02:00
Laurent Destailleur	cd8ebd9500	Fix warnings	2020-09-20 16:57:53 +02:00
Laurent Destailleur	b3dd51b790	Fix warnings	2020-09-20 16:46:29 +02:00
Laurent Destailleur	667fb1098c	Fix	2020-09-20 16:06:53 +02:00
Laurent Destailleur	1a494542c6	Fix static	2020-09-20 14:40:49 +02:00
Laurent Destailleur	3f2220bd6f	Fix	2020-09-20 14:34:19 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Laurent Destailleur	54c0f742b1	Fix escape	2020-09-19 21:19:04 +02:00
Laurent Destailleur	99c05f0923	Fix rss	2020-09-19 00:51:09 +02:00
Laurent Destailleur	f62d52f89a	Fix tooltip for linkto object. ... Fix security of ajax selectobject.php	2020-09-19 00:44:47 +02:00
Laurent Destailleur	b6c6473cce	Fix sql injection when forging requests with IN	2020-09-18 17:47:40 +02:00
Laurent Destailleur	2d38644ae1	Sanitize sortfield	2020-09-18 17:13:01 +02:00
Laurent Destailleur	d75e1e5771	Fix #yogosha4525	2020-09-18 16:10:11 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	4630887591	Fix css	2020-09-16 20:09:40 +02:00
Laurent Destailleur	d0c02f3714	FIX #yogosha4426	2020-09-16 14:51:46 +02:00
Laurent Destailleur	ffa91451eb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-16 02:50:36 +02:00
Laurent Destailleur	e5191cad24	Move code of incoterm into the Incoterm Trait.	2020-09-16 02:50:18 +02:00
Laurent Destailleur	2da4838141	Merge pull request #14730 from ptibogxiv/patch-358 ... NEW get state dictionnary by REST API	2020-09-16 01:12:08 +02:00
Laurent Destailleur	6dd1f522eb	CSS	2020-09-14 22:30:22 +02:00
Laurent Destailleur	f626bd70d0	Look and feel v13	2020-09-14 20:53:42 +02:00
stickler-ci	75a9678086	Fixing style errors.	2020-09-14 08:48:04 +00:00
ptibogxiv	e98ae029e3	Update cstate.class.php	2020-09-14 10:46:19 +02:00
kkhelifa-opendsi	1f5f784b75	Merge branch 'develop' into email_smtp_allow_auto_signed	2020-09-14 10:25:15 +02:00
kamel	2a5b31da2d	CORE smtps: Corrections	2020-09-14 10:22:05 +02:00
Scrutinizer Auto-Fixer	73915d51c8	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-14 02:30:04 +00:00
Laurent Destailleur	59bc8ee07c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/stats/byproperties.php htdocs/adherents/stats/geo.php htdocs/admin/system/dolibarr.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_title.tpl.php htdocs/langs/en_US/admin.lang htdocs/product/class/product.class.php	2020-09-14 02:49:19 +02:00
Laurent Destailleur	0d9d9498e2	Update commonobjectline.class.php	2020-09-14 00:13:12 +02:00
DEMAREST Maxime (Indelog)	1c523abbd8	Fix: getLabelOfUnit() for Product, CommonObjectline to print long label ... Also add $type = 'code' for return unit code in form 'unitXX' (where XX is the code of unit). for get return like unitXX where XX is the code of unit	2020-09-13 07:44:30 +02:00
Cédric	acc995a553	Update commoninvoice.class.php	2020-09-12 19:05:33 +02:00
Laurent Destailleur	1f8278c8ca	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/core/class/html.formmail.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/other.lang htdocs/product/class/product.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-09-12 04:42:59 +02:00
Laurent Destailleur	5ea3f09e17	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php	2020-09-12 04:29:28 +02:00
Laurent Destailleur	709542e27d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-09-12 04:26:00 +02:00
Laurent Destailleur	990af9d5cf	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/comm/propal/class/propal.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php	2020-09-12 04:25:54 +02:00
bahfir abbes	e89bfe5ac1	fix: unuseful truncations in extrafield select lists	2020-09-11 22:44:08 +01:00
Laurent Destailleur	009c7eaf31	Standardize code with module builder	2020-09-11 16:16:04 +02:00
Laurent Destailleur	8d93b76258	Clean code	2020-09-10 17:49:05 +02:00
John Botella	59d5391c2a	Add force reload param to load method	2020-09-10 10:41:16 +02:00
Laurent Destailleur	08ab4855f2	Merge branch 'develop' into 13a11	2020-09-09 19:12:08 +02:00
Laurent Destailleur	12fba9e679	Fix label	2020-09-09 15:19:12 +02:00
Laurent Destailleur	1c8e02df3b	Doc	2020-09-09 15:16:03 +02:00
Laurent Destailleur	230b6cdfd4	Add method isLoaded($domain)	2020-09-09 15:14:52 +02:00
Scrutinizer Auto-Fixer	c263c8a76c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-08 19:27:28 +00:00
John Botella	5a0622c906	FIX cron load lang	2020-09-08 16:14:14 +02:00
Tim Otte	c68928b8d0	Added incoterms to substitution array	2020-09-08 15:53:47 +02:00
lvessiller	23accef5c2	FIX empty value is needed on filter list	2020-09-08 14:53:40 +02:00
kamel	ed13a9fce2	Correction stickler-ci	2020-09-08 14:53:22 +02:00
kamel	ccff18e2a5	NEW : Email configuration - Allow auto signed certificat when ssl activated	2020-09-08 14:48:50 +02:00
Laurent Destailleur	54c0f673c1	Debug hidden option MAIN_USE_EXPENSE_IK	2020-09-08 12:00:14 +02:00
Laurent Destailleur	86ed4dfa2b	Debug hidden option MAIN_USE_EXPENSE_IK	2020-09-08 11:51:36 +02:00
Alexandre SPANGARO	9165ea9e67	Merge remote-tracking branch 'upstream/develop' into 13a11	2020-09-08 08:35:42 +02:00
Laurent Destailleur	fab24e8c55	Fix phpcs	2020-09-08 05:12:08 +02:00
Alexandre SPANGARO	d1ba6b9476	Merge remote-tracking branch 'upstream/develop' into 13a11	2020-09-08 05:01:36 +02:00
Alexandre SPANGARO	a050ee8385	Typo	2020-09-08 04:24:27 +02:00
Laurent Destailleur	c91338198d	Add some fields in candidature ... Look and feel v13	2020-09-08 01:53:37 +02:00
lvessiller	86ce4315be	FIX load default linked options for linked sellist extra fields	2020-09-07 15:19:58 +02:00
lvessiller	5dee3b5b2f	FIX no empty value in required extrafield	2020-09-07 14:24:09 +02:00
Laurent Destailleur	b1e45aef46	Debug opensurvey. Look and feel v13. Removed deprecated properties.	2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer	b78ff67d7e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-07 08:18:17 +00:00
Laurent Destailleur	d700649fb9	The deprecated subsitution key __SIGNATURE__ has been removed. Replace ... with __USER_SIGNATURE__ if you still use old syntax in your email templates.	2020-09-06 19:25:25 +02:00
Laurent Destailleur	84efd70dcb	FIX Clean tooltip of help for substition for long notes	2020-09-06 19:19:55 +02:00
bahfir abbes	77afbd4412	fix : unuseful truncation of list name elements	2020-09-04 15:58:21 +01:00
Laurent Destailleur	7094cec42a	Fix use same duration code 'on 1 letter' than the production duration ... record, also than tha sprintf.	2020-09-04 14:37:55 +02:00
Juanjo Menent	9bd5ed627f	Fix travis issues	2020-09-04 09:55:02 +02:00
Juanjo Menent	bb92e64e43	FIX: #14474 Error when deleting	2020-09-03 12:43:38 +02:00
Laurent Destailleur	4da10b5f63	Merge pull request #14614 from aspangaro/13a10 ... New Accountancy Add predefined url in getNomUrl	2020-09-03 12:34:24 +02:00
atm-lena	197d03f9d9	FIX selectModelMail() : if default and no mail models select default model	2020-09-03 09:23:10 +02:00
Alexandre SPANGARO	b3cd9688d5	Typo	2020-09-02 23:43:47 +02:00
Laurent Destailleur	ed743c9dbb	Fix phpcs ... More secured sendEmailsReminder()	2020-09-02 21:39:22 +02:00
Laurent Destailleur	9868140693	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-02 19:20:12 +02:00
Laurent Destailleur	4dca1929e0	Can close a recruitment job	2020-09-02 19:19:47 +02:00
Laurent Destailleur	6ccec31fa0	Merge pull request #14605 from Tim-Otte/fix-contact-type-translation ... FIX: Contact type translation	2020-09-02 18:09:37 +02:00
Laurent Destailleur	6d52721246	Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder ... Event Reminder : Add "Default Mail Model" to select Mail Model	2020-09-02 18:08:40 +02:00
Laurent Destailleur	de3e818ccf	Update html.form.class.php	2020-09-02 18:08:08 +02:00
lvessiller	27c754e6c8	NEW add send context for ticket	2020-09-02 15:33:18 +02:00
atm-lena	7b91c8efc8	Event Reminder : Add "Default Mail Model" to select Mail Model	2020-09-02 09:58:55 +02:00
Tim Otte	8a5a171cf8	Added agenda translation	2020-09-01 16:59:40 +02:00
Tim Otte	71471a054d	Loaded the required translations	2020-09-01 16:53:42 +02:00
Florian Mortgat	134a47a93f	FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename	2020-09-01 15:36:35 +02:00
atm-lena	d2ed43d913	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-09-01 09:43:14 +02:00
Laurent Destailleur	9dbc9582c1	Code comment	2020-08-31 17:12:31 +02:00
Laurent Destailleur	0a93954134	Fix regresssion. The reply_to was missing with SMTPS	2020-08-31 17:07:13 +02:00
Laurent Destailleur	49a4f4f1a1	More log	2020-08-31 17:00:43 +02:00
Laurent Destailleur	ffb3d810de	Complete fix for #14580 for v10 (backport of change of develop)	2020-08-31 16:21:59 +02:00
atm-lena	f8c79db4a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-08-31 14:14:27 +02:00
Laurent Destailleur	8adf1852b1	Clean code	2020-08-30 03:00:35 +02:00
Laurent Destailleur	9cba23e458	Fix phpcs	2020-08-29 06:10:18 +02:00
Laurent Destailleur	bca9a84710	Enhance autofill of end date when creating an event	2020-08-29 06:05:52 +02:00
Laurent Destailleur	b721930b3b	Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind ... Agenda Remind (Part 1)	2020-08-29 05:19:21 +02:00
Laurent Destailleur	723a263cd3	Fix phpcs	2020-08-29 05:07:23 +02:00
Laurent Destailleur	bd201052de	Update html.form.class.php	2020-08-29 04:58:07 +02:00
Laurent Destailleur	ca47eb2c9f	Update html.form.class.php	2020-08-29 04:55:24 +02:00
Laurent Destailleur	0acb33fc91	Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail ... NEW remove new lines in mail on add ticket message	2020-08-28 21:08:17 +02:00
lvessiller	c3b095c820	NEW remove new lines in mail on add ticket message	2020-08-28 17:54:57 +02:00
Laurent Destailleur	50b791cfca	Fix css	2020-08-28 17:41:15 +02:00
Laurent Destailleur	9950f2ea83	Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name ... NEW subject title with company name instead of application title in t…	2020-08-28 17:36:38 +02:00
Laurent Destailleur	0b8d7f329e	FIX added information on user list not visible with multiselect	2020-08-28 17:17:22 +02:00
lvessiller	49098218cb	NEW subject title with company name instead of application title in ticket message	2020-08-28 16:55:28 +02:00
Laurent Destailleur	4ecd15b7ab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/main.lang	2020-08-27 21:57:42 +02:00
Laurent Destailleur	1b77dc4e13	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-27 21:19:06 +02:00
Laurent Destailleur	fe4acf4e4e	NEW Add focus when editing on product/stock/product.php Close #14548	2020-08-27 21:18:40 +02:00
Laurent Destailleur	5c1680e9c5	Merge branch 'develop' into master	2020-08-27 19:58:29 +02:00
Laurent Destailleur	8a9244d1d6	Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions ... NEW - Show references in contract form on interventions	2020-08-27 19:44:51 +02:00
Laurent Destailleur	6715eaee09	Update html.formcontract.class.php	2020-08-27 19:44:17 +02:00
atm-lena	acb50950a4	Add a default message to "actioncomm_send" template	2020-08-27 11:31:48 +02:00
stickler-ci	8ff24282d9	Fixing style errors.	2020-08-27 08:16:32 +00:00
Sekan, Tobias	c2590433fe	Show ref in contract form on interventions	2020-08-27 10:11:18 +02:00
atm-lena	c10556473f	Clean	2020-08-26 15:35:12 +02:00
atm-lena	1267e914dc	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind	2020-08-26 15:16:53 +02:00
atm-lena	d4e6a9871c	Update select_type_duration() function	2020-08-26 15:14:07 +02:00
atm-lena	a4018f41f7	WIP	2020-08-26 10:52:36 +02:00
Laurent Destailleur	23bb67873f	NEW Can edit the list of sending email profiles.	2020-08-25 19:40:17 +02:00
atm-lena	7df993c7ed	Add "select_model_mail" function + add select to create event	2020-08-25 17:26:32 +02:00
atm-lena	25840c2b3d	Create Event - Add fields	2020-08-25 12:40:29 +02:00
andreubisquerra	f9913be719	Change variable to pos_change	2020-08-23 22:24:46 +02:00
Laurent Destailleur	b600478a5a	Work on recruitment module	2020-08-23 22:11:16 +02:00
Laurent Destailleur	bd7261a449	Debug recruitment module	2020-08-23 18:04:52 +02:00
Laurent Destailleur	a4c34c2bc5	NEW Add Manufacturing Orders into the automatic ECM	2020-08-23 15:19:03 +02:00
Alexandre SPANGARO	bf28201685	Fix Missing language key	2020-08-23 07:13:43 +02:00
Laurent Destailleur	a265bec7ca	NEW Events in agenda for contact ... FIX Saving contacts of an events	2020-08-23 02:38:56 +02:00
jove@bisquerra.com	d9cbd8f998	NEW: Print payment method and change in TakePOS	2020-08-22 18:28:15 +02:00
Laurent Destailleur	03af14294a	Standardize code. Debug module HRM	2020-08-22 15:29:19 +02:00
Laurent Destailleur	dabe804299	Add numbering modules for candidatures. Mass action Validate.	2020-08-22 03:49:46 +02:00
Laurent Destailleur	220fc6db98	Work on recruitment module	2020-08-21 13:00:12 +02:00
Laurent Destailleur	ad0625b6ec	Debug posting message from ticket page	2020-08-21 01:11:22 +02:00
Laurent Destailleur	66f9f37f41	Minor code and doc enhancement	2020-08-20 19:00:43 +02:00
Laurent Destailleur	7217dc3114	Better perf for phpunit on very large databases	2020-08-19 01:43:48 +02:00
Laurent Destailleur	964c4ef0d2	Standardize code. Use model_pdf.	2020-08-18 14:48:38 +02:00
Laurent Destailleur	e65e4a6d47	Beautify for of member module	2020-08-18 11:52:00 +02:00
Laurent Destailleur	24703b8fe7	Merge pull request #14487 from aspangaro/13a4 ... NEW Add a start date to begin binding in accountancy	2020-08-17 22:20:46 +02:00
Laurent Destailleur	bd65e5612f	Fix duplicate id	2020-08-17 20:06:01 +02:00
Laurent Destailleur	c63d54631c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/categories/class/categorie.class.php	2020-08-17 19:59:17 +02:00
Laurent Destailleur	487d26c7db	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php	2020-08-17 19:54:23 +02:00
Laurent Destailleur	8bfa6df1a6	FIX Update extrafields on line only if it is supported ... Conflicts: htdocs/modulebuilder/template/class/myobject.class.php	2020-08-17 16:06:36 +02:00
Laurent Destailleur	8e00c9c304	FIX Update extrafields on line only if it is supported	2020-08-17 15:53:33 +02:00
Alexandre SPANGARO	498431fa6f	NEW Add a start date to begin binding in accountancy	2020-08-17 15:27:05 +02:00
Laurent Destailleur	99809b487e	Standardize code	2020-08-16 23:33:50 +02:00
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
lvessiller	d5acc85ef0	FIX param entity in html form file	2020-08-14 12:18:28 +02:00
Laurent Destailleur	0381cf5665	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop ... Conflicts: htdocs/core/modules/modPaymentByBankTransfer.class.php htdocs/filefunc.inc.php	2020-08-14 11:08:53 +02:00
Laurent Destailleur	056a503200	Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 ... Conflicts: htdocs/product/composition/card.php	2020-08-14 11:06:39 +02:00
Laurent Destailleur	030df58fea	Fix regression in sending emails	2020-08-07 17:11:23 +02:00
Laurent Destailleur	795754273e	Fix regression in sending emails	2020-08-07 17:06:57 +02:00
Laurent Destailleur	bd5c4603e3	Fix regression in sending emails	2020-08-07 17:06:12 +02:00
Laurent Destailleur	00804c1020	Complete fix for #14146	2020-08-07 15:19:26 +02:00
Laurent Destailleur	6fd433167f	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/CMailFile.class.php	2020-08-07 11:59:55 +02:00