7668 Commits

Author	SHA1	Message	Date
Laurent Destailleur	aaddda9a6e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/bookkeeping/listbysubaccount.php htdocs/accountancy/class/accountancyexport.class.php htdocs/user/class/usergroup.class.php	2021-01-14 14:13:08 +01:00
Laurent Destailleur	75323859e4	Add some hooks to add new buttons (compensation of removal of tabs).	2021-01-12 13:58:16 +01:00
Laurent Destailleur	bad4b14ba5	Fix properties	2021-01-12 10:34:15 +01:00
kevin	5ff18baaa8	Add hook to allow external modules to add their own shortlist of recent objects	2021-01-11 17:13:07 +01:00
Laurent Destailleur	de9835ae47	Merge pull request #15936 from bb2a/warhouse_in_propal ... NEW Can ask the warehouse in proposal	2021-01-11 16:23:15 +01:00
Laurent Destailleur	c4de93fbb7	Update card.php	2021-01-11 16:21:15 +01:00
Laurent Destailleur	e3a1cabd87	Merge pull request #15942 from bb2a/add_alias_on_lists ... NEW Add column "alias" of company in list of proposal, order, invoice	2021-01-11 15:56:22 +01:00
Laurent Destailleur	16253a79ee	FIX GETPOST of qty with wrong parameters ... Conflicts: htdocs/bom/bom_card.php	2021-01-11 13:11:40 +01:00
Laurent Destailleur	f3e28c2dd0	FIX GETPOST of qty with wrong parameters	2021-01-11 13:00:29 +01:00
Anthony Berton	b3dfe5d934	Update list.php	2021-01-10 21:48:49 +01:00
Anthony Berton	52c9dab72a	Update list.php	2021-01-10 21:47:17 +01:00
stickler-ci	55e6010d85	Fixing style errors.	2021-01-10 00:15:00 +00:00
Anthony Berton	d3fa8b9f20	20210110	2021-01-10 01:07:27 +01:00
Anthony Berton	8eaf7b3a3f	1	2021-01-09 17:36:14 +01:00
Anthony Berton	5effd4e897	20210109	2021-01-09 02:45:46 +01:00
Laurent Destailleur	8c3e7b4dc6	Fix vardump	2021-01-07 12:43:15 +01:00
Laurent Destailleur	6da3ed1a51	Merge 2 exclusive options into 1	2021-01-07 12:39:51 +01:00
Laurent Destailleur	26fa8b45ac	Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product ... NEW: preload product description on selection for customer propal/order/invoice	2021-01-07 11:19:53 +01:00
Laurent Destailleur	4f55d51eac	Merge pull request #15886 from FHenry/dev_add_column_propal_order ... NEW : Column shippement method, payment mode, payment term in propal and order list	2021-01-07 11:04:30 +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
Florian HENRY	6e7172887a	Merge branch '13_backport' into dev_add_column_propal_order	2021-01-05 22:58:00 +01:00
Florian HENRY	510c619c85	space	2021-01-05 22:56:55 +01:00
Florian HENRY	b9bb48a01f	better place and noadmininfo	2021-01-05 22:50:54 +01:00
Florian HENRY	939fecc611	add column payment mode terms shipping on order list	2021-01-05 20:32:29 +01:00
Florian HENRY	253349ced2	add column payment mode terms shipping on propal list	2021-01-05 20:23:45 +01:00
Laurent Destailleur	ba68c958e1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 19:12:57 +01:00
Laurent Destailleur	8dc4e5929c	Fix var not defined	2021-01-05 12:43:57 +01:00
Regis Houssin	ec6c14beb8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-05 09:41:52 +01:00
Laurent Destailleur	8baa4c67ae	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-04 12:34:09 +01:00
Laurent Destailleur	b0738643fb	FIX Solve problem with TZ	2021-01-03 18:42:45 +01:00
Laurent Destailleur	645b7694c9	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/db/DoliDB.class.php	2021-01-03 15:26:31 +01:00
Florian HENRY	dfaf77b03f	merge develop	2021-01-03 15:14:34 +01:00
Laurent Destailleur	8ad5dc81de	GETPOST	2021-01-03 15:13:29 +01:00
Regis Houssin	3b7f5a92cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 17:20:24 +01:00
Laurent Destailleur	150b338764	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 17:02:08 +01:00
Laurent Destailleur	7b3ed7301d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2021-01-02 17:01:03 +01:00
Laurent Destailleur	fd4dab495f	FIX Bad cleaning of VAT rate when numbers are into code	2021-01-02 16:51:34 +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
Laurent Destailleur	17b68a30d7	Merge branch 'develop' into dev_add_tag_on_massaction	2020-12-30 13:10:02 +01:00
Regis Houssin	aec01a95fc	FIX again and again	2020-12-29 17:48:52 +01:00
Laurent Destailleur	cefd66c18f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-29 16:56:39 +01:00
Laurent Destailleur	e07486b626	Fix columns of download of list of targets of emailing	2020-12-29 02:20:10 +01:00
Florian HENRY	806b40662f	merge develop	2020-12-28 21:15:25 +01:00
Laurent Destailleur	7c3688c66f	Fix var not defined	2020-12-28 12:36:36 +01:00
Laurent Destailleur	a6eb14f68b	Merge pull request #15585 from cfoellmann/fckeditor-notes ... NEW Can toggle FCKeditor on public/private notes	2020-12-27 15:06:35 +01:00
Frédéric FRANCE	12f4a74a74	Merge remote-tracking branch 'upstream/develop' into mailingcard	2020-12-27 14:04:04 +01:00
Florian HENRY	d3bdb72cc8	finish	2020-12-24 15:03:12 +01:00
Florian HENRY	1b6a4fc4ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction	2020-12-24 15:00:15 +01:00
Florian HENRY	f03574d061	bank ok	2020-12-24 14:56:26 +01:00
Florian HENRY	79fe5ee34c	actioncomm ok	2020-12-24 14:35:40 +01:00
Laurent Destailleur	58cd7c97a5	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/comm/mailing/card.php htdocs/comm/mailing/cibles.php htdocs/comm/mailing/class/mailing.class.php	2020-12-24 13:05:17 +01:00
Laurent Destailleur	739695c442	Fix delay to wait between email for emailing refused float.	2020-12-24 12:49:17 +01:00
Laurent Destailleur	360a85cbbc	FIX add autofix of count of email target when data is corrupted	2020-12-24 12:32:34 +01:00
Laurent Destailleur	d65dc85a10	FIX for php 8	2020-12-23 19:16:25 +01:00
Laurent Destailleur	361f13154b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/card.php htdocs/margin/tabs/thirdpartyMargins.php htdocs/societe/card.php htdocs/societe/note.php htdocs/societe/notify/card.php htdocs/societe/societecontact.php htdocs/ticket/list.php	2020-12-20 14:31:54 +01:00
Laurent Destailleur	8c87050703	FIX Check of customer/vendor code fails in some cases	2020-12-20 13:54:02 +01:00
Laurent Destailleur	5fe8c599d2	Fix warning	2020-12-16 00:28:57 +01:00
Laurent Destailleur	427fb16256	Fix warning	2020-12-13 13:29:47 +01:00
Laurent Destailleur	a5d2e04dea	Debug v13	2020-12-12 19:09:07 +01:00
Laurent Destailleur	aa8a6fde84	Merge pull request #15726 from FHenry/develop ... fix: manage price min for PRODUIT_CUSTOMER_PRICES	2020-12-11 14:36:32 +01:00
Laurent Destailleur	697ca3e4f5	Fix selection of duration type	2020-12-11 02:23:43 +01:00
Florian HENRY	2a2b372ba9	fix: manage price min for PRICE PER CUSTOMER	2020-12-10 15:08:36 +01:00
Frédéric FRANCE	cb77d9f175	Merge remote-tracking branch 'upstream/develop' into mailingcard	2020-12-09 08:55:46 +01:00
Laurent Destailleur	769a8886b9	Debug notification on events	2020-12-08 20:32:37 +01:00
Laurent Destailleur	bfa813e1b0	Load langs	2020-12-08 20:16:41 +01:00
Laurent Destailleur	0234df6224	Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty ... Fix boxes third-parties information	2020-12-08 17:58:09 +01:00
Laurent Destailleur	240648d540	css	2020-12-08 17:09:48 +01:00
Stephane Lesage	e25862ec8d	Third-party details in Lists in comm index	2020-12-08 15:47:34 +01:00
Laurent Destailleur	efc3bad7c6	Merge pull request #15678 from frederic34/fk_element ... doxygen	2020-12-07 22:31:08 +01:00
Laurent Destailleur	6e403e6ce0	Fix warnings	2020-12-07 18:29:14 +01:00
Frédéric FRANCE	4e18f46f28	doxygen	2020-12-05 23:53:55 +01:00
Laurent Destailleur	3b55eb1d82	FIX master must be after session_start but dol_getprefix must be before ... and after filefunc.inc.php.	2020-12-05 13:26:58 +01:00
Laurent Destailleur	f06d920460	FIX #15583	2020-12-03 16:22:03 +01:00
Laurent Destailleur	5bd6d6f388	Look and feel v13	2020-12-03 14:34:15 +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
Christian Foellmann	f801dd7d66	PR toggle FCKeditor on public/private notes	2020-11-30 16:39:14 +01:00
Laurent Destailleur	958893228a	Fix combo to add contact and status of contact on popup	2020-11-30 15:18:58 +01:00
Laurent Destailleur	00ad6df395	Fight against $_POST	2020-11-30 14:47:07 +01:00
Laurent Destailleur	7634212811	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/phpinfo.php htdocs/commande/stats/index.php htdocs/compta/facture/stats/index.php	2020-11-29 21:35:03 +01:00
Laurent Destailleur	d3a2aa664f	FIX #15572	2020-11-29 20:27:40 +01:00
Laurent Destailleur	59b445a103	Clean dead code	2020-11-28 14:47:39 +01:00
Laurent Destailleur	2989ff50fa	Fix syntax error	2020-11-28 13:52:52 +01:00
Frédéric FRANCE	391e643eb7	doxygen	2020-11-27 20:33:40 +01:00
Frédéric FRANCE	ba352c2374	remove warnings	2020-11-27 20:20:04 +01:00
stickler-ci	aaf8d43780	Fixing style errors.	2020-11-27 13:33:37 +00:00
iouston	59c40227ff	Add PROPAL_ENABLE_NEGATIVE ... in the case of a call for tenders it is possible to have to figure in less value with quotations whose total is negative	2020-11-27 14:31:14 +01:00
Frédéric FRANCE	fa6d02fb3f	doxygen	2020-11-27 00:25:45 +01:00
Frédéric FRANCE	bb09c84417	doxygen	2020-11-27 00:23:03 +01:00
Frédéric FRANCE	446997d0ba	doxygen	2020-11-27 00:15:07 +01:00
Laurent Destailleur	69b06a25e8	Fix code of deletion of objects	2020-11-26 09:16:16 +01:00
Laurent Destailleur	944e2a8032	Fix delete of expense report	2020-11-25 15:29:18 +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
StephaneLesage	2bf44d276b	simple & dirty refresh of prospection status icon/label by re-fetching after update	2020-11-25 06:35:05 +01:00
Laurent Destailleur	81566289cd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php	2020-11-24 11:07:35 +01:00
Laurent Destailleur	f046673d80	Merge pull request #15485 from frederic34/patch-8 ... The variable does not seem to be defined for all execution path	2020-11-23 22:07:49 +01:00
Laurent Destailleur	5822fcfbed	FIX several warning with the barcode use in ODT templates	2020-11-23 21:38:45 +01:00
Givriz	dca4cf5987	Feature : ajout de la class "button-cancel" ... Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.	2020-11-23 15:12:52 +01:00
Frédéric FRANCE	b3350e033a	The variable does not seem to be defined for all execution path	2020-11-22 20:36:05 +01:00
Laurent Destailleur	fe0764be6e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/expedition/class/expedition.class.php htdocs/product/class/product.class.php	2020-11-22 02:32:47 +01:00
Laurent Destailleur	a30e842521	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-21 23:48:34 +01:00
Laurent Destailleur	60bfbe2e57	Merge pull request #15448 from Givriz/dev ... Feature : creation of a "button-save" class	2020-11-21 23:44:30 +01:00
Laurent Destailleur	9004be1df2	Debug feature to send remind by email	2020-11-21 17:42:07 +01:00
Laurent Destailleur	bf94ce6aad	Fix warnings	2020-11-21 16:49:54 +01:00
Laurent Destailleur	3534555909	Fix setup of scheduled jobs	2020-11-21 14:14:53 +01:00
Givriz	c48129e279	Ajout de la class "button-save" ... Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)	2020-11-19 20:23:38 +01:00
Florian HENRY	46326d7659	merge from develop	2020-11-19 13:53:34 +01:00
quentin	6ce006f853	FIX cant empty action comm desc	2020-11-16 15:46:16 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Frédéric FRANCE	f375640350	Update cactioncomm.class.php	2020-11-11 23:24:09 +01:00
Laurent Destailleur	90884d8085	Fix compatibility with date_delivery	2020-11-11 18:08:40 +01:00
Laurent Destailleur	6536208a14	Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile ... NEW include tpl for loading lang file for extra fields in list	2020-11-10 14:42:21 +01:00
Laurent Destailleur	a9fbe9dd6c	Fix remove warning	2020-11-08 00:18:41 +01:00
lvessiller	4ddff7173f	NEW include tpl for loading lang file for extra fields in list	2020-11-06 12:19:45 +01:00
bahfir abbes	078a60bac5	fix:initialize ref with id value	2020-11-06 00:41:49 +01:00
Laurent Destailleur	7294a47ef5	Fix generation of user from member, contact, applications for job	2020-11-04 13:33:52 +01:00
Laurent Destailleur	9e967a578e	FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE	2020-11-03 02:17:51 +01:00
Laurent Destailleur	83a7b19333	Look and feel v13	2020-11-02 11:41:07 +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
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	7b6bc3de63	Update propal.class.php	2020-10-31 13:25:19 +01:00
Laurent Destailleur	e42dee3c8e	Merge pull request #15224 from frederic34/apiclean ... doxygen	2020-10-31 04:24:53 +01:00
Laurent Destailleur	44f532e1da	Fix look and feel v13	2020-10-31 03:50:16 +01:00
Frédéric FRANCE	8190711342	doxygen	2020-10-30 18:01:01 +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
Florian HENRY	d77a0b40a8	tested and approuve feaure #15036	2020-10-28 16:37:41 +01:00
Florian HENRY	a3073be8e4	Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product	2020-10-28 08:52:29 +01:00
Laurent Destailleur	33e56a2d7c	Fix decimal qty for #14666	2020-10-27 19:56:36 +01:00
Frédéric FRANCE	5a3780e062	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
Francis Appels	93ab281d81	Fix tab indent	2020-10-26 18:21:47 +01:00
Francis Appels	3ff6f6a04a	Move phpcs enable to correct location @frederic34	2020-10-26 18:13:25 +01:00
Francis Appels	7fa7f0a390	Re-add set_date_livraison as a deprecated function. ... Use correct naming convention for new method naming.	2020-10-26 16:50:52 +01:00
Florian HENRY	7c2b5b614f	NEW: preload product description on selection for customer propal/order/invoice	2020-10-25 19:13:09 +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	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve ... retrieve the spelling	2020-10-25 14:48:51 +01:00
Laurent Destailleur	bb147d2599	FIX #15140	2020-10-25 14:12:34 +01:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Laurent Destailleur	572637b726	Enhance update of 1 extrafield (simple update instead of delete+insert)	2020-10-23 15:31:13 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Laurent Destailleur	8074d2cc1d	NEW Add validation of MX domain for emails	2020-10-22 20:01:59 +02:00
David	12a599d1c7	Allow "demand reason" field update though API	2020-10-22 15:53:55 +02:00
Laurent Destailleur	ef182bed07	Fix browser reminder	2020-10-18 14:00:47 +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 Destailleur	a9521b13f9	FIX Assignement of event to create when created from view per user.	2020-10-17 19:52:23 +02:00
Laurent Destailleur	05535556c7	css	2020-10-17 16:39:47 +02:00
Laurent Destailleur	1a1e23bf5d	Clean code	2020-10-17 16:01:43 +02:00
Laurent Destailleur	7b20e703ee	Clean code	2020-10-17 15:53:31 +02:00
Laurent Destailleur	e3552e7e02	Clean code	2020-10-16 20:17:54 +02:00
Laurent Destailleur	e74b833d7f	Look and feel v13	2020-10-16 15:40:52 +02:00
Laurent Destailleur	4c684536d1	Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab ... NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late	2020-10-15 20:16:45 +02:00
Laurent Destailleur	2155c0123d	Merge pull request #15021 from Givriz/dev ... Fix : correction de commentaires	2020-10-15 20:15:12 +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
stickler-ci	cd5201e40a	Fixing style errors.	2020-10-15 10:24:00 +00:00
Florian HENRY	0cb04d14d7	NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late	2020-10-15 12:20:37 +02:00
Laurent Destailleur	bc1ad96ad1	FIX #14993	2020-10-14 19:28:59 +02:00
Givriz	c50e288a07	Correction de commentaires ... Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).	2020-10-14 18:26:05 +02:00
Laurent Destailleur	7838ca32ba	Fix sql injection reported by Jason Nordenstam	2020-10-14 01:52:53 +02:00
Laurent Destailleur	7c67dbf6d5	Better responsive	2020-10-13 10:05:47 +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	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
Laurent Destailleur	eb41a72e27	Properties ->titre have been renamed into ->title	2020-10-07 17:41:36 +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
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Laurent Destailleur	95f67309e2	Clean code	2020-10-06 15:11:45 +02:00
Laurent Destailleur	e3542c6d4f	Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights ... NEW Show category filter on lists only when user have rights to read categories	2020-10-06 12:29:10 +02:00
Aurélien	5571a166c6	change variable #14697	2020-10-06 11:37:55 +02:00
Laurent Destailleur	ee40aeecce	Standardize API	2020-10-05 12:21:54 +02:00
Laurent Destailleur	5256229089	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-02 13:51:47 +02:00
Laurent Destailleur	10deb1baad	Clean code - Removed no more used files orderstoinvoice.php	2020-10-02 13:51:32 +02:00
Laurent Destailleur	d297e0b05a	Update card.php	2020-10-02 13:46:44 +02:00
stickler-ci	4707ea2a27	Fixing style errors.	2020-10-02 06:48:14 +00:00
Nicolas	d976d474df	NEW Hook on propal card	2020-10-02 08:42:48 +02:00
Laurent Destailleur	813deee4a5	Fix phpcs	2020-10-02 01:14:43 +02:00
Laurent Destailleur	ed69b6ad15	Merge pull request #14863 from bomuux/patch-2 ... Bug: ActionComm::ref_ext is not saved properly	2020-10-01 19:21:28 +02:00
Laurent Destailleur	d912908aef	NEW Can build vendor invoice from vendor orders	2020-10-01 19:05:20 +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	f442dac2c9	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
Laurent Destailleur	a3da2afe7a	Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES	2020-09-30 11:58:40 +02:00
bomuux	9ed6092ed8	Bug: ActionComm::ref_ext is not saved properly ... ActionComm::ref_ext is considered to be a timestamp in ActionComm::create(), (but not in ActionComm::create()). Correction to consider it a string.	2020-09-29 19:56:22 +02:00
Laurent Destailleur	708ac91a39	Merge pull request #14825 from atm-greg/fix_notification_system ... Fix notification system	2020-09-29 14:13:33 +02:00
atm-greg	a61f79c039	only update reminders if event is not past	2020-09-29 14:10:24 +02:00
atm-greg	1ed6312f4b	add modification of the notifications	2020-09-29 14:08:49 +02:00
atm-greg	988a532bed	fix br	2020-09-28 16:37:17 +02:00
Sekan, Tobias	2bf15b3a92	Show category filter only on rights to read it	2020-09-28 10:42:49 +02:00
Laurent Destailleur	f851ce2f0f	Merge pull request #14741 from Tim-Otte/fix-zero-price-lines ... FIX: Allow product price equal zero in new lines	2020-09-27 20:46:36 +02:00
Laurent Destailleur	3c6dda9dd5	Clean code	2020-09-25 10:27:30 +02:00
atm-greg	554948d3e2	bad user for getNomUrl	2020-09-24 15:34:52 +02:00
atm-greg	5244c05abb	reminders in the future can be displayed too	2020-09-24 15:30:29 +02:00
atm-greg	b269af5bf6	delete reminders on ActionComm::delete	2020-09-24 15:26:35 +02:00
atm-greg	e6eff6511e	fix reminder offsetunit and display problems	2020-09-24 15:20:30 +02:00
atm-greg	101405b052	fix notification creation => must create for every user linked to the event	2020-09-24 12:31:28 +02:00
Tobias Sekan	a72519f353	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-23 09:09:42 +02:00
Laurent Destailleur	6c06d2f0aa	Look and feel v13	2020-09-22 15:26:29 +02:00
Tim Otte	e373de91d9	Fixed a bug where a price equal zero would be replaced with the product price	2020-09-22 14:43:09 +02:00
Laurent Destailleur	e52559783f	Look and feel v13	2020-09-21 13:54:26 +02:00
Laurent Destailleur	3e977bc5d6	Fix css	2020-09-21 12:55:06 +02:00
Laurent Destailleur	b3dd51b790	Fix warnings	2020-09-20 16:46:29 +02:00
Laurent Destailleur	a3d0835c37	Fix param	2020-09-20 16:11:02 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Laurent Destailleur	c191dd1a34	Fix escaping	2020-09-19 23:27:11 +02:00
Laurent Destailleur	eb36c3f144	Fix must use GETPOST	2020-09-19 02:27:32 +02:00
Laurent Destailleur	b6c6473cce	Fix sql injection when forging requests with IN	2020-09-18 17:47:40 +02:00
Laurent Destailleur	4e2aff2cdc	Fix sql injection when forging requests with IN	2020-09-18 17:28:02 +02:00
Laurent Destailleur	2d38644ae1	Sanitize sortfield	2020-09-18 17:13:01 +02:00
Tobias Sekan	b2a953ed5b	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-18 12:21:41 +02:00
Sekan, Tobias	eac9e54e0b	fix more different button visibility	2020-09-18 11:48:53 +02:00
Sekan, Tobias	ae8c302c19	merge variable declaration	2020-09-18 10:52:17 +02:00
Sekan, Tobias	dc4250aed7	Make button visiblity identical on most lists	2020-09-18 10:46:23 +02:00
Sekan, Tobias	d1f70a37df	Preselect thirparty on new from list (part 1)	2020-09-18 07:56:13 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	9a758b7edd	FIX #yogosha4483	2020-09-17 14:31:25 +02:00
Laurent Destailleur	5e3f6ce736	Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup ... Use new table function for comm/propal + cleanup	2020-09-17 11:20:31 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Sekan, Tobias	91641e593f	MAIN_DASHBOARD_USE_TOTAL_HT + more clean	2020-09-16 14:03:41 +02:00
stickler-ci	be27617e68	Fixing style errors.	2020-09-16 09:11:01 +00:00
Sekan, Tobias	ac1fdb4a59	Use new table function for comm/propal + cleanup	2020-09-16 10:51:19 +02:00
Laurent Destailleur	e5191cad24	Move code of incoterm into the Incoterm Trait.	2020-09-16 02:50:18 +02:00
Laurent Destailleur	bd577e253a	Fix phpcs	2020-09-14 22:31:57 +02:00
Laurent Destailleur	cf423add2e	Reminders visible on edit page too	2020-09-14 21:09:48 +02:00
Laurent Destailleur	59c10235b5	Show reminders on the event page	2020-09-14 21:06:40 +02:00
Laurent Destailleur	f626bd70d0	Look and feel v13	2020-09-14 20:53:42 +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	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	9dad8f0fb7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-12 03:02:27 +02:00
Laurent Destailleur	f45054df06	Close #14604 Merge manually change to get notification to show ... Remains: support call of the action=closereminderid done by browser once notif has be thrown.	2020-09-12 03:02:08 +02:00
Laurent Destailleur	fab3a774d2	Merge pull request #14636 from TobiasSekan/AddTableHelperMethod ... NEW Add helper function for table headers with numbers	2020-09-12 01:21:24 +02:00
Laurent Destailleur	3930b00e4d	Debug a not used page to show agenda per type of event	2020-09-11 14:35:52 +02:00
Laurent Destailleur	c4383747a1	Look and feel v13	2020-09-11 13:57:16 +02:00
Laurent Destailleur	64b28020c8	Look and feel v13	2020-09-11 13:14:14 +02:00
stickler-ci	be32a24eed	Fixing style errors.	2020-09-10 09:07:10 +00:00
Sekan, Tobias	d2903c5de6	adress feedback + massive cleanup	2020-09-10 11:04:41 +02:00
Laurent Destailleur	b8fe2188a6	Standardize code around model_pdf	2020-09-10 01:49:09 +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
stickler-ci	413bb10913	Fixing style errors.	2020-09-08 09:22:02 +00:00
Sekan, Tobias	bd96e0fe42	finished helper method and usage of it	2020-09-08 11:15:33 +02:00
Laurent Destailleur	5a471d38c2	Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign ... New : add massActions "Validate" and "Sign"	2020-09-07 12:13:29 +02:00
Laurent Destailleur	570c72f6c9	Update list.php	2020-09-07 12:12:28 +02:00
Adrien Raze	c8c6be2038	Retours PR	2020-09-07 10:50:01 +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
Sekan, Tobias	0375f5fd37	Add helper function for table headers with numbers	2020-09-04 15:24:45 +02: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
Laurent Destailleur	07fc85c222	Fix minor	2020-09-04 12:25:16 +02:00
Juanjo Menent	9bd5ed627f	Fix travis issues	2020-09-04 09:55:02 +02:00
Laurent Destailleur	1408c862f6	css	2020-09-03 21:23:58 +02:00
Laurent Destailleur	aafe323405	css	2020-09-03 19:11:56 +02:00
Laurent Destailleur	3f243aa457	Merge pull request #14622 from kev-73/develop ... NEW: add week number for month view in agenda	2020-09-03 19:02:59 +02:00
stickler-ci	43590587e5	Fixing style errors.	2020-09-03 12:30:04 +00:00
Adrien Raze	bcd9a0b29f	Retours PR	2020-09-03 14:25:17 +02:00
kev-73	38ed033b8a	New: add week number for month view in agenda ... Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.	2020-09-03 14:03:40 +02:00
Juanjo Menent	bb92e64e43	FIX: #14474 Error when deleting	2020-09-03 12:43:38 +02:00
Laurent Destailleur	5af1eff2d9	Fix phpcs	2020-09-03 10:46:46 +02:00
stickler-ci	8c514c8025	Fixing style errors.	2020-09-03 08:24:12 +00:00
Adrien Raze	c043501ee5	Retours PR standard	2020-09-03 10:19:57 +02:00
Adrien Raze	0898a1e28a	Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign	2020-09-03 10:06:13 +02:00
Adrien Raze	675fe05808	Retours PR Standard	2020-09-03 09:51:49 +02:00
Laurent Destailleur	31548c6fbb	Better error message	2020-09-02 21:42:29 +02:00
Laurent Destailleur	f642fc9ad9	Fix	2020-09-02 21:40:17 +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	80f824569a	Use english	2020-09-02 19:15:03 +02:00
Laurent Destailleur	a58dcc3886	Doc	2020-09-02 19:10:07 +02:00
Laurent Destailleur	a984c8e969	Use english	2020-09-02 18:57:56 +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	d913736bd1	Update list.php	2020-09-02 17:59:21 +02:00
Laurent Destailleur	ee003ed499	Update list.php	2020-09-02 17:57:09 +02:00
Laurent Destailleur	2a4f0fc034	Fix backto link	2020-09-02 16:37:02 +02:00
stickler-ci	a713286579	Fixing style errors.	2020-09-02 13:58:04 +00:00
Adrien Raze	d6113acfc8	action presign/prevalidate + action sign/validate + Traductions	2020-09-02 15:20:10 +02:00
atm-lena	7b91c8efc8	Event Reminder : Add "Default Mail Model" to select Mail Model	2020-09-02 09:58:55 +02:00
Laurent Destailleur	e4557b3dd3	Responsive	2020-09-01 23:04:29 +02:00
Laurent Destailleur	619a9a3679	Look and feel v13	2020-09-01 22:53:49 +02:00
Laurent Destailleur	8e02d39cb3	Fix prefill of end date when event type is rendez-vous	2020-09-01 22:44:03 +02:00
Laurent Destailleur	f18a852510	Merge pull request #14599 from TobiasSekan/AllowClickOnAllNumOnCommerceOverview ... NEW Allow click on all header numbers on commerce area	2020-09-01 15:38:42 +02:00
Laurent Destailleur	a424515835	Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2 ... Agenda Remind (Part 2 & 3)	2020-09-01 15:33:52 +02:00
Laurent Destailleur	a626b252bd	Optimize code	2020-09-01 15:33:02 +02:00
atm-lena	1b225706db	FIX create remind : dateremind save	2020-09-01 14:48:03 +02:00
Sekan, Tobias	ba107361fd	Allow click all num on comm. overview	2020-09-01 13:20:56 +02:00
stickler-ci	763515a4ca	Fixing style errors.	2020-09-01 08:17:19 +00:00
atm-lena	86c6ef23e3	Errors management v2	2020-09-01 10:05:55 +02:00
atm-lena	b747f6285e	Errors management	2020-09-01 10:01:59 +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
atm-lena	13f91f1de8	FIX getEmailTemplat() in sendEmailsReminder() reminder function	2020-09-01 09:41:59 +02:00
Laurent Destailleur	b69a992324	Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS	2020-09-01 04:29:57 +02:00
Laurent Destailleur	e353d4a42d	Add tooltip if label truncated	2020-09-01 03:59:57 +02:00
atm-lena	a8c9e76ef6	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-08-31 16:57:49 +02:00
Laurent Destailleur	1a353a5742	Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal ... FIX Uniform availability delay description on commercial proposal (new and card)	2020-08-31 16:25:42 +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
Sekan, Tobias	070a09d5cc	Uniform availability desc. on propal	2020-08-31 13:41:22 +02:00
Laurent Destailleur	e030b2089a	Look and feel v13	2020-08-30 13:14:28 +02:00
Laurent Destailleur	8adf1852b1	Clean code	2020-08-30 03:00:35 +02:00
Laurent Destailleur	6293f76692	Debug	2020-08-29 06:17:26 +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	82f93fed92	css	2020-08-29 03:52:27 +02:00
Laurent Destailleur	983a3c59c8	css	2020-08-29 01:11:08 +02:00
Laurent Destailleur	ad87e753b4	Clean trim on GETPOST (already included inside GETPOST when not 'none'	2020-08-28 21:27:50 +02:00
atm-lena	6562334f7b	FIX sendEmailsReminder() function	2020-08-28 09:37:18 +02:00
Laurent Destailleur	4624cf98ee	Merge pull request #14545 from cfoellmann/defaults-payment-selections ... FIX allow use of default settings for payment term and condition on proposal creation	2020-08-27 21:04:10 +02:00
Laurent Destailleur	f997d11761	Update card.php	2020-08-27 21:02:01 +02:00
Laurent Destailleur	7730569dff	Update card.php	2020-08-27 21:00:01 +02:00
Laurent Destailleur	9f8d1f0e63	Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents ... NEW Show user on external calender events (when found)	2020-08-27 20:10:13 +02:00
Laurent Destailleur	0309510ab8	Fix avoid duplicate event recorded from email collector	2020-08-27 18:50:08 +02:00
atm-lena	c0f254d10c	Translation + decode	2020-08-27 16:03:25 +02:00
atm-lena	e3ce3cbb7c	Function sendEmailsReminder()	2020-08-27 15:49:56 +02:00
atm-lena	f57325237a	WIP : sendEmailsReminder()	2020-08-27 12:30:59 +02:00
atm-lena	5856033892	Replace "agenda_send" and "event_push" to "actioncomm_send"	2020-08-27 11:15:08 +02:00
stickler-ci	b0fe7bc2e0	Fixing style errors.	2020-08-27 08:47:57 +00:00
atm-lena	4ef2644300	Use date.lib.php functions	2020-08-27 10:29:23 +02:00
atm-lena	9d1fc28eba	Fix type reminder "push" to "browser"	2020-08-27 09:35:02 +02:00
atm-lena	bbc554070c	Fix	2020-08-27 09:33:40 +02:00
atm-lena	6a60228bc3	Translation	2020-08-26 17:11:32 +02:00
atm-lena	efe60ebc58	Error management	2020-08-26 17:02:34 +02:00
atm-lena	cc29654f47	WIP : rename fk_project to fk_actioncomm + add line to sql file to install	2020-08-26 16:48:09 +02:00
atm-lena	a01d1b58c7	Add fk_email_template	2020-08-26 16:06:20 +02:00
atm-lena	cf9337b644	Add fk_project to actioncommreminder object	2020-08-26 15:58:14 +02:00
atm-lena	c10556473f	Clean	2020-08-26 15:35:12 +02:00
atm-lena	552e655668	Add field "entity" in actioncommrminder object and table	2020-08-26 15:22:32 +02:00
atm-lena	2fb5824836	Calcul date of reminder for event create	2020-08-26 15:12:08 +02:00
atm-lena	d3ac39589a	WIP	2020-08-26 12:48:12 +02:00
atm-lena	42f492877e	WIP	2020-08-26 11:36:32 +02:00
atm-lena	3046556d7b	Add checkbox "AddReminder"	2020-08-26 11:19:14 +02:00
atm-lena	a4018f41f7	WIP	2020-08-26 10:52:36 +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	94b2f3c5e1	Add $conf conditions	2020-08-25 12:57:36 +02:00
atm-lena	25840c2b3d	Create Event - Add fields	2020-08-25 12:40:29 +02:00
Sekan, Tobias	a7895f3496	Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents	2020-08-25 12:20:10 +02:00
Sekan, Tobias	4c851884e5	Address feedback	2020-08-25 12:16:44 +02:00
stickler-ci	a60968e95b	Fixing style errors.	2020-08-24 14:17:15 +00:00
Christian Foellmann	0e9677fd34	allow default settings for "cond_reglement_id" and "mode_reglement_id" ... (cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)	2020-08-24 16:08:44 +02:00
Laurent Destailleur	d23e83779f	Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar	2020-08-23 18:21:18 +02:00
Laurent Destailleur	053aa1b750	Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents ... NEW Show place from events on import calender	2020-08-23 18:11:02 +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
Laurent Destailleur	6ad18ceef0	Remove useless code	2020-08-21 19:48:31 +02:00
stickler-ci	183013e9ed	Fixing style errors.	2020-08-21 12:02:03 +00:00
Sekan, Tobias	9af5354dfe	Parse priority and transparency from external calender events	2020-08-21 13:57:03 +02:00
stickler-ci	61cce2e700	Fixing style errors.	2020-08-21 06:46:00 +00:00
Sekan, Tobias	22ff5a320f	fix not working external calender on/off	2020-08-21 08:40:23 +02:00
Sekan, Tobias	bb1452917b	fix wrong event percentage	2020-08-21 08:33:19 +02:00
Sekan, Tobias	ba98db934d	Show user on external calender events	2020-08-21 08:18:26 +02:00
Laurent Destailleur	ad0625b6ec	Debug posting message from ticket page	2020-08-21 01:11:22 +02:00
Sekan, Tobias	546571a6f8	Show place from events on import calender	2020-08-20 08:20:00 +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
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
Tim Otte	0e03578e91	Fixed translation of product units in documents	2020-08-04 11:51:40 +02:00
Laurent Destailleur	e455f8afa6	Merge pull request #14369 from Tim-Otte/fix-product-unit-translation ... Fixed translation of product units in documents	2020-08-04 11:50:50 +02:00
Tim Otte	360afccecc	Fixed translation of product units in documents	2020-08-04 11:02:16 +02:00
Laurent Destailleur	4afdfdda53	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php	2020-08-02 22:42:17 +02:00
Laurent Destailleur	66d4b7372e	FIX Look and feel v12 ... Conflicts: htdocs/comm/card.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2020-08-02 22:38:20 +02:00
Laurent Destailleur	87f71e7681	FIX Look and feel v12	2020-08-02 22:36:14 +02:00
kkhelifa-opendsi	fe0f77b967	Merge branch 'develop' into stcommcontact	2020-07-31 16:41:17 +02:00
Tim Otte	85c5f423b1	Added fetch_thirdparty (without the site crashes)	2020-07-29 12:55:58 +02:00
Tim Otte	c5816478d9	Added fetch_thirdparty (without the site crashes)	2020-07-28 11:14:55 +02:00
Laurent Destailleur	dd86c21382	FIX dolGetElementUrl and agenda page for external modules	2020-07-25 03:01:04 +02:00
Laurent Destailleur	46fccf8eb1	FIX dolGetElementUrl and agenda page for external modules	2020-07-24 11:53:44 +02:00
Laurent Destailleur	42234ba506	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/price.lib.php	2020-07-24 00:07:57 +02:00
VERDOL Gauthier	55298317e3	FIX : wrong link to third invoice templates	2020-07-20 16:22:48 +02:00
Abdessalam@MEGALOGI	1e6273b92d	Update card.php ... La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.	2020-07-18 23:11:17 +02:00
Laurent Destailleur	8b5f4fe9a6	Fix massaction delete on events	2020-07-11 12:21:53 +02:00
Laurent Destailleur	b6452dbbc0	Merge pull request #14196 from Tim-Otte/fix-proposals-urgent ... FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"	2020-07-10 02:51:25 +02:00
Laurent Destailleur	46119dc786	Fix per user	2020-07-09 12:49:48 +02:00
Laurent Destailleur	b2bd90ae1a	Fix link to list of event	2020-07-09 12:33:28 +02:00
Laurent Destailleur	9592fdb3fc	CSS	2020-07-09 11:55:16 +02:00
Laurent Destailleur	1dfd2d565b	FIX Reposition and nav	2020-07-08 18:18:47 +02:00
Laurent Destailleur	96d935832c	FIX Reposition and nav	2020-07-08 18:18:08 +02:00
Laurent Destailleur	5ea47f3ade	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/resultat/index.php htdocs/product/admin/product.php htdocs/projet/tasks/list.php	2020-07-08 18:11:58 +02:00
Laurent Destailleur	96729769f7	Standardize Agenda view	2020-07-08 18:06:14 +02:00
Tim Otte	a73f77cfef	Fixed same error like before	2020-07-07 12:43:15 +02:00
Laurent Destailleur	4fd970af28	Fix phpcs	2020-07-07 01:29:31 +02:00
Laurent Destailleur	14c98f277b	NEW Can change VAT rate of all lines of a draft object in one step.	2020-07-06 22:48:22 +02:00
Laurent Destailleur	f72a836231	Fix look and feel v12	2020-07-06 16:59:25 +02:00
Laurent Destailleur	4dcc073b3a	Fix param GETPOST	2020-07-06 16:54:30 +02:00
Laurent Destailleur	3939a640e9	Fix note in creation	2020-07-06 16:52:28 +02:00
stickler-ci	19eef8aa93	Fixing style errors.	2020-07-06 01:26:46 +00:00
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
Laurent Destailleur	83eaddb17b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/evalmath.class.php htdocs/core/class/extrafields.class.php htdocs/install/mysql/migration/11.0.0-12.0.0.sql htdocs/langs/en_US/cashdesk.lang htdocs/societe/class/societe.class.php	2020-07-04 13:13:17 +02:00
Tim Otte	bce0a93227	Hotfix for an error in v12	2020-07-03 00:33:54 +02:00
Laurent Destailleur	0ea55209ae	Merge pull request #14165 from ptibogxiv/patch-345 ... FIX non numeric value on comm/card.php	2020-07-03 00:24:32 +02:00
Regis Houssin	a5431a40da	FIX missing possibility to change entity when propal cloning	2020-07-02 10:16:20 +02:00
ptibogxiv	cc132775f3	FIX non numeric value on comm/car.php	2020-07-01 16:18:19 +02:00
Tim Otte	94a1d71fba	Hotfix for an error in v12	2020-06-30 15:20:30 +02:00
Laurent Destailleur	0aa08edb38	Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative ... NEW can edit and set sales representatives directly on thirdparty card	2020-06-28 21:08:24 +02:00
Laurent Destailleur	90d4458aab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php	2020-06-27 00:38:51 +02:00
Laurent Destailleur	29ba9c82c3	Fix #14120	2020-06-26 17:17:13 +02:00
lvessiller	ad36447295	NEW can edit and set sales representatives directly on thirdparty card	2020-06-26 12:20:53 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	18c23680f7	Fix bad object	2020-06-25 12:17:06 +02:00
Laurent Destailleur	ee5156034d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-24 20:03:40 +02:00
Laurent Destailleur	de62037ba5	Fix signed only in margin calculation of project	2020-06-24 12:58:10 +02:00
Laurent Destailleur	6d25b8630b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/prelevement.php htdocs/core/class/rssparser.class.php	2020-06-23 11:38:20 +02:00
Laurent Destailleur	4d2cbf7006	Fix alert picto of expired services not visible ... Fix CSS	2020-06-23 11:27:40 +02:00
Laurent Destailleur	501fd2f7a3	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/takepos/admin/receipt.php	2020-06-21 20:48:41 +02:00
Laurent Destailleur	bb3320f103	FIX #14104	2020-06-20 18:34:19 +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
florian HENRY	7fef9a813e	fix warning and clean old code about multiselect category	2020-06-18 20:03:03 +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	40e16672e3	FIX BlindBoolean SQL injection reported by Christian Weiler ... <sak1.s3curity@gmail.com>	2020-06-15 15:08:52 +02:00
Laurent Destailleur	90b5ed9908	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/website.lib.php	2020-06-11 23:41:35 +02:00
Laurent Destailleur	e94ef09977	css	2020-06-10 22:24:15 +02:00
Laurent Destailleur	8dbc0ff040	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/prelevement.php htdocs/admin/system/phpinfo.php htdocs/modulebuilder/index.php	2020-05-31 00:31:14 +02:00
Laurent Destailleur	94e02269ee	Fix: missing fk_project	2020-05-31 00:20:01 +02:00
Laurent Destailleur	ddebe1bbba	FIX Missing ref into popup	2020-05-30 23:52:47 +02:00
Laurent Destailleur	02bf646abe	FIX Missing ref into popup	2020-05-30 23:51:02 +02:00
stickler-ci	029f5570e5	Fixing style errors.	2020-05-28 12:55:29 +00:00
Supermanu	0baea21947	NEW Add mass deletion for events ... Only users with the right `allactions->delete` will be able to mass delete.	2020-05-28 14:45:54 +02:00
Supermanu	721b99bb2f	Add calendar selection for agenda view	2020-05-28 11:24:37 +02:00
Frédéric FRANCE	e5402988d9	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-24 17:58:18 +02:00
Laurent Destailleur	fd61214b97	Merge	2020-05-24 01:06:45 +02:00
Frédéric FRANCE	5c78eca68a	prepare new rule	2020-05-23 21:14:44 +02:00
Frédéric FRANCE	174ddc5fd4	prepare new rule	2020-05-23 21:07:47 +02:00
Laurent Destailleur	127534ef55	Fix common var name seems to be $objref for subdir of doc	2020-05-23 20:09:31 +02:00
stickler-ci	66637ba0b6	Fixing style errors.	2020-05-23 16:39:06 +00:00
Frédéric FRANCE	2085ac73e7	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:34:58 +02:00
Laurent Destailleur	4e3fbb9d05	Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent ... NEW mass-actions for the event list view	2020-05-23 14:26:51 +02:00
Laurent Destailleur	7397806ae7	Update actioncomm.class.php	2020-05-23 14:26:28 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
Laurent Destailleur	92cbff7749	Clean code	2020-05-20 23:40:04 +02:00
stickler-ci	f0bb7d233f	Fixing style errors.	2020-05-19 06:29:23 +00:00
Tobias Sekan	7fd6151c43	Add massactions for event list	2020-05-19 08:18:38 +02:00
Tobias Sekan	223224d12c	Add function to update the event percent + const	2020-05-19 08:07:21 +02:00
Laurent Destailleur	ff8d22a80d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:57:01 +02:00
Laurent Destailleur	9336828710	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/card.php htdocs/expedition/class/expedition.class.php	2020-05-18 15:54:39 +02:00
Laurent Destailleur	45345440a4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:50:36 +02:00
Maxime Kohlhaas	cf96383bf9	Fix : entity was missing in actioncomm fetch	2020-05-18 10:44:55 +02:00
Laurent Destailleur	ab07330668	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-05-14 16:34:45 +02:00
Laurent Destailleur	f5b9151f17	Merge pull request #13871 from FHenry/11.0 ... fix template email on propal list	2020-05-14 16:10:33 +02:00
Laurent Destailleur	136d002639	Merge pull request #13872 from simnandez/11.0 ... FIX: Do not show stats panel if the user does not have permissions	2020-05-14 16:09:37 +02:00
ptibogxiv	e1db0ef855	Update index.php	2020-05-12 10:57:51 +02:00
Juanjo Menent	66beb7c14f	FIX: Do not show stats panel if the user does not have permissions	2020-05-12 10:17:47 +02:00
florian HENRY	d9e26b8569	fix template email on prpal list	2020-05-12 08:38:03 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Laurent Destailleur	44d36815bd	Look and feel v12	2020-05-11 19:00:27 +02:00
Laurent Destailleur	42ee755ea5	Look and feel v12	2020-05-08 02:52:55 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Laurent Destailleur	206b16410e	Revert the option to avoid to introduce a feature that is duplicate with ... already existing view "Events/Agenda". It also keeps a common behaviour between other tools. Maxi debug on messages of tickets	2020-05-07 22:52:32 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
Laurent Destailleur	8208e81622	Merge pull request #13767 from indelog/statsbytype ... Add possibility to filter stats by ThirdParty type and categorie	2020-05-01 22:05:06 +02:00
Laurent Destailleur	c27b3c5966	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/extrafields_list_search_sql.tpl.php	2020-04-30 18:49:20 +02:00
DEMAREST Maxime (Indelog)	790cffb7ae	Correct select label for categories in stats pages	2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)	1bd9372022	Forgot comments to document news params for the modified methods	2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)	40f1bed8d0	Add possibility to filter stats by ThirdParty type and categorie	2020-04-29 09:17:44 +02:00
kamel	4dd42496fa	Correction pour validation Stickler CI / stickler-ci	2020-04-27 17:48:05 +02:00
kamel	9cb90cb384	NEW: Add prospect status managment for the contact with managment of custom icon	2020-04-27 17:35:14 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
gauthier	7f56c4a785	FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"	2020-04-27 11:18:53 +02:00
Laurent Destailleur	4c605283f5	Fix phpcs	2020-04-27 00:09:21 +02:00
Laurent Destailleur	31157931a9	Fix phpcs	2020-04-26 23:52:23 +02:00
Laurent Destailleur	1121d2c1c6	Look and feel v12	2020-04-25 13:49:44 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Laurent Destailleur	9679b1f04c	Merge pull request #13704 from frederic34/actioncomm_note ... actioncomm note deprecated	2020-04-23 18:52:56 +02:00
Marc Guenneugues	94be1870ec	Clean line extrafields when deleting proposal	2020-04-23 18:02:53 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708, normalization of code	2020-04-23 13:21:39 +02:00
Frédéric FRANCE	177008ab65	actioncomm note deprecated	2020-04-23 00:45:33 +02:00
Frédéric FRANCE	4220d6b253	actioncomm note deprecated	2020-04-23 00:38:42 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
Laurent Destailleur	d847f67e45	Look and feel v12	2020-04-20 03:10:26 +02:00
Laurent Destailleur	5c18404083	Move to jquery 4.0.13 with fix in reponsive ... Restore some files modified by error.	2020-04-18 15:15:35 +02:00
Laurent Destailleur	8f7c3fc867	Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)	2020-04-18 14:39:02 +02:00
Laurent Destailleur	47ff3f866a	css	2020-04-18 12:54:28 +02:00
Laurent Destailleur	7c6c600225	CSS	2020-04-18 11:38:24 +02:00
Laurent Destailleur	07ce3fc34d	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2020-04-18 11:08:21 +02:00
Laurent Destailleur	23876684cb	Responsive	2020-04-18 11:06:28 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
atm-quentin	f7c07640dd	viewstatut to search_status	2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer	387ea73bf3	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-13 11:24:42 +00:00
Laurent Destailleur	96d087c99d	Fix clean event report	2020-04-13 02:59:33 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +02:00
stickler-ci	a873afdad9	Fixing style errors.	2020-04-12 15:08:44 +00:00
Laurent Destailleur	51f73526f9	Merge branch 'develop' into patch-8	2020-04-12 17:07:57 +02:00
Laurent Destailleur	fe4cd2e7bc	Update actioncomm.class.php	2020-04-12 17:05:12 +02:00
Laurent Destailleur	422e33a68b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/ihm.php htdocs/comm/action/class/actioncomm.class.php htdocs/compta/stats/cabyprodserv.php htdocs/filefunc.inc.php htdocs/takepos/invoice.php	2020-04-12 17:01:44 +02:00
Laurent Destailleur	1cda760621	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:54:09 +02:00
Laurent Destailleur	eebf48b27c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:52:58 +02:00
Frédéric FRANCE	e2660fd31c	Update actioncomm.class.php	2020-04-11 22:38:28 +02:00
Frédéric FRANCE	88f18ec3ce	can't remove actioncomm if there is a category	2020-04-11 22:24:50 +02:00
Laurent Destailleur	0845f0bcd3	Merge pull request #13523 from bb2a/patch-2 ... add in default search	2020-04-10 12:12:28 +02:00
Laurent Destailleur	5ff981bf61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/perms.php	2020-04-10 12:04:21 +02:00
Laurent Destailleur	874cbcefc7	Fix permission to close a proposal or order was not correctly used ... #13547	2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Anthony Berton	a7440687ec	Update list.php	2020-04-10 10:38:31 +02:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	83af4ebea4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php	2020-04-10 01:22:22 +02:00
Laurent Destailleur	63f0c07a07	Add warning	2020-04-08 18:32:13 +02:00
Laurent Destailleur	1adee36314	Upgrade to font awesome 5.13	2020-04-07 21:11:18 +02:00
Laurent Destailleur	ff1b3db54b	Fix regression on hamburger picto	2020-04-06 23:38:30 +02:00
Laurent Destailleur	28a1b7af35	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/index.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-03 18:07:24 +02:00
Laurent Destailleur	193a10bc39	FIX cloning of emailing when no content selected	2020-04-03 02:29:10 +02:00
Laurent Destailleur	84cda962c1	Clean dead code	2020-04-02 12:03:29 +02:00
Laurent Destailleur	4207d94f53	FIX Bad position of total in column ... Conflicts: htdocs/fourn/facture/paiement.php	2020-03-27 19:10:01 +01:00
Laurent Destailleur	a4797634d5	FIX Bad position of total in column	2020-03-27 19:08:39 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
Laurent Destailleur	004397304e	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:53 +01:00
Laurent Destailleur	f0de10897a	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:24 +01:00
Laurent Destailleur	fa3bba942f	Start to save the VAT src code into table of discounts to reuse them ... later	2020-03-26 02:01:30 +01:00
Alexandre SPANGARO	c3e5cf901d	Work on split module fournisseur	2020-03-24 22:20:25 +01:00
Alexandre SPANGARO	e6d9f7885c	Work on split module fournisseur	2020-03-24 21:22:20 +01:00
Laurent Destailleur	62fefab5ac	Standardize color of status	2020-03-24 19:06:37 +01:00
Laurent Destailleur	a5379c7144	FIX All forms must use newToken() ... Conflicts: htdocs/commande/card.php htdocs/compta/cashcontrol/cashcontrol_card.php htdocs/supplier_proposal/card.php	2020-03-24 13:14:23 +01:00
Laurent Destailleur	1ff15e1fd9	FIX All forms must use newToken()	2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer	e8083e2a65	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-23 14:54:02 +00:00
Laurent Destailleur	01e60562b9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/index.php htdocs/takepos/takepos.php	2020-03-23 15:38:10 +01:00
Alexandre SPANGARO	d5729e6dcc	Work on split module fournisseur	2020-03-23 05:53:33 +01:00
Alexandre SPANGARO	e6a59dcdbb	Work on split module fournisseur	2020-03-23 05:43:41 +01:00
Alexandre SPANGARO	6e9a07d119	Work on split module fournisseur	2020-03-22 05:33:30 +01:00
Laurent Destailleur	599bf89f60	Fix can edit emailing after sending has started	2020-03-20 20:46:21 +01:00
Laurent Destailleur	5d9e713a1c	Fix better default sort order	2020-03-20 20:36:59 +01:00
Laurent Destailleur	68cadb58bb	Fix better default sort order	2020-03-20 20:36:26 +01:00
Laurent Destailleur	8bab245c7e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/tpl/contacts.tpl.php	2020-03-18 18:50:55 +01:00
Laurent Destailleur	8192e9dc67	FIX Missing token in form	2020-03-14 03:02:49 +01:00
Laurent Destailleur	6e71bb8707	Look and feel v12: Use color of status for dotnuts	2020-03-14 02:17:08 +01:00
Laurent Destailleur	3b72005f93	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cashdesk.lang htdocs/langs/fr_FR/errors.lang htdocs/langs/fr_FR/products.lang htdocs/langs/fr_FR/projects.lang	2020-03-14 00:22:11 +01:00
florian HENRY	ca269864f7	let keep it to expedition	2020-03-13 14:55:34 +01:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
Laurent Destailleur	d380da3f4c	Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink ... NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type	2020-03-12 12:57:04 +01:00
Laurent Destailleur	2994a5f35e	Merge pull request #13336 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2020-03-12 12:47:52 +01:00
Laurent Destailleur	54b32d94e0	Fix field required	2020-03-12 12:47:08 +01:00
Scrutinizer Auto-Fixer	f413ce6aac	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-12 11:45:44 +00:00
florian HENRY	eaa9d22783	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink	2020-03-12 09:45:04 +01:00
florian HENRY	29b2ea77d5	NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type	2020-03-12 09:44:43 +01:00
florian HENRY	6edaa7ac11	fix getentity on comm/card.php	2020-03-11 18:00:35 +01:00
florian HENRY	f40c8ce507	fix getentity on comm/card.php	2020-03-11 17:58:41 +01:00
Laurent Destailleur	82f0d8a3bc	Fix bad params	2020-03-09 17:38:47 +01:00
Laurent Destailleur	3edc3dd382	Fix fields definition	2020-03-08 20:10:31 +01:00
Laurent Destailleur	343a80fd3d	Fix table fields	2020-03-08 19:25:00 +01:00
Laurent Destailleur	054ffb7547	Depreciate variables not used by Dolibarr.	2020-03-06 14:38:06 +01:00
Laurent Destailleur	d0f22c7bff	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_graph_product_distribution.php	2020-03-06 14:22:42 +01:00
Laurent Destailleur	d4b67a6cef	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/list.php htdocs/core/lib/functions.lib.php	2020-03-06 14:19:30 +01:00
Laurent Destailleur	aaf9aef5c8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/contrat/list.php	2020-03-06 14:17:21 +01:00
Laurent Destailleur	ad9d0a3472	Fix graph of product distribution when too much record	2020-03-06 12:45:02 +01:00
ATM-Nicolas	a9d7bbc2ed	FIX : Remove unexisting link	2020-03-06 09:52:19 +01:00
Laurent Destailleur	0bd2740779	NEW Can force position of legend of graph on right (instead of top)	2020-03-05 17:23:19 +01:00
Laurent Destailleur	fc31680bd0	Several fix for chart.js graphs	2020-03-05 02:55:06 +01:00
Laurent Destailleur	f35f0ecf9d	Look and feel v12	2020-03-05 01:54:12 +01:00
Laurent Destailleur	7d0d0aa75a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2020-03-04 01:56:50 +01:00
Laurent Destailleur	0b37c2c201	FIX #13263	2020-03-04 00:53:07 +01:00
Laurent Destailleur	2b6aaa652d	Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency ... NEW: add multicurrency columns to document lists	2020-03-03 23:12:53 +01:00
Laurent Destailleur	7866f89585	Merge pull request #13260 from atm-quentin/FIX_ecm_files ... FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 23:09:02 +01:00
ptibogxiv	b6bad0c936	Update api_proposals.class.php	2020-03-03 13:40:26 +01:00
ptibogxiv	fa5aeebcd8	NEW get proposal by ref with API	2020-03-03 13:39:22 +01:00
atm-quentin	9446138951	FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 12:07:18 +01:00
Laurent Destailleur	f0d458682d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-29 00:15:17 +01:00
Laurent Destailleur	87b3cf9765	FIX Bad link to template invoices	2020-02-28 12:01:43 +01:00
Marc de Lima Lucio	cdddccde16	NEW: propal list: enable multicurrency columns	2020-02-27 17:34:45 +01:00
Laurent Destailleur	096a568e83	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php	2020-02-23 23:42:23 +01:00
Laurent Destailleur	3075e40f8c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/remx.php htdocs/core/boxes/box_contacts.php htdocs/core/lib/functions.lib.php htdocs/core/lib/security.lib.php	2020-02-23 23:37:46 +01:00
Laurent Destailleur	5919570b34	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-23 23:31:51 +01:00
Laurent Destailleur	11ff3f6562	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-23 23:31:03 +01:00
Laurent Destailleur	530930b7aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2020-02-23 23:30:38 +01:00
Maxime Kohlhaas	0ab16ed5ae	Fix #10179 discount split	2020-02-23 16:50:24 +01:00
Laurent Destailleur	44eda2d4ad	Fix doxygen	2020-02-20 13:42:43 +01:00
Laurent Destailleur	895503d2eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/index.php htdocs/core/class/CMailFile.class.php	2020-02-20 00:21:25 +01:00
Laurent Destailleur	2cfca2a45e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/action/card.php htdocs/comm/index.php htdocs/core/boxes/box_fournisseurs.php htdocs/core/boxes/box_propales.php htdocs/societe/index.php	2020-02-20 00:18:58 +01:00
Laurent Destailleur	394c256ca1	Merge pull request #13129 from mapiolca/patch-33 ... Fix issue with unselect data	2020-02-19 11:37:52 +01:00
Scrutinizer Auto-Fixer	fd48877dc6	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-18 22:47:25 +00:00
Laurent Destailleur	2ac064059a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/projet/element.php	2020-02-18 22:40:43 +01:00
root	0dcb83e6bf	referer XSS patches	2020-02-18 22:31:24 +01:00
Laurent Destailleur	2069438115	Merge pull request #13125 from 418sec/develop ... dolibarr - Cross-site Scripting (XSS) - Fix:	2020-02-18 22:29:53 +01:00
Laurent Destailleur	9ce0e6869e	Fix trans	2020-02-18 11:55:39 +01:00
VESSILLER	d1e9f3a505	FIX keep assigned users in session when loading projects and tasks	2020-02-18 11:18:00 +01:00
Pierre Ardoin	dbb7db376b	fix error code	2020-02-18 09:16:12 +01:00
Pierre Ardoin	49dd8e30aa	Fix not display data	2020-02-18 08:28:39 +01:00
Laurent Destailleur	be7bed7063	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-17 14:00:05 +01:00
Laurent Destailleur	e59ac41182	Fix phpcs	2020-02-17 13:59:44 +01:00
Laurent Destailleur	a6b0fec90b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/exports/class/export.class.php	2020-02-17 12:35:34 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
Jamie Slome	2d9162aedb	Merge branch 'develop' into develop	2020-02-17 10:49:41 +00:00
Laurent Destailleur	35ada37d4d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/comm/propal/list.php htdocs/filefunc.inc.php	2020-02-14 19:14:26 +01:00
Laurent Destailleur	bb895cb1d8	FIX ref_client not visible in tooltip.	2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer	011803ac71	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-13 11:36:05 +00:00
Scrutinizer Auto-Fixer	17010478ba	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-13 09:44:08 +00:00
Laurent Destailleur	33b7fc11f0	Fix status of emailing target	2020-02-13 10:41:53 +01:00
Laurent Destailleur	495b3d54f1	Fix status of emailing target	2020-02-13 10:41:31 +01:00
Laurent Destailleur	74d3912763	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2020-02-11 16:52:58 +01:00
Laurent Destailleur	644b27bcf9	Fix look and feel v11	2020-02-10 13:34:09 +01:00
Laurent Destailleur	b9a8d82b2f	FIX Filter on list of events were lost after "Back to list"	2020-02-10 13:29:26 +01:00
Laurent Destailleur	f70dd8ec06	Clean code. Load thirdparty for correct lang before generating doc	2020-02-10 00:22:53 +01:00
Laurent Destailleur	8645fd8946	FIX CVE-2019–17223 FIX #13053	2020-02-09 18:28:57 +01:00
Laurent Destailleur	5fccbcc469	Merge pull request #13054 from hregis/10.0_mc ... FIX missing hook parameter	2020-02-08 16:08:13 +01:00
Laurent Destailleur	716f765ce1	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php	2020-02-08 16:00:06 +01:00
Laurent Destailleur	df7cdd1da8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/tools/export_files.php htdocs/comm/mailing/class/advtargetemailing.class.php htdocs/core/tpl/advtarget.tpl.php	2020-02-08 15:42:35 +01:00
Laurent Destailleur	4e4fd4c76c	Remove code using a no more used field	2020-02-07 13:15:51 +01:00
Regis Houssin	a915a4faaf	FIX missing hook parameter	2020-02-07 11:14:13 +01:00
Laurent Destailleur	fe0d1a81eb	Fix filter on current user is stupi on the view "per user".	2020-02-06 21:16:48 +01:00
atm-arnaud	bd6d49f04a	FIX advanced target emailing sql and ergonomy	2020-02-06 12:08:50 +01:00
Laurent Destailleur	f3597926c4	Fix missing escape returned by ci	2020-02-06 10:05:13 +01:00
oscim	7cc87423e4	ref_ext is not in sql requete for save ... ref_ext is not in sql requete for save	2020-02-05 22:31:27 +01:00
Laurent Destailleur	1344ce06a5	Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note ... NEW add public and private notes in propal list	2020-02-05 21:41:17 +01:00
Laurent Destailleur	66590cca10	Update list.php	2020-02-05 21:40:49 +01:00
root	2419f122c4	referer XSS patches	2020-02-03 23:10:04 +00:00
Alexandre SPANGARO	d6d3fff9dc	Merge branch 'develop' into 10.0_intracommreport	2020-02-03 21:15:07 +01:00
Laurent Destailleur	4765198af2	Clean code from using deprecated field amount	2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	25f0e893ba	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-29 23:49:43 +01:00
Laurent Destailleur	1144b937eb	Fix phpcs	2020-01-29 23:34:54 +01:00
Laurent Destailleur	7b10c2440b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-29 23:08:42 +01:00
kadogo	b2610903a4	NEW enable put for agendaevents api	2020-01-29 22:55:44 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	3a9e238dc6	FIX Missing value of $formconfirm as parameters of hook	2020-01-28 12:00:27 +01:00
Laurent Destailleur	51d750cb49	Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays ... New: Export ical with holidays	2020-01-28 03:19:34 +01:00
Tobias Sekan	ce9d1a320f	Update actioncomm.class.php after review	2020-01-27 08:27:13 +01:00
Laurent Destailleur	df478dc170	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-27 01:53:49 +01:00
Laurent Destailleur	ae087d665c	Merge pull request #12916 from RubenRuCh/11.0 ... Fix: strict mode mysql compatibility	2020-01-26 22:24:25 +01:00
Laurent Destailleur	0f2141269a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-01-25 14:43:57 +01:00
Laurent Destailleur	09f809f347	FIX #12913	2020-01-25 14:03:24 +01:00
Laurent Destailleur	27a0858050	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-23 17:41:31 +01:00
AdrianDominik	d302f190a7	Fix: strict mode mysql compatibility	2020-01-23 13:29:28 +01:00
Laurent Destailleur	25665daa40	FIX #11957	2020-01-22 14:53:40 +01:00
Laurent Destailleur	59dfbc49a7	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:42:18 +01:00
Laurent Destailleur	bfc8369418	Fix phpcs	2020-01-22 14:15:08 +01:00
Laurent Destailleur	f06f15de2e	Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda ... New: Show holidays in the agenda view (month, week, day)	2020-01-22 14:13:55 +01:00
Laurent Destailleur	d3411a79ef	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:11:44 +01:00
Laurent Destailleur	d87419f3db	FIX #11957	2020-01-22 13:34:07 +01:00
Laurent Destailleur	2d07a08e55	Fix init of specimen	2020-01-21 00:22:57 +01:00
Laurent Destailleur	80483fc085	Fix init of specimen	2020-01-21 00:20:03 +01:00
Laurent Destailleur	6fd717539d	Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2020-01-18 20:21:29 +01:00
Laurent Destailleur	24d439845b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-18 20:20:25 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Laurent Destailleur	81f8a486c9	Look and feel v11	2020-01-17 14:56:06 +01:00
stickler-ci	b47e2e8127	Fixing style errors.	2020-01-16 12:55:08 +00:00
Tobias Sekan	651bf8c1fc	Export ical with holidays	2020-01-16 13:49:05 +01:00
VESSILLER	48297759fb	Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note	2020-01-16 10:53:57 +01:00
stickler-ci	eca59220d8	Fixing style errors.	2020-01-16 09:44:49 +00:00
Tobias Sekan	72e227a543	Add link to leave request for holidays in agenda	2020-01-16 10:37:16 +01:00
Tobias Sekan	bbd7900fc7	Show holidays in agenda	2020-01-16 10:34:45 +01:00
Laurent Destailleur	2b7e45cb09	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:54 +01:00
Laurent Destailleur	2c40e4be94	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:45 +01:00
Laurent Destailleur	98eda68afb	Fix linkg to public notes	2020-01-15 19:49:45 +01:00
Laurent Destailleur	132bb67d14	Merge pull request #12364 from aspangaro/11.0_a1 ... NEW Propal list - Add date start & date end	2020-01-15 17:52:55 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	b47db086cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/inventory/class/inventory.class.php htdocs/product/inventory/list.php	2020-01-10 14:30:42 +01:00
Laurent Destailleur	d97a59ac4a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: ChangeLog htdocs/comm/remise.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/variants/combinations.php	2020-01-10 14:25:26 +01:00
Laurent Destailleur	97f62c68f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-08 13:38:03 +01:00
Laurent Destailleur	622dc7e8d7	Debug v11	2020-01-07 22:01:55 +01:00
Laurent Destailleur	7ef3ee56bd	Fix MRP	2020-01-07 20:28:21 +01:00
ptibogxiv	e820af4aa0	FIX: multicompany for discount	2020-01-07 13:07:36 +01:00
Laurent Destailleur	6dcba0f053	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-04 14:27:55 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Laurent Destailleur	afd32135f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/takepos/invoice.php	2020-01-01 22:37:13 +01:00
Laurent Destailleur	e4a03e98b7	FIX Do not record resource owner of event when not defined. ... More log to track payment errors.	2020-01-01 12:47:01 +01:00
Laurent Destailleur	d2efe1d427	Fix SQL injection on type parameter in list of events	2019-12-31 17:52:28 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Laurent Destailleur	945296bb55	Merge pull request #12690 from atm-greg/Hook_on_ics_generation ... NEW hook on ics generation to add more events in eventarray	2019-12-30 22:03:07 +01:00
VESSILLER	046aba8abd	FIX indented errors	2019-12-26 10:14:05 +01:00
lvessiller-opendsi	dec64b45e8	Merge branch 'develop' into new-propal-tooltip-note	2019-12-26 10:06:38 +01:00
VESSILLER	bf1bf10a53	FIX resolve conflicts	2019-12-26 09:56:35 +01:00
VESSILLER	23b4e3ad6d	FIX resolve conflicts	2019-12-26 09:50:15 +01:00
Alexandre SPANGARO	af4b0f54c5	Merge remote-tracking branch 'upstream/develop' into 11.0_a1	2019-12-23 20:44:32 +01:00
Laurent Destailleur	dcf07646cc	Fix specimen	2019-12-21 14:02:06 +01:00
Laurent Destailleur	19c14f354e	Fix specimen	2019-12-21 14:01:40 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	d17c177251	Merge pull request #12684 from frederic34/hookagendaperuser ... add hook like for per day/week/month	2019-12-14 13:52:51 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	6a03015fa4	Fix warning	2019-12-13 16:29:58 +01:00
Laurent Destailleur	d38c73c90a	FIX output of emails from and error on emailing pages.	2019-12-13 15:52:08 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
atm-greg	caaa95da6a	hook on ics generation to add more events in eventarray	2019-12-11 15:33:36 +01:00
Frédéric FRANCE	5c59ddb357	add hook like for per day/week/month	2019-12-10 21:11:52 +01:00
Laurent Destailleur	f98713efdd	Update propal.class.php	2019-12-10 19:20:23 +01:00
Laurent Destailleur	452976850f	Update propal.class.php	2019-12-10 19:18:45 +01:00
David	4c463cdbb5	FIX: propal update ... Update fields 'date' and 'fin_validite'	2019-12-10 16:16:33 +01:00
Scrutinizer Auto-Fixer	54ca37dc65	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-09 09:35:58 +00:00
Laurent Destailleur	4d489f64b0	Fix getpost	2019-12-06 17:42:09 +01:00
Laurent Destailleur	796f34628d	Debug v11	2019-12-06 17:40:22 +01:00
Laurent Destailleur	a4272ab947	Debug v11	2019-12-06 09:20:45 +01:00
Laurent Destailleur	93d66d8213	Debug v11	2019-12-06 08:50:26 +01:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
Florian Mortgat	3f6715a377	FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list	2019-12-05 15:34:41 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	7a1a932755	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/list.php htdocs/main.inc.php	2019-12-03 15:03:10 +01:00
Laurent Destailleur	d153918a10	Fix trans	2019-12-03 15:00:52 +01:00
Laurent Destailleur	41a176ce72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/remx.php htdocs/core/modules/modStripe.class.php htdocs/product/stock/replenish.php htdocs/stripe/payout.php	2019-12-03 13:58:15 +01:00
Laurent Destailleur	eb5a2bd1a5	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/expensereport/card.php htdocs/user/card.php	2019-12-03 13:52:42 +01:00
Laurent Destailleur	072db96b11	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-12-03 13:48:38 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Laurent Destailleur	6f7343b14f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-02 11:01:26 +01:00
Laurent Destailleur	6d81bc77cb	Fix look and feel v11	2019-12-02 11:00:09 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Maxime Kohlhaas	a220d43bd6	Fix #11849 : missing price2num in discount split	2019-12-01 01:41:13 +01:00
Laurent Destailleur	a2a96f8796	# WARNING: head commit changed in the meantime ... Restore file for travis	2019-12-01 00:41:11 +01:00
Frédéric FRANCE	35394639a4	The property ownerid does not exist on ActionComm	2019-11-28 22:26:25 +01:00
Scrutinizer Auto-Fixer	5f99e25c45	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-28 11:36:20 +00:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Frédéric FRANCE	3edac06fae	Form selectAvailabilityDelay returns void	2019-11-26 00:06:57 +01:00
Laurent Destailleur	e4d9f99484	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/remx.php htdocs/expedition/card.php htdocs/fourn/facture/card.php	2019-11-22 15:04:40 +01:00
Laurent Destailleur	9eb98ca94c	Merge pull request #12478 from ptibogxiv/patch-281 ... FIX display job of contact list	2019-11-22 14:26:12 +01:00
Laurent Destailleur	d487f6b84d	Clean code	2019-11-22 14:10:12 +01:00
Laurent Destailleur	3daeb24da1	Fix confusion with field name in sql	2019-11-21 13:05:13 +01:00
ptibogxiv	f73bd0e0a6	FIX display job of contact list ... can see différent contact with same name but different job	2019-11-20 13:07:26 +01:00
Laurent Destailleur	d7e8c71091	Look and feel v11	2019-11-20 12:45:15 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	fb70893229	Fix missing class reposition	2019-11-19 21:29:49 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Alexandre SPANGARO	b3e09e050c	fix missing param	2019-11-18 11:36:12 +01:00
Alexandre SPANGARO	b11579c1bd	Merge remote-tracking branch 'upstream/develop' into 11.0_a1	2019-11-18 09:26:40 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. ... Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	4fc7b8c3b1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/extrafields_list_search_title.tpl.php	2019-11-14 12:49:42 +01:00
Laurent Destailleur	a29adc94f3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/comm/card.php htdocs/langs/en_US/admin.lang	2019-11-14 12:48:33 +01:00
Laurent Destailleur	9d963a7ca6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-14 12:44:32 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Laurent Destailleur	f5da126cff	Fix property not defined	2019-11-14 12:01:01 +01:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +01:00
Frédéric FRANCE	3bac051521	use class CONST	2019-11-14 08:07:16 +01:00
Frédéric FRANCE	9040f6d9c7	can tag actioncomm	2019-11-13 21:18:34 +01:00
Frédéric FRANCE	3ec7568559	FIX #12385	2019-11-13 20:44:21 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Laurent Destailleur	3430a88c72	Fix $conf not defined	2019-11-12 10:13:22 +01:00
Laurent Destailleur	c02cd80b75	Clean code	2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Frédéric FRANCE	2148d6ed05	css	2019-11-11 20:33:34 +01:00
stickler-ci	bb74d2f8bd	Fixing style errors.	2019-11-10 10:00:07 +00:00
Philippe GRAND	6e0c028d51	add some comment	2019-11-10 10:59:44 +01:00
Scrutinizer Auto-Fixer	812d0af1d9	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 14:51:54 +00:00
Laurent Destailleur	cb1e5954f6	Fix regression	2019-11-08 13:10:41 +01:00
Laurent Destailleur	cb3fd5728b	Fix color for not busy events	2019-11-08 13:04:49 +01:00
Laurent Destailleur	dc84d7e844	Code comment	2019-11-08 11:29:56 +01:00
Laurent Destailleur	34564ea084	Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser ... Fix ICAL export add a user to all events	2019-11-08 11:26:57 +01:00
Tobias Sekan	3677855ebc	Fix ICAL export add a user to all events	2019-11-07 15:45:34 +01:00
Laurent Destailleur	26e95c9161	Merge pull request #12359 from TobiasSekan/FixMixedEventsWithSameTime ... Fix mixed order of events with same time	2019-11-07 11:43:39 +01:00
Alexandre SPANGARO	938d997e51	NEW Propal list - Add date start & date end	2019-11-07 06:33:33 +01:00
VESSILLER	bcafef42b0	NEW tooltip notes with first public note and then private note	2019-11-06 16:45:52 +01:00
Tobias Sekan	6fdbe8923f	Fix mixed order of events with same time	2019-11-06 10:33:26 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
VESSILLER	fefb4a7f95	FIX replace <br /> by <br>	2019-11-05 15:13:44 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	4ca85eacc1	Debug module BOM	2019-11-04 15:45:50 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
VESSILLER	668bb0cb86	NEW add public and private notes in propal list	2019-11-04 11:03:39 +01:00
Laurent Destailleur	4909a21f8a	Fix css	2019-11-03 22:09:20 +01:00
Laurent Destailleur	630a150b09	Fix multicurrency rate must be visible if currency differs only	2019-11-03 17:48:16 +01:00
Laurent Destailleur	9c5e17d676	Merge pull request #12214 from homer8173/patch-8 ... Implement new now feature	2019-11-02 15:09:06 +01:00
Laurent Destailleur	93f3b1d2db	Clean APIs	2019-11-02 15:05:14 +01:00
Laurent Destailleur	df750b6a9d	Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal ... NEW Add attendee to ical export + cleanup	2019-11-02 13:40:27 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid ... replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	137cfe9d4c	Merge pull request #12276 from frederic34/patch-11 ... css	2019-11-02 13:31:34 +01:00
Laurent Destailleur	07e9e2e872	Merge pull request #12274 from frederic34/patch-7 ... css	2019-11-02 13:31:10 +01:00
Laurent Destailleur	d232b7a387	Merge pull request #12286 from grandoc/new_branch_01_11_2019 ... add some comment	2019-11-02 13:00:23 +01:00
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	c12e66e2a2	Merge branch 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +01:00
Laurent Destailleur	1797b49778	Merge pull request #12288 from frederic34/patch-14 ... form_select_status_action returns void	2019-11-02 11:48:07 +01:00
Laurent Destailleur	3943cb18c2	Merge pull request #12295 from frederic34/actioncomm_doxygen ... doxygen for actioncomm class	2019-11-02 11:37:30 +01:00
Laurent Destailleur	4fd20157c2	Merge pull request #12298 from frederic34/patch-22 ... Update propal.class.php	2019-11-02 10:08:33 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	941043dd67	Fix navigation on resources	2019-11-02 00:17:08 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Frédéric FRANCE	693506cebd	Update propal.class.php ... socid is int	2019-11-01 20:26:55 +01:00
Frédéric FRANCE	bb9b435875	doxygen for actioncomm class	2019-11-01 17:12:07 +01:00
Frédéric FRANCE	400defd93d	form_select_status_action returns void	2019-11-01 15:04:37 +01:00
Laurent Destailleur	e3b5be7475	All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed ... into 'labelStatus'. All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.	2019-11-01 12:52:03 +01:00
Sekan, Tobias	0bfff92032	Add attendee to ical export + cleanup	2019-11-01 11:59:54 +01:00
Philippe Grand	4b5ca5c25e	Update mailing.class.php	2019-11-01 11:15:53 +01:00
stickler-ci	0c6938aa2a	Fixing style errors.	2019-11-01 09:44:29 +00:00
Philippe GRAND	c851a9faff	add some comment	2019-11-01 10:38:58 +01:00
Laurent Destailleur	c215d534fc	Fix phpcs	2019-10-31 21:16:41 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	a59c3ab0be	Update index.php	2019-10-30 18:55:04 +01:00
Frédéric FRANCE	ade50b5362	css	2019-10-30 18:50:55 +01:00
Laurent Destailleur	66a288a343	Merge pull request #12235 from frederic34/scopeindent ... clean indent	2019-10-30 02:57:59 +01:00
Laurent Destailleur	6073692654	Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric ... Fix non-numeric error in sort event function	2019-10-30 02:57:00 +01:00
Laurent Destailleur	c952c7e3c2	Merge pull request #12237 from grandoc/new_branch_26_10_2019 ... Internationalization	2019-10-30 02:53:34 +01:00
iouston	2072768ec2	NEW : add name_alias in fields to search all	2019-10-29 11:20:10 +01:00
Tobias Sekan	bfe7ad211f	Fix non-numeric error in sort event function ... Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces	2019-10-28 09:53:27 +01:00
Philippe GRAND	c07dc1cd5f	Internationalization	2019-10-26 22:40:10 +02:00
Frédéric FRANCE	c44425d0a0	start clean indent in compta directory	2019-10-26 14:51:57 +02:00
Frédéric FRANCE	1a10b30a76	clean indent in comm directory	2019-10-26 14:28:40 +02:00
Norbert Penel	a67b3d8cf5	Implement new now feature ... 8d75e83e55	2019-10-24 18:55:43 +02:00
Laurent Destailleur	2201b11fd3	NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL ... NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL	2019-10-24 13:41:04 +02:00
Laurent Destailleur	da00591bba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/product.lib.php htdocs/expedition/card.php htdocs/product/list.php	2019-10-23 04:04:32 +02:00
Laurent Destailleur	161f2a018f	Fix responsive and bad closing td	2019-10-23 03:50:48 +02:00
Laurent Destailleur	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
Frédéric FRANCE	86f22c4563	do not ignore lines with mix od tabs and spaces	2019-10-20 17:17:22 +02:00
Laurent Destailleur	b813dfe3c9	Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor ... Fix missing organizer and contact on ical export	2019-10-20 13:49:47 +02:00
Laurent Destailleur	89b0730483	Update actioncomm.class.php	2019-10-20 13:49:36 +02:00
Tobias Sekan	28dea51c4a	Fix missing organizer in ical export	2019-10-18 13:18:09 +02:00
Laurent Destailleur	f85899742b	Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen ... Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-17 17:48:42 +02:00
Laurent Destailleur	1a021e85f6	Merge pull request #12141 from TobiasSekan/FixNoneNumericValue ... Fix non-numeric value encountered on ical export	2019-10-17 17:39:25 +02:00
Tobias Sekan	daa7f54295	fix - not removed old code line	2019-10-17 08:10:21 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	8152c60878	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/actions_sendmails.inc.php	2019-10-16 17:13:14 +02:00
Laurent Destailleur	f88733f46a	Html code simplest	2019-10-16 14:14:32 +02:00
Tobias Sekan	741627897e	fix interchanged allocation	2019-10-16 13:56:11 +02:00
Laurent Destailleur	a57b456aa6	Merge pull request #12143 from frederic34/patch-19 ... NEW Add location into event tooltip. Use full day for fullday events	2019-10-16 13:21:55 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Frédéric FRANCE	ccd9da99f4	Update list.php	2019-10-15 20:11:15 +02:00
Frédéric FRANCE	6a8e8907ef	Update list.php	2019-10-15 17:55:07 +02:00
Tobias Sekan	199fb3be0f	Fix non-numeric value encountered on ical export	2019-10-15 14:29:27 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +02:00
Laurent Destailleur	65b6bc26ba	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:54:24 +02:00
Laurent Destailleur	0fe3159a8a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:52:46 +02:00
Laurent Destailleur	0d4866c38c	Merge pull request #12118 from iouston/patch-3 ... NEW: Add 2 hidden options to set the default sorting (sort and order) on document page	2019-10-14 21:23:59 +02:00
Laurent Destailleur	176436ec34	Update document.php	2019-10-14 21:23:52 +02:00
Laurent Destailleur	5d02763288	Merge pull request #12129 from cyrilus/develop ... ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-14 20:39:08 +02:00
stickler-ci	4b7987374b	Fixing style errors.	2019-10-14 14:46:04 +00:00
iouston	0a9cc96564	Update document.php ... Add 2 hidden options for set by default a sort (sort and order) on document page	2019-10-14 15:01:57 +02:00
Laurent Destailleur	9efc5a1b9d	Fix extension	2019-10-13 15:00:07 +02:00
Laurent Destailleur	33f6206031	NEW Add link to export target of emailings into a CSV file.	2019-10-12 20:12:24 +02:00
Laurent Destailleur	9c94ffeea9	Fix css	2019-10-12 18:40:41 +02:00
Laurent Destailleur	9ba992b8b6	Work on inventory module	2019-10-12 12:31:35 +02:00
Frédéric FRANCE	849eda2023	Update index.php	2019-10-12 00:05:26 +02:00
Frédéric FRANCE	c3e8aec07c	fix translation for showemailing ... in lang files, it's ShowEMailing not ShowEmailing	2019-10-11 23:54:05 +02:00
Laurent Destailleur	f345b5fdb0	Fix look and feel v10	2019-10-11 19:32:45 +02:00
Laurent Destailleur	a8676e63c8	CSS	2019-10-10 16:46:50 +02:00
ro@t.com	2149b155d1	ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-10 15:57:26 +02:00
Laurent Destailleur	b6c600c171	css	2019-10-10 11:44:03 +02:00
Laurent Destailleur	51ef2cd20a	FIX #12058	2019-10-07 20:20:06 +02:00
Laurent Destailleur	07d1a3fe8b	css	2019-10-07 18:17:22 +02:00
Laurent Destailleur	c83f40fc7e	Debug contact by default	2019-10-07 15:42:37 +02:00
Laurent Destailleur	f56da782ab	Merge pull request #12038 from Ahuahuachi/develop ... NEW Add hidden options to send by email even for draft status	2019-10-07 14:18:53 +02:00
Laurent Destailleur	d4f4f33122	Merge pull request #12048 from frederic34/patch-17 ... Update card.php	2019-10-07 10:23:51 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	bfd8bc839e	Update card.php	2019-10-06 10:28:09 +02:00
Alfredo Altamirano	140784d741	Merge remote-tracking branch 'Dolibarr/develop' into develop	2019-10-03 20:32:26 -05:00
Alfredo Altamirano	b6882af1b6	Add hidden options to send by email for all status	2019-10-03 20:21:13 -05:00
Laurent Destailleur	b60ee4c18c	css	2019-10-03 09:58:49 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	320e9bbeec	Text on tooltip can also be clickable	2019-10-02 15:54:42 +02:00
Laurent Destailleur	c6d38227b6	NEW Use a dedicated css for the pencil to edit a field	2019-10-02 14:44:38 +02:00
Laurent Destailleur	8ad81a092a	Clean code	2019-10-01 16:19:54 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	fec67aade4	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 18:44:34 +02:00
Laurent Destailleur	d3eafa86d7	Merge pull request #11988 from frederic34/patch-12 ... Add hook beforeAgenda in comm/action/index.php	2019-09-30 18:03:25 +02:00
Laurent Destailleur	ce7e8c83a3	Use a dedicated css imgforviewmode for button used to switch view	2019-09-30 17:08:57 +02:00
Frédéric FRANCE	4a305ec95c	Add hook beforeAgenda in comm/action/index.php	2019-09-30 15:59:05 +02:00
Laurent Destailleur	d8de78dca9	Merge pull request #11984 from fuhraih/develop ... Fix 11554 and 7533	2019-09-30 15:31:41 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Frédéric FRANCE	258424416e	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 07:49:52 +02:00
Laurent Destailleur	a2140412e0	Fix title	2019-09-30 00:41:38 +02:00
Laurent Destailleur	2b57d486dc	NEW Upgrade ACE editor to v1.4.6	2019-09-28 13:50:32 +02:00
Laurent Destailleur	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
fuhraih	5757159c30	FIX #7533 Infinite loop in Agenda per user view if workinghours not set ... correctly Remove the spaces in the Working_hours and Working_days stored	2019-09-27 22:29:12 +02:00
Laurent Destailleur	c5e7413ed2	Merge branch 'develop' into fix-resource-event-move-check-busy	2019-09-27 15:35:14 +02:00
Laurent Destailleur	34813a931f	Merge branch 'develop' into patch-10	2019-09-27 14:45:09 +02:00
Laurent Destailleur	f90bfb54d4	Merge pull request #11913 from frederic34/actioncommcarddoaction ... add doaction to actioncommcard	2019-09-27 14:34:49 +02:00
Laurent Destailleur	138b494b98	Merge pull request #11936 from aspangaro/11.0_translation ... Translate and some fix	2019-09-27 12:15:50 +02:00
Frédéric FRANCE	41cb628d05	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-25 08:06:44 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	5838fa1229	Fix az09 -> aZ09	2019-09-24 14:20:45 +02:00
Laurent Destailleur	db334a3b94	FIX Var not enough sanitized	2019-09-24 14:16:24 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +02:00
Laurent Destailleur	40f75b16d8	FIX Substitution of __PROJECT_XXX__ not done	2019-09-23 13:04:22 +02:00
VESSILLER	ea5ff59076	FIX check if a resource is in use after a drag and drop from events	2019-09-17 16:43:36 +02:00
Frédéric FRANCE	850b9fd52a	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-17 08:24:31 +02:00
Frédéric FRANCE	155e8fb500	fix syntax	2019-09-17 08:18:01 +02:00
Frédéric FRANCE	0d63c43ccd	add doaction to actioncommcard	2019-09-17 08:15:01 +02:00
Frédéric FRANCE	ecac1f9f40	wip	2019-09-17 08:02:55 +02:00
Frédéric FRANCE	a2d3cde291	some update after night	2019-09-17 07:59:46 +02:00
Frédéric FRANCE	fb7ef3cefc	Update card.php	2019-09-16 23:12:11 +02:00
Frédéric FRANCE	f369c1a80a	Update card.php	2019-09-16 20:59:13 +02:00
Frédéric FRANCE	67b73cf0e6	Update actioncomm.class.php	2019-09-16 20:57:20 +02:00
Laurent Destailleur	434ab2965a	Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy ... NEW check if a resource is in use in an event	2019-09-15 15:47:07 +02:00
Laurent Destailleur	4d0ef33471	FIX #11857	2019-09-15 15:43:03 +02:00
Frédéric FRANCE	c9c7d60fc0	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 16:37:10 +02:00
Laurent Destailleur	56a99f6e6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-12 11:22:13 +02:00
Laurent Destailleur	db900cb5ea	FIX EDB-ID:47370	2019-09-11 17:51:50 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
Laurent Destailleur	66a9fabd06	If you develop your own emailing target selector and used ... parent::add_to_target(...), you must now use parent::addToTargets(...)	2019-09-09 14:18:25 +02:00
Laurent Destailleur	28ba5abb89	Clean code	2019-09-09 13:31:14 +02:00
VESSILLER	66611f4097	FIX rename "resource" (reserved) by "dolresource"	2019-09-09 09:29:43 +02:00
Frédéric FRANCE	bd4c9a64a8	wip	2019-09-07 14:48:25 +02:00
Laurent Destailleur	a5f7211730	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/install/repair.php	2019-09-06 16:10:55 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	bb81f66a1a	Add phpunit test for Lessc	2019-09-06 10:36:49 +02:00
VESSILLER	815d0bbc20	FIX rename "dolresource" into "resource" for compatibility with PR 11822	2019-09-05 11:57:12 +02:00
VESSILLER	9ed09db93c	FIX replace "<br />" by "<br>"	2019-09-05 09:41:15 +02:00
VESSILLER	4ef7e755ad	FIX only check on busy resources before updating an event	2019-09-05 09:29:40 +02:00
VESSILLER	b70587c150	NEW check if a resource is in use in an event	2019-09-04 15:14:16 +02:00
Laurent Destailleur	750182f9cd	Removed deprecated method actioncomm->add(), use create() instead	2019-09-04 13:54:36 +02:00
Laurent Destailleur	da3d230182	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .stickler.yml htdocs/takepos/invoice.php	2019-09-03 17:34:49 +02:00
Laurent Destailleur	c32100c714	Merge pull request #11768 from atm-florian/10_fixeventlist ... fix event list with description	2019-09-03 15:02:22 +02:00