1947 Commits

Author	SHA1	Message	Date
Florian HENRY	1e8117dc8a	fix js	2021-02-08 11:49:30 +01:00
Gauthier PC portable 024	41af1a59f4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-08 10:37:01 +01:00
Gauthier PC portable 024	e2a73e6c88	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-02-08 09:46:48 +01:00
Philippe GRAND	b2e61aa499	fix typo	2021-02-05 18:23:17 +01:00
Gauthier PC portable 024	df8ca1ef84	Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries	2021-02-05 09:29:20 +01:00
Gauthier PC portable 024	e188ec6cd7	NEW : add real payments on salaries objects	2021-02-04 17:21:08 +01:00
Laurent Destailleur	2e7de1d137	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php test/phpunit/ExportTest.php	2021-02-02 16:17:53 +01:00
Laurent Destailleur	c5201b95bb	FIX Must not be able to edit vat of all lines if not draft	2021-02-02 16:12:03 +01:00
Laurent Destailleur	bd9eb4c949	FIX Assignement of actors on tasks	2021-02-02 15:36:54 +01:00
Laurent Destailleur	fed99aa3bb	FIX Assignement of actors on tasks	2021-02-02 15:35:40 +01:00
Laurent Destailleur	e6deed1601	Fix collapse	2021-02-01 15:40:59 +01:00
Gauthier PC portable 024	1eb4968a29	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-02-01 12:00:04 +01:00
Laurent Destailleur	641885d814	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-31 19:05:27 +01:00
Laurent Destailleur	3801dd34cd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php	2021-01-31 19:02:57 +01:00
Laurent Destailleur	d023afb66f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-01-31 18:55:11 +01:00
Gauthier PC portable 024	8a5588e518	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-01-28 10:28:36 +01:00
Florian Mortgat	8dfe39258b	FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion	2021-01-27 23:46:09 +01:00
Adrien Raze	6ab63a10d6	FIX : Linked extrafields don't work with string value	2021-01-26 09:37:28 +01:00
Laurent Destailleur	0861c639ae	Fix sql injection	2021-01-25 12:40:52 +01:00
Laurent Destailleur	470cd5c682	Clean code	2021-01-25 12:39:44 +01:00
Laurent Destailleur	0f5fc7353e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/index.php htdocs/admin/mailing.php htdocs/admin/paymentbybanktransfer.php htdocs/admin/prelevement.php htdocs/modulebuilder/template/admin/setup.php	2021-01-24 15:29:53 +01:00
Laurent Destailleur	c5bbaffb50	Fix look and feel v13	2021-01-23 19:50:04 +01:00
Laurent Destailleur	af438624a6	Update commonobject.class.php	2021-01-21 13:21:22 +01:00
Laurent Destailleur	0a55ba32f8	Merge branch 'develop' into FIX/Linked_extrafields_10.0	2021-01-21 13:20:34 +01:00
Adrien Raze	645685d16e	FIX : Linked extrafields list	2021-01-20 18:39:18 +01:00
Gauthier PC portable 024	e2abbbcece	Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects	2021-01-19 08:57:24 +01:00
David Bensel	9813cb430a	FIX: type 'sellist' not handled properly in showInputField and showOutputField	2021-01-18 19:14:12 +01:00
Gauthier PC portable 024	2cfaf5fbd6	NEW : add real payments on vat objects	2021-01-18 17:08:17 +01:00
David Bensel	85d63891d9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2021-01-18 17:33:22 +03:00
David Bensel	b777a0660c	FIX: type 'sellist' not handled properly in showInputField and showOutputField	2021-01-18 17:31:49 +03:00
Frédéric FRANCE	923a5fe2a5	Merge remote-tracking branch 'upstream/develop' into davadmin	2021-01-13 18:45:29 +01:00
Laurent Destailleur	0af5c9ae91	Fix phpcs	2021-01-13 17:45:17 +01:00
Frédéric FRANCE	40a45efb63	fix code	2021-01-13 16:23:54 +01:00
Frédéric FRANCE	cb7266d261	fix trans	2021-01-13 16:18:23 +01:00
Laurent Destailleur	c2187b2ff1	Merge branch 'develop' into develop_new_workstation	2021-01-11 17:59:13 +01:00
Laurent Destailleur	9962c182c4	Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr ... NEW : Extrafields of documents lines are inside the lines, not any more on separate TR	2021-01-11 16:15:45 +01:00
Gauthier PC portable 024	6668cfa311	FIX : name in copyrights	2021-01-11 11:40:04 +01:00
Gauthier PC portable 024	e3e4f0590c	FIX : get and delete linked items with association tables methods created in common object	2021-01-11 11:36:19 +01:00
Laurent Destailleur	3d2dc59468	Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment ... NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()	2021-01-07 10:49:06 +01:00
Regis Houssin	f80a476bc5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-06 11:37:56 +01:00
kamel	32109de67b	NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()	2021-01-06 11:14:13 +01:00
Florian HENRY	f953ff0334	fix sticker	2021-01-05 15:25:47 +01:00
Florian HENRY	a2a45c6aa0	fix sticker	2021-01-05 15:22:31 +01:00
Florian HENRY	27c32560c6	Merge develop	2021-01-05 14:46:50 +01:00
Laurent Destailleur	ed25b252b9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 11:30:14 +01:00
Florian HENRY	86075a4db9	review code	2021-01-04 20:00:57 +01:00
Laurent Destailleur	c58451dbb6	Code comment	2021-01-04 16:07:54 +01:00
Regis Houssin	e36ae4ac90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 13:14:30 +01:00
Regis Houssin	aec01a95fc	FIX again and again	2020-12-29 17:48:52 +01:00
Florian HENRY	1e438b686e	fix stickler	2020-12-28 21:32:46 +01:00
Florian HENRY	806b40662f	merge develop	2020-12-28 21:15:25 +01:00
Laurent Destailleur	1546805b9e	Merge pull request #15500 from frederic34/patch-10 ... NEW add db fields note_public note_private for ecm	2020-12-27 15:07:51 +01:00
Florian HENRY	720539ff46	on goung	2020-12-23 23:52:43 +01:00
Florian HENRY	26d3ea2227	on going	2020-12-23 23:32:50 +01:00
Laurent Destailleur	4471d7d1da	FIX debug report expense/income	2020-12-23 22:18:38 +01:00
Laurent Destailleur	940f0484ee	FIX debug report expense/income	2020-12-23 22:17:05 +01:00
Laurent Destailleur	7fae5ea800	Code clean	2020-12-20 18:21:34 +01:00
Laurent Destailleur	a67068ab7b	Fix warnings	2020-12-17 18:08:56 +01:00
Laurent Destailleur	b0d524beed	Debug v13	2020-12-17 11:57:12 +01:00
David Bensel	bc9f7c83f4	update	2020-12-14 22:40:47 +03:00
Laurent Destailleur	3d33d3aa3a	Fix warning	2020-12-13 14:36:00 +01:00
Frédéric FRANCE	346fe8ae85	clean	2020-12-12 22:35:51 +01:00
Frédéric FRANCE	4664ac1a1c	socialnetworks links	2020-12-12 17:00:23 +01:00
Laurent Destailleur	2adbd29b49	Debug generation of doc from modulebuilder	2020-12-11 14:22:36 +01:00
Laurent Destailleur	1f28590e5e	Fix style	2020-12-10 19:05:54 +01:00
Laurent Destailleur	6e403e6ce0	Fix warnings	2020-12-07 18:29:14 +01:00
Frédéric FRANCE	a2eab824c1	Merge remote-tracking branch 'upstream/develop' into patch-10	2020-12-04 20:42:22 +01:00
Laurent Destailleur	d88173d7ba	Fix bad column	2020-12-02 19:13:32 +01:00
Laurent Destailleur	9e18997e64	FIX #15595	2020-12-02 16:35:43 +01:00
Laurent Destailleur	49be354c3e	Fix warning	2020-12-02 14:05:17 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
Laurent Destailleur	2707c0b89b	Look and feel v13	2020-11-30 20:13:42 +01:00
Laurent Destailleur	958893228a	Fix combo to add contact and status of contact on popup	2020-11-30 15:18:58 +01:00
Frédéric FRANCE	1704de39bb	Merge remote-tracking branch 'upstream/develop' into patch-10	2020-11-27 11:18:04 +01:00
Laurent Destailleur	47a5037155	Fix dolGetFirstLastname() for 4 and 5	2020-11-27 01:18:01 +01:00
Laurent Destailleur	3588781180	Debug v13	2020-11-26 14:15:20 +01:00
Laurent Destailleur	e272130a6a	Fix phpcs	2020-11-26 08:40:08 +01:00
Laurent Destailleur	74605cec12	Fix warning	2020-11-25 18:07:52 +01:00
Laurent Destailleur	4d90fb22de	Fix sql syntax error	2020-11-25 15:07:26 +01:00
Laurent Destailleur	5030f0c587	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/opensurvey/wizard/create_survey.php	2020-11-25 14:55:31 +01:00
Laurent Destailleur	bf7b6ee00d	Fix delete of proposal	2020-11-25 14:15:59 +01:00
Frédéric FRANCE	66ad0e5b13	add note on ecm files	2020-11-24 18:54:59 +01:00
Laurent Destailleur	efc539c4b4	Fix css	2020-11-23 19:53:58 +01:00
Laurent Destailleur	2f6f242d99	CSS	2020-11-23 12:29:38 +01:00
Laurent Destailleur	9004be1df2	Debug feature to send remind by email	2020-11-21 17:42:07 +01:00
Laurent Destailleur	6bbeb6d3a0	Fix debug creation of shipment with virtual product.	2020-11-16 16:31:05 +01:00
Laurent Destailleur	ac5fa6c6df	Clean code	2020-11-16 12:54:16 +01:00
Laurent Destailleur	2e0e42e918	Fix warning	2020-11-15 14:37:21 +01:00
Frédéric FRANCE	0a5e041775	Merge remote-tracking branch 'upstream/develop' into odtformembers	2020-11-14 00:56:21 +01:00
Frédéric FRANCE	4ca3c0aa95	Add odt for members	2020-11-14 00:48:13 +01:00
Laurent Destailleur	3c5ef18b36	FIX #15390	2020-11-14 00:47:28 +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	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	807d3b99c9	Fix update field when visilbity is 4 or -4	2020-11-09 09:53:56 +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	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
Laurent Destailleur	b0e2d40533	Debug and fix v13	2020-11-03 14:19:54 +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	125b94d749	Merge pull request #15234 from frederic34/patch-8 ... doxygen	2020-10-31 15:05:41 +01: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	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	a24071492e	Start fix for php8 compatibility	2020-10-30 05:56:07 +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	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	e7743948cb	Merge pull request #15120 from frederic34/patch-6 ... Update commonobject.class.php	2020-10-25 14:50:56 +01:00
Maxime Kohlhaas	bedfb7ac8d	Fix BOM position field	2020-10-24 19:19:06 +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	f00fa93903	FIX check on required field when updating 1 extrafields.	2020-10-23 17:31:17 +02:00
Laurent Destailleur	572637b726	Enhance update of 1 extrafield (simple update instead of delete+insert)	2020-10-23 15:31:13 +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
Florian HENRY	d4fd71d0b3	fix #14649	2020-10-20 19:58:11 +02:00
Laurent Destailleur	f2fafe04b6	Update doc	2020-10-17 18:16:03 +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
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
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +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	33d578a660	Fix bad management of default value in database on create form	2020-09-26 04:25:06 +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	54c0f742b1	Fix escape	2020-09-19 21:19:04 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	e5191cad24	Move code of incoterm into the Incoterm Trait.	2020-09-16 02:50:18 +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	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
Laurent Destailleur	009c7eaf31	Standardize code with module builder	2020-09-11 16:16:04 +02:00
Laurent Destailleur	12fba9e679	Fix label	2020-09-09 15:19:12 +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
lvessiller	86ce4315be	FIX load default linked options for linked sellist extra fields	2020-09-07 15:19:58 +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
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	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
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
Laurent Destailleur	bd7261a449	Debug recruitment module	2020-08-23 18:04:52 +02:00
Laurent Destailleur	dabe804299	Add numbering modules for candidatures. Mass action Validate.	2020-08-22 03:49:46 +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	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	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
Laurent Destailleur	fb811a1656	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/database-tables.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/commonobject.class.php htdocs/langs/fr_FR/withdrawals.lang htdocs/societe/class/societe.class.php	2020-08-03 14:44:01 +02:00
Laurent Destailleur	c2bb0431f0	FIX input field of extrafields must keep data if form submit fails.	2020-08-03 12:31:30 +02:00
Laurent Destailleur	d59bcd3f5b	FFIX error creating record when extrafields price exists in other entity	2020-08-03 12:08:33 +02:00
Laurent Destailleur	7149cbb532	NEW Add public note on products. This also partially fix the #14342	2020-08-02 17:09:21 +02:00
Laurent Destailleur	be34a2c607	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/cashdesk.lang htdocs/product/stock/list.php	2020-08-02 16:06:51 +02:00
Laurent Destailleur	ecfdb4bbac	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-02 16:02:09 +02:00
Laurent Destailleur	3d79950c27	Update commonobject.class.php	2020-07-29 14:13:29 +02:00
Laurent Destailleur	714481f7e5	FIX Navigation in object fails to find the next ref in some cases	2020-07-26 21:08:31 +02:00
Laurent Destailleur	a2dd80bcc8	FIX Navigation in object fails to find the next ref in some cases	2020-07-26 21:07:39 +02:00
quentin	255bd6b26c	FIX null required	2020-07-22 11:54:52 +02:00
Laurent Destailleur	0d24b979c1	Fix phpcs	2020-07-11 01:20:20 +02:00
Laurent Destailleur	bb056fc811	Fix bad return value	2020-07-10 03:02:49 +02:00
Laurent Destailleur	f2c84fba3d	Merge pull request #14202 from pstructures/PSdevelop ... Added Hook to showOptionals Function	2020-07-10 02:54:05 +02:00
Laurent Destailleur	96c583b84e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-10 02:28:34 +02:00
Laurent Destailleur	b8721e0c64	FIX Change position of line in BOM	2020-07-09 16:00:15 +02:00
Matt Sidnell	39104009ef	Updated to match inline with code received from fork	2020-07-08 14:25:37 +01:00
Matt Sidnell	580b9db3e7	Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...	2020-07-08 14:20:59 +01:00
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
Laurent Destailleur	344098fe23	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/actions_fetchobject.inc.php htdocs/langs/fr_FR/contracts.lang htdocs/langs/fr_FR/loan.lang htdocs/langs/fr_FR/stocks.lang	2020-07-05 13:01:00 +02:00
Laurent Destailleur	b726e96f4b	FIX Update form erased extrafields that were hidden	2020-07-04 17:09:20 +02:00
Laurent Destailleur	1c19c97cf2	FIX missing setup of extrafields for MO ... FIX all extrafields cleared after update of one of them FIX Update of extrafields date FIX Update of extrafiels on draft object FIX Sql type Fix trans on BOM	2020-07-04 16:14:53 +02:00
Laurent Destailleur	a44f5376da	Update commonobject.class.php	2020-07-03 00:27:30 +02:00
quentin	d2a364eea8	NEW get all child recursively	2020-07-01 14:10:43 +02:00
Laurent Destailleur	88cf904ced	Fix edit of tag of website	2020-06-30 02:50:58 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	c54294285a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/mailing/class/html.formadvtargetemailing.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php	2020-06-20 12:28:14 +02:00
Laurent Destailleur	2de3eb8ac0	Fix CSS	2020-06-20 00:00:17 +02:00
Laurent Destailleur	4627f06c70	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
Laurent Destailleur	b7d835eceb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-06-15 16:10:27 +02:00
Laurent Destailleur	1ba03566dc	Fix case of delete contact not correctly implemented.	2020-06-12 02:15:02 +02:00
Laurent Destailleur	ee611fa7a0	Fix bad definition of field for parent	2020-06-11 18:32:05 +02:00
Laurent Destailleur	c289001507	Fix bad definition of field for parent	2020-06-11 18:31:26 +02:00
Laurent Destailleur	ff9312c96a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/card.php htdocs/compta/prelevement/class/ligneprelevement.class.php htdocs/compta/prelevement/create.php htdocs/compta/prelevement/line.php	2020-06-08 20:36:54 +02:00