dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	60c3cefc53	FIX Api of documents work with value 'thirdparty'	2019-08-25 16:44:39 +02:00
Laurent Destailleur	69b2d03c47	FIX Api of documents work with value 'thirdparty'	2019-08-25 16:41:59 +02:00
Laurent Destailleur	3339f89fc5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/api/class/api_login.class.php htdocs/dav/fileserver.php	2019-08-22 12:45:23 +02:00
Laurent Destailleur	27cd6cd308	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/paiement.php htdocs/product/fournisseurs.php htdocs/stripe/payment.php	2019-08-22 12:39:07 +02:00
Laurent Destailleur	cdda08c0d3	FIX #11685	2019-08-22 11:47:03 +02:00
Laurent Destailleur	923eb935eb	Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"	2019-08-22 11:28:49 +02:00
Laurent Destailleur	2bc0163354	Merge pull request #11685 from ptibogxiv/patch-224 FIX for MAIN_MAXTABS_IN_CARD = $i card	2019-08-22 11:25:08 +02:00
Regis Houssin	90f60b0137	FIX add $context parameter in checkLoginPassEntity	2019-08-22 10:56:07 +02:00
Laurent Destailleur	b06dab6930	Fix add option to restore backward compatibility	2019-08-22 00:44:28 +02:00
Laurent Destailleur	bfbabbf626	Update geoip v1	2019-08-21 18:26:41 +02:00
Laurent Destailleur	689aa4979e	Code comment	2019-08-21 17:28:54 +02:00
Laurent Destailleur	2c3b2cd1a0	Look and feel	2019-08-21 04:21:43 +02:00
Laurent Destailleur	c60fc6c3d4	Add param logcontext on dol_syslog	2019-08-20 13:57:25 +02:00
Laurent Destailleur	d304749eca	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-19 10:19:14 +02:00
Laurent Destailleur	cc3fd0f1f6	Merge pull request #11679 from atm-john/develop_new_task_progress_bar FIX/NEW task widget and add task progress bar	2019-08-19 10:05:16 +02:00
Laurent Destailleur	18886c701d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/lib/company.lib.php	2019-08-19 00:02:26 +02:00
Laurent Destailleur	3a0057f6a3	FIX too many record in sql request. Whena criteria is a filter, we must use an inner join.	2019-08-18 23:59:24 +02:00
Laurent Destailleur	4fd68798a3	Fix phpcs	2019-08-18 20:38:51 +02:00
Laurent Destailleur	2f46b40da2	Prepare feature "Never show this message again"	2019-08-18 18:36:18 +02:00
Laurent Destailleur	7e4cf224ec	Merge branch 'develop' into develop_new_task_progress_bar	2019-08-18 05:38:45 +02:00
Laurent Destailleur	3f105a97bf	Debug the new workboard	2019-08-18 04:56:48 +02:00
Laurent Destailleur	b8e1cc8d16	Enhance #11643	2019-08-18 03:42:38 +02:00
Laurent Destailleur	467ad3ed22	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/product/stock/card.php	2019-08-16 21:48:46 +02:00
Laurent Destailleur	898996da4a	FIX vulenrability in uploading file found by 美创科技安全实验室	2019-08-16 21:45:13 +02:00
Laurent Destailleur	d51a651ab4	Fix phpcs	2019-08-16 17:35:12 +02:00
Laurent Destailleur	1f2eb31e41	Set utf-8 in lowercase	2019-08-16 06:06:36 +02:00
Laurent Destailleur	318b27e084	Fix link	2019-08-16 05:33:45 +02:00
Laurent Destailleur	63520e1d9b	Fix link	2019-08-16 05:32:24 +02:00
Laurent Destailleur	62438b61f0	Better error message	2019-08-16 05:14:20 +02:00
Laurent Destailleur	9a455cf1d6	Fix link	2019-08-16 05:03:48 +02:00
Laurent Destailleur	d5ce7fbaaf	Fix links	2019-08-16 05:01:54 +02:00
Laurent Destailleur	7580efbd4e	Fix link replacement	2019-08-16 04:32:06 +02:00
Laurent Destailleur	2510c1e5e4	Better help text	2019-08-16 03:05:55 +02:00
Laurent Destailleur	08038e5078	FIX save of empty files	2019-08-16 02:31:06 +02:00
Laurent Destailleur	31c26edaf7	Fix link	2019-08-16 00:31:55 +02:00
Laurent Destailleur	0045428c6c	Fix link	2019-08-15 23:45:28 +02:00
Laurent Destailleur	6430c74793	Merge pull request #11168 from hregis/develop_menu NEW add new function "setEntity()" and better compatibility with Multicompany	2019-08-15 21:00:05 +02:00
Laurent Destailleur	c0ac8daa61	Introduce the color theme "flashy" to use the high contrast color as an option because colors seems too agressive for sensible eyes.	2019-08-15 20:18:12 +02:00
Laurent Destailleur	76ae2695b2	Merge pull request #11690 from OPEN-DSI/new-expedition-list-massaction NEW add mass actions and FIX type ent array not defined in shipment list	2019-08-15 19:14:34 +02:00
Laurent Destailleur	1c372251de	Merge pull request #11691 from jtraulle/feature-rest-api-supplierinvoices-payments NEW Add GET and POST /supplierinvoices/payments REST API endpoints.	2019-08-15 19:13:32 +02:00
Laurent Destailleur	9cb5ba35dd	Merge pull request #11681 from hregis/10.0_mc FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme	2019-08-15 19:08:42 +02:00
Laurent Destailleur	59625dceb5	Fix phpcs	2019-08-15 19:03:30 +02:00
Laurent Destailleur	b5d72edebc	Can add more samples of pages. Add an exemple of page with dynamic content.	2019-08-15 18:07:36 +02:00
Laurent Destailleur	c92488986b	NEW Can have a preview of website template when loading a template	2019-08-15 02:32:07 +02:00
Laurent Destailleur	ca256a6635	Add shadow style	2019-08-15 01:58:22 +02:00
Laurent Destailleur	f81463af0c	Update templates	2019-08-15 00:55:47 +02:00
Jean Traullé	4252a2c868	Merge branch 'develop' into feature-rest-api-supplierinvoices-payments	2019-08-14 23:35:35 +02:00
Jean Traullé	c739b95666	Fix codestyle lessc.class.php should be excluded from ruleset as it is an external lib	2019-08-14 23:33:06 +02:00
Laurent Destailleur	f753799810	FIX Support #tag into url of website module	2019-08-14 23:27:34 +02:00
Jean Traullé	6d55af2530	Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments	2019-08-14 23:24:15 +02:00
Jean Traullé	1d2c2f8551	NEW Add payments GET and POST REST API endpoints for supplierinvoices.	2019-08-14 23:00:40 +02:00
Laurent Destailleur	0818571827	Work on the edit inline tool.	2019-08-14 19:48:52 +02:00
VESSILLER	b19817194d	NEW add mass actions and FIX type ent array not defined in shipment list	2019-08-14 17:11:59 +02:00
VESSILLER	891cd155ea	NEW add mass actions and FIX type ent array not defined in shipment list	2019-08-14 17:04:13 +02:00
Laurent Destailleur	10a3e773ce	FIX Avoid to add new line in css file at each save	2019-08-14 16:28:41 +02:00
Laurent Destailleur	12bebdefbb	Fix can replace PclZip with ZipArchive	2019-08-14 04:07:25 +02:00
Laurent Destailleur	fbf6cbe091	FIX Option to use ZipArchive instead of PclZip bugged with large files.	2019-08-14 04:07:02 +02:00
Laurent Destailleur	6de2118f11	FIX Bad error management in zip compress and web site export Conflicts: htdocs/website/index.php	2019-08-14 04:06:29 +02:00
Laurent Destailleur	e1ab5089d7	FIX Missing some replacements in website module Conflicts: htdocs/website/index.php	2019-08-14 04:02:57 +02:00
Laurent Destailleur	f1c6f1b375	Fix can replace PclZip with ZipArchive	2019-08-14 04:00:08 +02:00
Laurent Destailleur	b0172f136b	FIX Option to use ZipArchive instead of PclZip bugged with large files.	2019-08-14 03:43:15 +02:00
Laurent Destailleur	bc230c2d25	FIX Bad error management in zip compress and web site export	2019-08-14 01:43:06 +02:00
Laurent Destailleur	df53826426	FIX Missing some replacements in website module	2019-08-13 18:22:18 +02:00
ptibogxiv	93d64bb84e	Update functions.lib.php	2019-08-13 17:59:19 +02:00
ptibogxiv	8198276d64	FIX for MAIN_MAXTABS_IN_CARD = $i card	2019-08-13 17:47:30 +02:00
Regis Houssin	34579dd4db	FIX phpcs	2019-08-13 07:46:03 +02:00
Regis Houssin	7c8b3c9a38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-08-13 07:34:02 +02:00
Laurent Destailleur	49e61e237c	Better log	2019-08-13 07:08:45 +02:00
Laurent Destailleur	91cdb2a5a8	Add more logs	2019-08-13 07:05:06 +02:00
Laurent Destailleur	7891c8d856	Enhance logs	2019-08-13 06:52:07 +02:00
Laurent Destailleur	99473097a9	FIX Add log and type of content in dolWebsiteOutput and dolWebsiteReplacementOfLinks Conflicts: htdocs/website/index.php	2019-08-13 06:43:28 +02:00
Laurent Destailleur	277a693c16	FIX Add log and type of content in dolWebsiteOutput and dolWebsiteReplacementOfLinks	2019-08-13 06:37:06 +02:00
Laurent Destailleur	ae4bead85c	Fix missing function	2019-08-13 04:43:50 +02:00
Laurent Destailleur	7824731f17	NEW Add feature to search a string into containers	2019-08-13 00:34:42 +02:00
ATM john	b193f1b34e	Fix travis	2019-08-12 23:33:00 +02:00
Lenin Rivas	5c1a84746c	Add Linked objects Fichinter Ref. in PDF formats	2019-08-12 15:21:41 -05:00
Laurent Destailleur	8ad2081555	NEW Can select website templates from available default templates	2019-08-12 22:19:24 +02:00
Laurent Destailleur	c986dbc71f	NEW Add search into template	2019-08-12 20:32:18 +02:00
Laurent Destailleur	de1af78ae6	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-12 17:38:54 +02:00
Laurent Destailleur	18e4d1b334	Fix to avoid to die page when there is a redirect.	2019-08-12 17:22:46 +02:00
ATM john	1ffb013371	add filter	2019-08-12 15:24:07 +02:00
Laurent Destailleur	446f0590dc	FIX VAT number for Monaco (it uses FR)	2019-08-12 13:45:04 +02:00
ATM john	53721ae606	move late warning sign	2019-08-10 23:09:27 +02:00
ATM john	89447acaf3	remove tooltip on progress bar	2019-08-10 23:07:12 +02:00
ATM john	eedd065f48	remove useless function usage	2019-08-10 22:59:09 +02:00
ATM john	09c1289802	Fix task widget and improve its display	2019-08-10 22:48:07 +02:00
ATM john	527e4dcf46	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar	2019-08-10 15:41:49 +02:00
ATM john	3f0f7e2ad5	Add progress bar for task list and visual status badges	2019-08-10 15:41:21 +02:00
John Botella	63191dab7d	Add user color blind option	2019-08-07 12:03:19 +02:00
John Botella	4aeaa580ea	Add color blind option	2019-08-07 11:11:47 +02:00
Laurent Destailleur	c34739ab3f	Fix A file for a hidden feature provides a service without security checks.	2019-08-02 19:25:50 +02:00
Laurent Destailleur	b9ee95314a	SEC restrictedArea protects also the 'update' action	2019-08-02 17:12:59 +02:00
Laurent Destailleur	89a5a8188f	Fix A file for a hidden feature provides a service without security checks.	2019-08-02 17:12:03 +02:00
Laurent Destailleur	a03771ce61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:40 +02:00
Laurent Destailleur	3d8f6dca76	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:32 +02:00
Laurent Destailleur	bf14b4b3d5	Add Canada Dollar in currency that need symbol before	2019-08-01 16:20:18 +02:00
Laurent Destailleur	24bfd9d98b	Merge pull request #11605 from grandoc/new_branch_01_08_2019 add CAN$ within list of currencies before	2019-08-01 16:18:37 +02:00
Laurent Destailleur	73715f00af	Update functions.lib.php	2019-08-01 16:18:26 +02:00
Laurent Destailleur	008a54ea19	Update functions.lib.php	2019-08-01 16:14:53 +02:00
dolibarr95	b066431e0e	Add phone format for Jamaica	2019-08-01 15:46:34 +02:00
Laurent Destailleur	d6ae62478c	FIX #10984 FIX reposition on "Build backup" button FIX Fatal error on dol_htmloutput_mesg with corrupted array	2019-08-01 15:42:44 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
Laurent Destailleur	12b530c418	FIX Setup of TakePos was not possible after a clean install	2019-08-01 11:27:35 +02:00
Philippe GRAND	4b8963587a	add CAN$ within list of currencies before	2019-08-01 10:02:53 +02:00
Regis Houssin	d9ea61e47c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu Conflicts: htdocs/commande/class/commande.class.php	2019-07-31 12:49:56 +02:00
Laurent Destailleur	a7390e7e47	Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop NEW Management of retained warranty on situation invoices	2019-07-30 21:53:09 +02:00
Laurent Destailleur	1f3e509603	Show message when a redirect is done.	2019-07-28 21:24:42 +02:00
Laurent Destailleur	a46bfc7a29	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/project.lib.php	2019-07-25 17:54:14 +02:00
Laurent Destailleur	4a8377e4fd	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-25 17:52:40 +02:00
Laurent Destailleur	8241bc414a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/lib/files.lib.php	2019-07-25 17:52:17 +02:00
Laurent Destailleur	fe9ddd7649	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/lib/files.lib.php	2019-07-25 17:50:07 +02:00
Laurent Destailleur	fe22f11f10	More generic code	2019-07-25 15:07:00 +02:00
Laurent Destailleur	351b877c05	Add structured data product	2019-07-25 14:39:22 +02:00
Laurent Destailleur	fb2a9e371c	Fix syntax	2019-07-25 14:27:53 +02:00
Laurent Destailleur	6674b8975b	Fix logo of organization	2019-07-25 14:26:48 +02:00
Laurent Destailleur	1978ffb370	Fix	2019-07-25 14:21:39 +02:00
Laurent Destailleur	e29023f155	Fix	2019-07-25 14:12:22 +02:00
Laurent Destailleur	5fd35c1bc9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php	2019-07-25 13:51:12 +02:00
Laurent Destailleur	d1aa15004e	NEW Add method getStructuredData for website	2019-07-25 13:49:56 +02:00
Laurent Destailleur	0bb92ff10d	NEW Add method getStructuredDataForBlogPost for website	2019-07-25 13:48:13 +02:00
Laurent Destailleur	151075402f	css	2019-07-24 17:15:25 +02:00
atm-josselin	0a1f4b7931	FIX : correct error in files with multiple spaces	2019-07-23 09:45:17 +02:00
Laurent Destailleur	bf55733678	NEW Replace the "info" tab on contract with the more complete "agenda" tag.	2019-07-23 02:45:31 +02:00
Laurent Destailleur	f5afc50067	Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries	2019-07-22 18:47:35 +02:00
Laurent Destailleur	de18d5d187	Enhance phpstan	2019-07-20 16:22:00 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Laurent Destailleur	20e58bdd97	FIX Limit of uploaded files (max_post_size was not used)	2019-07-20 13:09:25 +02:00
Laurent Destailleur	220f8300c1	FIX Responsive of public interface of ticket	2019-07-20 00:14:14 +02:00
Alexandre SPANGARO	0af1206892	Merge branch 'develop' into 11.0_salaries	2019-07-19 23:11:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	14751680d2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-19 13:38:05 +02:00
Regis Houssin	7ffc46e1da	FIX When we are in update mode, so we use $this->entity	2019-07-19 09:47:05 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +02:00
Laurent Destailleur	6c3a30e872	Fix log	2019-07-19 03:05:55 +02:00
Laurent Destailleur	b9fe874b5f	Revert "Merge pull request #11022 from altatof/freetext" This reverts commit `879b4d8e7f`, reversing changes made to `ddc01b4c27`.	2019-07-18 18:19:51 +02:00
Laurent Destailleur	879b4d8e7f	Merge pull request #11022 from altatof/freetext NEW : manage output languages for free text	2019-07-18 17:29:45 +02:00
Alexandre SPANGARO	21bd46fc15	Merge remote-tracking branch 'upstream/develop' into 11.0_salaries	2019-07-17 14:09:46 +02:00
Alexandre SPANGARO	79d8351dda	NEW Extrafields on salaries	2019-07-17 14:09:25 +02:00
Laurent Destailleur	ee109ac568	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-05 17:44:50 +02:00
Laurent Destailleur	9b32763919	Fix label for report n ledger for transitionnal bank account on tranfer	2019-07-05 15:25:29 +02:00
Laurent Destailleur	e3359c6f0f	FIX Can't submit a ticket from public interface	2019-07-05 11:21:04 +02:00
Laurent Destailleur	4e00cfb455	Clean code	2019-07-04 16:02:04 +02:00
Laurent Destailleur	fb8c93a69d	FIX Bad sql request	2019-07-04 16:00:14 +02:00
Laurent Destailleur	c9477f5c4f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2019-07-01 13:29:33 +02:00
John Botella	9c2e83dcae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-07-01 09:51:26 +02:00
Laurent Destailleur	8f5b575b19	Fix missing php-intl is not blocking (not working on windows)	2019-06-30 16:19:26 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
atm-quentin	49db277368	FIX ending slash	2019-06-26 16:42:14 +02:00
John Botella	7e14a598e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-26 09:43:43 +02:00
Laurent Destailleur	a7bd734ece	Rename ->produit into ->product. Still permissions to rename.	2019-06-24 21:18:49 +02:00
Laurent Destailleur	d1dc189a8f	Merge pull request #11383 from atm-maxime/new_task_totaldeclared NEW Add global task declared progression	2019-06-24 18:12:55 +02:00
Laurent Destailleur	3c4956838e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-06-24 15:44:44 +02:00
John Botella	ec7446762c	Fix travis	2019-06-24 14:36:06 +02:00
Laurent Destailleur	76d49229cd	Fix log	2019-06-24 13:42:46 +02:00
Laurent Destailleur	1c86294f83	Enhance pdf_getFormat	2019-06-24 13:39:32 +02:00
Laurent Destailleur	1699413a4c	Add log	2019-06-24 12:59:16 +02:00
John Botella	9c414a7a57	Change function to camel case	2019-06-24 12:22:33 +02:00
John Botella	a83e7f3665	Add retained warranty to PDF	2019-06-24 12:00:55 +02:00
John Botella	7b6925b8f7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-24 10:29:43 +02:00
Laurent Destailleur	6cab4f03ba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 12:10:50 +02:00
Laurent Destailleur	a4cd7772ef	Fix title	2019-06-22 12:02:41 +02:00
John Botella	ec7ebe9f39	redo backported fix and update adherent substitution methode	2019-06-21 15:32:38 +02:00
John Botella	200b66d11f	Remove a backported fix because failling at init test	2019-06-21 14:52:12 +02:00
Laurent Destailleur	8da5794777	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/accounting.lib.php htdocs/product/stock/class/entrepot.class.php	2019-06-20 18:24:43 +02:00
Maxime Kohlhaas	b0229d1b9a	Global task declared progression on project task tab	2019-06-20 14:07:44 +02:00
Laurent Destailleur	ff0f6295d8	Fix phpcs	2019-06-20 13:59:53 +02:00
Laurent Destailleur	6975e18233	Fix phpcs	2019-06-20 13:59:04 +02:00
Laurent Destailleur	4ffa48d9bd	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 13:50:47 +02:00
Laurent Destailleur	29e3199639	Fix phpcs	2019-06-20 13:39:29 +02:00
Laurent Destailleur	e9da44e023	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 12:33:02 +02:00
Laurent Destailleur	cb057e9c6d	NEW Add hidden option to be ready for BREXIT	2019-06-20 12:32:14 +02:00
John Botella	b21006614c	Fix substitutions null	2019-06-20 12:00:44 +02:00
Laurent Destailleur	a264a4766a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 03:45:04 +02:00
Laurent Destailleur	ee8e7d66f8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-20 03:43:27 +02:00
Laurent Destailleur	078324811b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2019-06-20 03:43:16 +02:00
Laurent Destailleur	4574ad2eeb	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-20 03:39:48 +02:00
Laurent Destailleur	554724a46f	Merge pull request #11363 from aspangaro/10.0_other Translate rights	2019-06-20 03:36:16 +02:00
Laurent Destailleur	03178bc481	Merge pull request #11293 from hregis/develop_pdf FIX better method to check if pdf is protected/encrypted	2019-06-20 03:22:51 +02:00
Laurent Destailleur	d152354022	Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield NEW add extrafields in warehouses	2019-06-20 03:16:49 +02:00
Laurent Destailleur	898d766489	Merge pull request #11354 from rycks/allowZeroAsAccountNumber Allow zero as account number	2019-06-20 03:09:37 +02:00
Laurent Destailleur	d6b6f77e74	Fix support domains with 3 levels	2019-06-19 22:06:12 +02:00
Laurent Destailleur	68e9712f0c	Fix support domains with 3 levels	2019-06-19 22:05:38 +02:00
Alexandre SPANGARO	c59de49894	Translate rights	2019-06-18 22:38:52 +02:00
Laurent Destailleur	20e00ca290	FIX if last char of customercode is accent making the truncate of first chars wrong.	2019-06-18 19:41:16 +02:00
Laurent Destailleur	42e58d9ea5	Fix preview of interventions	2019-06-17 18:38:14 +02:00
Eric Seigne	80d4d8754d	allow zero as accountancy code nomber (replace all empty tests by != '')	2019-06-17 18:28:11 +02:00
Regis Houssin	3afd4e15ad	FIX try to remove ob_* functions	2019-06-17 07:09:19 +02:00
Regis Houssin	908b5fff00	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf	2019-06-17 07:08:35 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
Laurent Destailleur	122c4eb8bd	Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction FIX empty test	2019-06-14 13:51:34 +02:00
Laurent Destailleur	1fa1b91916	Update product.lib.php	2019-06-14 13:46:59 +02:00
Laurent Destailleur	e6c28188db	Update product.lib.php	2019-06-14 13:38:52 +02:00
ATM john	e7d81a68f0	Fix Override Attribute	2019-06-13 22:11:47 +02:00
ATM john	0ef9a8843a	Fix empty test	2019-06-13 21:57:30 +02:00
ptibogxiv	a30f029bbf	Update product.lib.php	2019-06-13 20:53:24 +02:00
ptibogxiv	b13b089c58	Fix measuring_units_string display function	2019-06-13 20:52:52 +02:00
Laurent Destailleur	f00c9a10db	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formfile.class.php	2019-06-13 12:15:51 +02:00
Laurent Destailleur	900e860f6d	Fix list of events for BOM module	2019-06-12 19:32:29 +02:00
Laurent Destailleur	2be5e9615d	Fix look and field v10	2019-06-12 19:03:22 +02:00
Laurent Destailleur	e81663ec34	Fix cropping of image files for BOM module was ko	2019-06-12 19:00:34 +02:00
Laurent Destailleur	f6d8b46b40	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/card.php htdocs/fichinter/card.php	2019-06-07 22:58:58 +02:00
Laurent Destailleur	0a903da5dc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/card.php htdocs/fichinter/card.php	2019-06-07 22:53:30 +02:00
Laurent Destailleur	b73d287953	Update agenda.lib.php	2019-06-07 18:09:43 +02:00
Frédéric FRANCE	f11db8396a	Parameter must be array or object that implements Countable warning with php 7.2	2019-06-06 09:49:32 +02:00
Laurent Destailleur	a08dcec7fc	Fix doc	2019-06-04 20:02:29 +02:00
Laurent Destailleur	210b2f37dc	Fix error message	2019-06-04 19:18:20 +02:00
John BOTELLA	d7a393bbd3	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-04 14:00:18 +02:00
Laurent Destailleur	79a3e41418	Hook 'getAccessForbiddenMessage'	2019-06-04 12:48:06 +02:00
Lionel VESSILLER	490e85f494	Fix PSR2	2019-06-03 16:34:49 +02:00
Lionel VESSILLER	439eafb637	NEW add extrafields in warehouses - create table - admin extrafields - object fecth, insert, update and delete extrafields - card and list	2019-06-03 15:44:17 +02:00
Regis Houssin	e5e6111544	FIX wrong function name	2019-06-03 12:05:58 +02:00
Regis Houssin	b0042995ac	FIX add docs	2019-06-03 12:04:17 +02:00
Regis Houssin	38246b4088	NEW add new function "setEntity()"	2019-06-03 11:13:26 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Regis Houssin	43ada3fcd4	FIX better method to check if pdf is protected/encrypted	2019-06-03 09:36:00 +02:00
Laurent Destailleur	5530e003ba	Fix title	2019-06-02 19:47:19 +02:00
Laurent Destailleur	e6100310af	Fix missing title	2019-06-02 19:47:01 +02:00
Laurent Destailleur	ab73d8a6fc	Merge pull request #11258 from hregis/develop_security FIX add Windows and Mac executable	2019-05-29 13:52:19 +02:00
Laurent Destailleur	05063016e8	FIX #11244 Enhance repair tool	2019-05-29 12:21:51 +02:00
Laurent Destailleur	a524fd17ce	Fix phpcs	2019-05-29 10:03:05 +02:00
Laurent Destailleur	3841fb5a85	Fix doxygen	2019-05-28 22:18:46 +02:00
Laurent Destailleur	454316a5fa	Fix getDomainFromURL	2019-05-28 22:18:22 +02:00
Laurent Destailleur	2404e6a521	Fix cast to int	2019-05-28 12:38:21 +02:00
Regis Houssin	3df6f0f6c3	FIX wrong extension	2019-05-27 11:43:06 +02:00
Regis Houssin	c1242f409b	FIX add Windows and Mac executable	2019-05-27 11:32:46 +02:00
Laurent Destailleur	c8970c0283	Fix vat validator	2019-05-22 16:50:53 +02:00
Laurent Destailleur	fb95fe0606	Check vat is not case sensitive	2019-05-22 16:15:26 +02:00
Laurent Destailleur	65acd6ef60	Fix function to check vat syntax	2019-05-22 15:48:07 +02:00
Laurent Destailleur	11bcfb4f5e	Fix check on VAT syntax not visible on list	2019-05-22 15:37:59 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	42f5ebed2d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/external_rss.php htdocs/admin/system/database-tables.php htdocs/admin/tools/export_files.php htdocs/core/actions_linkedfiles.inc.php htdocs/core/lib/files.lib.php htdocs/core/lib/functions.lib.php	2019-05-21 15:13:25 +02:00
Laurent Destailleur	f283e24b48	Fix the noexe must be added for dangerous extension like js and shells	2019-05-21 13:53:12 +02:00
Laurent Destailleur	eafc35b00f	Look and feel v10	2019-05-21 13:27:45 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10:47 +02:00
Laurent Destailleur	2bbb04085e	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/modulebuilder/template/class/myobject.class.php	2019-05-19 02:15:01 +02:00
Laurent Destailleur	71ef8c881b	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 Conflicts: htdocs/modulebuilder/template/class/myobject.class.php	2019-05-19 02:06:20 +02:00
Laurent Destailleur	7738787729	Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 Conflicts: htdocs/core/actions_sendmails.inc.php	2019-05-19 02:03:16 +02:00
Maxime Kohlhaas	1d980342ec	Fix #8344	2019-05-19 00:05:23 +02:00
Laurent Destailleur	41cb13b1cc	Fix warning	2019-05-18 19:28:14 +02:00
Laurent Destailleur	4517d84e3a	FIX Disable a module	2019-05-18 19:22:17 +02:00
Laurent Destailleur	94f5f6c655	Merge pull request #11207 from atm-john/FIX_scrutyniser FIX: scrutinizer feedback	2019-05-18 16:05:24 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
ATM John BOTELLA	f714b45efb	FIX scrutinizer feedback	2019-05-18 15:53:07 +02:00
Laurent Destailleur	26d4875f8f	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop	2019-05-18 02:27:23 +02:00
Laurent Destailleur	6c4a4c34c4	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0	2019-05-18 02:26:40 +02:00
Maxime Kohlhaas	2a2f0557cf	Fix : display hr tab on user if rights to read all	2019-05-17 17:07:38 +02:00
Laurent Destailleur	2d0b3b7b23	Fix dol_sort_array for objects	2019-05-16 12:25:14 +02:00
Laurent Destailleur	4a69541419	Several bug fixes using phpstan	2019-05-15 18:59:46 +02:00
Laurent Destailleur	717cafe213	Fix doc	2019-05-15 17:50:35 +02:00
Laurent Destailleur	75646e365d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/contrat/services_list.php htdocs/expensereport/list.php htdocs/product/list.php htdocs/product/reassort.php htdocs/product/reassortlot.php htdocs/projet/list.php	2019-05-13 12:28:16 +02:00
Laurent Destailleur	9242c1a630	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: ChangeLog htdocs/contrat/services_list.php htdocs/core/lib/files.lib.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-13 12:22:14 +02:00
Laurent Destailleur	c67d79a4e2	Update files.lib.php	2019-05-13 12:00:13 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
Laurent Destailleur	1c3bcea1f9	Merge pull request #11157 from ptibogxiv/patch-180 Fix img_credit_card with payment methods	2019-05-10 16:28:52 +02:00
Laurent Destailleur	cd8f601cdc	Fix length of vat number	2019-05-10 14:01:11 +02:00
ptibogxiv	f50280f13b	Fix img_credit_card with payment methods	2019-05-10 01:16:58 +02:00
Laurent Destailleur	314dc26b87	Look and feel v10	2019-05-09 19:32:19 +02:00
Laurent Destailleur	a5b1de4f6a	Fix tab that should not be visible	2019-05-09 17:52:55 +02:00
Laurent Destailleur	84714f39e2	Fix setup of terminal	2019-05-09 13:37:20 +02:00
Laurent Destailleur	96c021773e	Update takepos.lib.php	2019-05-08 19:11:17 +02:00
andreubisquerra	84cfa00bf1	Terminals	2019-05-08 18:29:00 +02:00
gauthier	f661b926fa	FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf Example : if you upload a file like "my file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space	2019-05-07 14:33:17 +02:00
Laurent Destailleur	eab49d4300	NEW Update Stripe library to 6.34.3	2019-05-03 02:22:27 +02:00
Laurent Destailleur	8442c86436	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/lib/functions.lib.php htdocs/index.php	2019-05-02 17:40:41 +02:00
Laurent Destailleur	8d7f24a6d9	FIX Default value on form to send email	2019-05-02 15:34:29 +02:00
Laurent Destailleur	425dd6faf7	Merge branch 'develop' into patch-2	2019-05-02 12:38:38 +02:00
Laurent Destailleur	ceeb9752ce	Fix PHPCS	2019-05-02 12:28:40 +02:00
Laurent Destailleur	0f8c7df6fe	Debug api of module BOM	2019-05-02 12:19:43 +02:00
Laurent Destailleur	90a1181dc5	Debug module Ticket	2019-05-01 20:41:03 +02:00
Laurent Destailleur	a75c6a81d1	FIX Follow rule to create a new page	2019-05-01 17:15:42 +02:00
Frédéric FRANCE	ac304f58b0	clean new commits	2019-04-30 20:37:59 +02:00
Frédéric FRANCE	5766bb0b8a	Merge remote-tracking branch 'upstream/develop' into patch-2	2019-04-30 20:16:43 +02:00
Laurent Destailleur	61bf731d17	FIX Balance of td	2019-04-30 18:11:35 +02:00
Frédéric FRANCE	3e99a40b9e	Update website.lib.php	2019-04-26 17:47:47 +02:00
Laurent Destailleur	4bd732cc40	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/export.php htdocs/core/class/utils.class.php htdocs/langs/en_US/website.lang	2019-04-25 23:25:21 +02:00
Laurent Destailleur	63c0ab93fb	FIX CVE-2019-11201	2019-04-25 23:21:25 +02:00
Laurent Destailleur	10dde837d0	Debug email collector	2019-04-25 19:32:48 +02:00
Laurent Destailleur	6fe84a7962	Fix phpcs	2019-04-25 11:18:25 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Laurent Destailleur	560b026d68	Fix CSS	2019-04-25 01:26:29 +02:00
Laurent Destailleur	79c37f2226	Fix link for endpoint	2019-04-24 18:47:11 +02:00
Laurent Destailleur	684e09fdcd	NEW Add function isValidVATID()	2019-04-23 22:49:33 +02:00
Laurent Destailleur	4d92d7731c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/sendings.lib.php htdocs/langs/en_US/admin.lang htdocs/theme/eldy/style.css.php	2019-04-23 12:32:08 +02:00
Laurent Destailleur	8d0825910a	Fix warnings	2019-04-23 10:38:20 +02:00
Laurent Destailleur	7c7c4f0d93	Removed warnings	2019-04-23 10:24:16 +02:00
Laurent Destailleur	f19d96bf8d	NEW Show enabled modules in dol_print_error	2019-04-23 10:24:05 +02:00
Laurent Destailleur	a50fc9189b	Fix phpcs	2019-04-22 15:45:44 +02:00
Laurent Destailleur	9e91826dea	Can set length of random password	2019-04-22 14:12:58 +02:00
Laurent Destailleur	be726c2376	Code comment	2019-04-22 12:44:25 +02:00
Laurent Destailleur	24572e2f82	Remove warnings	2019-04-22 12:42:46 +02:00
Laurent Destailleur	6da42941a8	NEW Add attached document on bank account visible in automatic ECM.	2019-04-21 19:54:30 +02:00
florian HENRY	83cf08f2eb	fix php warning	2019-04-18 20:37:27 +02:00
Frédéric FRANCE	4912c69d8a	Update functions2.lib.php	2019-04-18 10:12:00 +02:00
Laurent Destailleur	b5bf6830e9	Introduce method convertBackOfficeMediasLinksToPublicLinks so links to media added from filemanager in notes are visible by PDFs builder.	2019-04-17 01:13:59 +02:00
ATM john	945e3db952	remove text	2019-04-16 22:03:11 +02:00
ATM john	965c973bda	Change class name	2019-04-16 22:02:23 +02:00
ATM john	684879d73c	apply appli btn to more elements	2019-04-16 21:49:26 +02:00
Christophe Battarel	ce4b67ecaa	fix pagefoot	2019-04-16 16:45:43 +02:00
Christophe Battarel	502b1e4d31	add lang management to freetext	2019-04-16 16:16:37 +02:00
John BOTELLA	a60d4b3b52	Appli btn apply to links	2019-04-16 09:09:25 +02:00
ATM john	07e6ce5460	Appli function to links	2019-04-15 21:33:31 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Laurent Destailleur	00eb0511f6	Make code simpler to sort list of files.	2019-04-13 12:41:50 +02:00
Laurent Destailleur	cf058e7d3b	NEW Ask date of invoice when using the Clone feature.	2019-04-12 12:12:08 +02:00
Laurent Destailleur	cfa414b2de	Better log	2019-04-10 16:42:45 +02:00
Laurent Destailleur	26594fab98	Debug module ticket	2019-04-10 15:11:38 +02:00
Laurent Destailleur	ac25003d33	Dolibarize module ticket	2019-04-10 11:39:54 +02:00
Laurent Destailleur	ff629b2355	NEW Color for hover and for checked line is on by default	2019-04-09 15:57:26 +02:00
Laurent Destailleur	917b9d69fa	Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.	2019-04-08 14:55:31 +02:00
Laurent Destailleur	2b5e25188c	Merge pull request #10977 from IonAgorria/resources-product NEW: Resources tab possible in products/services	2019-04-08 13:57:30 +02:00
Laurent Destailleur	7c91c1b9f1	Merge pull request #10962 from aspangaro/v10_p2 FIX: Problem with badge in tab in expedition card	2019-04-08 13:33:59 +02:00
Ion	b64cb4129f	Add resources tab for products/services	2019-04-07 23:52:49 +02:00
Laurent Destailleur	fad2fa48dd	NEW Introduce a config parameter $dolibarr_main_instance_unique_id	2019-04-07 15:44:17 +02:00
Ion	71f30266dc	Add service to getElementProperties	2019-04-07 12:53:52 +02:00
Laurent Destailleur	54714bc755	Deprecated property ->fk_departement is now ->state_id everywhere.	2019-04-05 20:06:13 +02:00
Laurent Destailleur	b6c19e0f35	Fix var not defined	2019-04-05 19:48:32 +02:00
Laurent Destailleur	becefeebff	Fix upload of files without extension	2019-04-05 19:39:49 +02:00
Laurent Destailleur	734b97e255	Fix upload of files without extension	2019-04-05 19:39:04 +02:00
Laurent Destailleur	00cdf13a15	Revert "Do not close php tags" This reverts commit `1db134c2a0`.	2019-04-05 11:09:39 +02:00
Alexandre SPANGARO	b64ee3af70	FIX: Problem with badge in tab in expedition card	2019-04-04 17:02:18 +02:00
Laurent Destailleur	1f00e24abc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-04-03 18:52:47 +02:00
Laurent Destailleur	9e5d87e821	Fix warning	2019-04-03 18:39:27 +02:00
Laurent Destailleur	82c19a6372	FIX Avoid error 500 when extension php-intl not loaded	2019-04-03 18:38:27 +02:00
Laurent Destailleur	1db134c2a0	Do not close php tags	2019-04-03 18:13:39 +02:00
Laurent Destailleur	c5f5abc67d	Fix css for MD theme	2019-04-03 14:37:38 +02:00
Laurent Destailleur	80be77d95d	Merge pull request #10948 from ptibogxiv/patch-148 fix term autoOrManual	2019-04-03 11:03:44 +02:00
Laurent Destailleur	bb9cd05ea8	Fix phpcs	2019-04-02 20:02:43 +02:00
Laurent Destailleur	8a6e28860b	A better transition with deprecation	2019-04-01 22:09:24 +02:00
Laurent Destailleur	7db443e8ab	Better compatibility	2019-04-01 21:14:15 +02:00
ptibogxiv	5d25c33ff5	fix term	2019-04-01 20:49:41 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Laurent Destailleur	fc983fa65c	Move a function into functions2.lib.php	2019-04-01 18:46:13 +02:00
Laurent Destailleur	0c051e0cf0	Merge pull request #10923 from ptibogxiv/patch-145 NEW automatic / manual selector form	2019-04-01 18:44:05 +02:00
Laurent Destailleur	5d9a7e0d80	Fix phpcs	2019-04-01 18:21:59 +02:00
Laurent Destailleur	0091b65a83	Fix phpcs	2019-04-01 18:10:14 +02:00
Laurent Destailleur	c07159fee9	Fix regression in timesheet. Keep extrafield of task for the moment.	2019-03-31 22:06:41 +02:00
Laurent Destailleur	d572a9258c	Merge branch 'develop' into new_evol_time_spent_views	2019-03-31 19:12:27 +02:00
Laurent Destailleur	039e6034d1	Merge pull request #10936 from aspangaro/10.0_WARNING LOG_WARNING on function dol_print_date with deprecated value	2019-03-31 18:45:01 +02:00
Frédéric FRANCE	ddd1c04eae	phpcs fix	2019-03-31 09:27:11 +02:00
Laurent Destailleur	fca404e8d5	Show price without tax to prepare tax per customer country.	2019-03-30 19:30:58 +01:00
Laurent Destailleur	be21755378	Add page id to help debug in header	2019-03-29 23:04:09 +01:00
Laurent Destailleur	697a2e5576	Show time to bill and billed in list of tasks	2019-03-29 14:34:55 +01:00
Alexandre SPANGARO	8163739a68	LOG_WARNING on function dol_print_date with deprecated value	2019-03-28 12:03:04 +01:00
ptibogxiv	2c71b98d0d	NEW automatic / manual selector form	2019-03-27 11:05:43 +01:00
Laurent Destailleur	513ef1e727	Fix label short	2019-03-25 16:16:08 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Laurent Destailleur	a950d8389e	WIP Attach document to expense report lines	2019-03-24 20:22:05 +01:00
Laurent Destailleur	b2eee520df	Fix phpcs	2019-03-24 16:11:12 +01:00
Laurent Destailleur	152c27139f	Doc	2019-03-24 14:54:04 +01:00
Laurent Destailleur	614b4afeb0	NEW The preview of PDF files generates 1 png file even if several pages.	2019-03-24 14:53:26 +01:00
Laurent Destailleur	949ef79227	Better error message	2019-03-24 14:26:16 +01:00
Laurent Destailleur	fad6efd86c	WIP file attachment on expense report lines	2019-03-24 13:27:26 +01:00
Laurent Destailleur	df9e121ac6	Enhance the module debugbar. Do not scan the log anymore.	2019-03-23 14:37:54 +01:00
Laurent Destailleur	cd6a0bacdd	Look and feel v10	2019-03-22 14:32:15 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
atm-ph	b202169e9a	New evol "Input per day" display	2019-03-21 15:20:59 +01:00
atm-ph	fa41eeec7f	New evol "Input per week" display	2019-03-21 14:21:29 +01:00
Laurent Destailleur	70c2ffc816	FIX toggle of login_block was ko with eldy theme	2019-03-19 14:22:57 +01:00
Laurent Destailleur	1a8902f23e	Fix migration for compatibility	2019-03-19 12:03:02 +01:00
Laurent Destailleur	2a8056b075	Merge pull request #10881 from frederic34/patch-5 phpcs fix	2019-03-19 11:15:16 +01:00
Frédéric FRANCE	03cd321aeb	phpcs fix	2019-03-18 20:18:38 +01:00
Frédéric FRANCE	135df4b3ce	Usage of ELSE IF is discouraged; use ELSEIF instead	2019-03-18 11:24:56 +01:00
Laurent Destailleur	b3dc6d7d1d	NEW Generation of doc by modulebuilder can include README and CHANGELOG	2019-03-17 19:33:25 +01:00
Laurent Destailleur	5f9fa817fb	Fix bad log	2019-03-16 23:41:06 +01:00
Laurent Destailleur	e5567c7ee4	Fix typo	2019-03-16 14:48:41 +01:00
Laurent Destailleur	40c2ca4310	Fix label of status of third party record when using smartphone	2019-03-15 23:08:00 +01:00
Laurent Destailleur	7a5a561170	Fix label of status of invoice record when using smartphone	2019-03-15 23:00:50 +01:00
Laurent Destailleur	91f80934f3	Fix: On smartphone, hide label of status only on lists.	2019-03-15 20:39:55 +01:00
Laurent Destailleur	b6cacf3a20	Fix label of status for members on smartphone	2019-03-15 20:18:35 +01:00
Laurent Destailleur	d512e54407	Restore toggle of login_block because it was no more visible	2019-03-15 20:10:39 +01:00
Laurent Destailleur	3b4bcc67c9	Merge pull request #10780 from atm-john/theme_sidebarr_toggle NEW/FIX Theme sidebarr toggle	2019-03-15 19:41:39 +01:00
Laurent Destailleur	6f0fbc42c1	FIX Param keepn must be 1 when dol_escape_htmltag used for textarea Conflicts: htdocs/expensereport/card.php htdocs/projet/card.php htdocs/public/members/new.php htdocs/public/opensurvey/studs.php	2019-03-15 15:16:29 +01:00
Laurent Destailleur	e5c08978c3	FIX Param keepn must be 1 when dol_escape_htmltag used for textarea	2019-03-15 15:13:28 +01:00
Laurent Destailleur	a2d6723ff3	WIP Link files to expense report lines	2019-03-15 15:07:52 +01:00
Laurent Destailleur	d31b632d96	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/security.lib.php	2019-03-15 11:06:49 +01:00
Laurent Destailleur	074ba0729a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-15 11:00:52 +01:00
Laurent Destailleur	84bff41543	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-15 11:00:24 +01:00
Laurent Destailleur	6c2cad3d48	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/security.lib.php	2019-03-15 11:00:00 +01:00
Laurent Destailleur	e326c4d579	Look and feel v10	2019-03-15 10:48:10 +01:00
gauthier	8375b47e74	FIX : in fact expensereport must be in $check array	2019-03-15 10:21:50 +01:00
Laurent Destailleur	86c5dc20e3	NEW Can choose the root category to show for TakePOS module	2019-03-15 02:12:40 +01:00
Laurent Destailleur	0afbd70c2c	Merge pull request #10833 from grandoc/new_branch_14_03_2019 update with html5 compliant code	2019-03-14 18:04:06 +01:00
gauthier	3fb6978bc8	FIX : no need to test anything to display documents tabs on expense report	2019-03-14 17:36:49 +01:00
Laurent Destailleur	8a752ae657	Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield Fix sort by field in all events (action and emailing type)	2019-03-14 17:00:12 +01:00
Laurent Destailleur	be0535d11f	Merge pull request #10805 from frederic34/patch-2 update doc	2019-03-14 16:55:29 +01:00
Philippe GRAND	27b7ec8202	update with html5 compliant code	2019-03-14 14:24:17 +01:00
Philippe GRAND	d506cf7700	update with html5 compliant code	2019-03-14 14:21:54 +01:00
Philippe GRAND	68c6c0513d	update with html5 compliant code	2019-03-14 14:20:32 +01:00
Philippe GRAND	38822a9bb1	update with html5 compliant code	2019-03-14 14:18:44 +01:00
Philippe GRAND	6984cd25d8	update with html5 compliant code	2019-03-14 14:11:43 +01:00
Philippe GRAND	0832e9873c	update with html5 compliant code	2019-03-14 14:10:41 +01:00
Philippe GRAND	63b1a1459b	update with html5 compliant code	2019-03-14 14:09:54 +01:00
Laurent Destailleur	f8a4d9075b	Fix css for fontawesome 5	2019-03-14 11:48:25 +01:00
Laurent Destailleur	fcbd39fda9	Fix typo	2019-03-13 19:07:19 +01:00
Laurent Destailleur	e7cd8d690c	Remove warnings	2019-03-13 19:06:45 +01:00
Laurent Destailleur	1bd9d6a8e5	Fix font awesome 5 picto for notes	2019-03-13 15:02:43 +01:00
Laurent Destailleur	7d82073eab	Use fontawesome for icon "setup".	2019-03-12 11:57:55 +01:00
Laurent Destailleur	d762766a56	Font awesome 5 by default	2019-03-12 10:11:34 +01:00
John BOTELLA	be2885c75b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle	2019-03-12 09:24:42 +01:00
Frédéric FRANCE	40a1562077	update doc	2019-03-12 09:09:26 +01:00
Laurent Destailleur	abdc2aa21a	Fix phpcs	2019-03-11 21:03:23 +01:00
Laurent Destailleur	e5f0c8e0e7	Look and feel	2019-03-11 20:54:25 +01:00
John BOTELLA	57c6c60118	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-11 14:44:35 +01:00
John BOTELLA	5d7118340b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-11 14:40:19 +01:00
Laurent Destailleur	fac329e637	Clean code	2019-03-11 01:01:15 +01:00
Laurent Destailleur	935fe7c22a	Debug and enhance modulebuilder.	2019-03-10 19:33:28 +01:00
John BOTELLA	ccebb8d1a7	Fix travis errors	2019-03-08 14:40:22 +01:00
John BOTELLA	37cd62b564	Add user friendly behavior	2019-03-08 14:26:06 +01:00
John BOTELLA	218690db00	add css behavior	2019-03-07 17:05:27 +01:00
John BOTELLA	a0b14b9105	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 15:53:41 +01:00
John BOTELLA	74c8754092	fix travis	2019-03-07 15:49:16 +01:00
John BOTELLA	5ea5d51247	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 09:41:03 +01:00
John BOTELLA	89157234b7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-07 09:33:11 +01:00
Laurent Destailleur	0c2a0c643b	NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__	2019-03-06 14:33:05 +01:00
Lionel VESSILLER	bf5b482f3d	Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request	2019-03-06 09:05:07 +01:00
John BOTELLA	e382f13637	remove test	2019-03-05 17:16:38 +01:00
John BOTELLA	ef9ad4d109	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-05 17:14:59 +01:00
John BOTELLA	600f0c9fa6	Fix condition	2019-03-05 17:14:29 +01:00
John BOTELLA	72d96d2ac3	prepare badges	2019-03-05 17:13:20 +01:00
John BOTELLA	6b98eecd32	fix compatibility status	2019-03-05 16:58:05 +01:00
John BOTELLA	7a4540088a	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-05 15:37:17 +01:00
John BOTELLA	95981ca14c	PR feedback	2019-03-05 15:26:19 +01:00
Lionel VESSILLER	9b797eb980	Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event	2019-03-05 14:55:04 +01:00
Laurent Destailleur	4a582485b9	Debug module ticket	2019-03-04 19:19:09 +01:00
John BOTELLA	7cadaca8fc	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-04 11:37:16 +01:00
John BOTELLA	74caaca827	fix travis errors	2019-03-04 11:15:01 +01:00
John BOTELLA	c420cab500	fix travis errors	2019-03-04 11:11:15 +01:00
Laurent Destailleur	1931f43ce7	Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE	2019-03-03 00:05:07 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	a5711a51ab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/json.lib.php test/phpunit/JsonLibTest.php	2019-03-02 18:30:17 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	e215bfdb66	Merge pull request #10721 from frederic34/bad-exclude-pattern fix exclude from phpcs	2019-03-02 18:23:02 +01:00
Laurent Destailleur	03237d1730	NEW Look and feel v10 - Add CSS tabBarNoTop	2019-03-02 18:20:13 +01:00
Laurent Destailleur	5f6ca1119a	Replace arrow picto with fontawesome	2019-03-02 14:07:13 +01:00
Frédéric FRANCE	65551864d5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-03-02 12:24:15 +01:00
Laurent Destailleur	359f2c6e81	NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE Removed migration files	2019-03-02 12:16:37 +01:00
Frédéric FRANCE	40d34940f1	fix exclude from phpcs	2019-03-02 10:00:51 +01:00
John BOTELLA	421c009e58	Standardise new function name	2019-03-01 15:33:23 +01:00
John BOTELLA	162c3249cf	Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu	2019-03-01 13:49:42 +01:00
John BOTELLA	b222c44bb9	Add helper functions and little review size of badges	2019-03-01 12:01:25 +01:00
Frédéric FRANCE	4f9e35f350	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-28 20:48:23 +01:00
Laurent Destailleur	429da47d68	Fix default language of reminders	2019-02-28 13:11:14 +01:00
Laurent Destailleur	c444521abc	IFTTT	2019-02-28 11:00:40 +01:00
Frédéric FRANCE	ba4ca5d7c2	add visibility	2019-02-28 00:15:32 +01:00
Laurent Destailleur	29cfa03fa4	Fix font awesome 5 regressions	2019-02-27 13:54:39 +01:00
John BOTELLA	9f0a93f68f	Add color lib for color automation	2019-02-26 17:44:16 +01:00
Alexandre SPANGARO	2da1447a0b	Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin	2019-02-25 09:12:04 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
ptibogxiv	47f5ff3303	Fix declare functions2.lib.php for donations API	2019-02-24 20:51:00 +01:00
Laurent Destailleur	c002fd68ae	Merge pull request #10679 from ptibogxiv/patch-129 Fix declare functions2.lib.php for donations API	2019-02-24 20:49:59 +01:00
Laurent Destailleur	e349fe780e	Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing Fix url for emailing type event (link to emailing card)	2019-02-24 20:48:57 +01:00
Laurent Destailleur	3fa2680859	Merge pull request #10669 from frederic34/html5fix replace by html5 in ticket supplier_proposal, stripe, societe	2019-02-24 20:36:24 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
ptibogxiv	efd27ec1d8	Fix declare functions2.lib.php for donations API	2019-02-24 16:11:52 +01:00
Frédéric FRANCE	167a857f4c	replace html code by html5 in contact	2019-02-24 14:47:47 +01:00
Frédéric FRANCE	cdf5348b47	Update ajax.lib.php	2019-02-23 18:15:56 +01:00
Laurent Destailleur	0a83bc474c	Merge pull request #10635 from grandoc/new_branch_19_02_2019 update with html5 compliant code	2019-02-23 14:09:17 +01:00
Lionel VESSILLER	cdc2c5ae77	Company Lib : Fix contact events with no thirdparty	2019-02-21 09:49:46 +01:00
Lionel VESSILLER	d10c5cab34	Company Lib : Fix url for emailing type event (link to emailing card)	2019-02-20 15:14:50 +01:00
Laurent Destailleur	a3a89b755f	NEW Gain space by moving the meteo on title line	2019-02-20 06:01:13 +01:00
Laurent Destailleur	abfd610bbc	Fix quote not closed	2019-02-20 03:44:08 +01:00
Philippe GRAND	d83b77432d	update with html5 compliant code	2019-02-19 17:42:12 +01:00
Regis Houssin	1c3541295b	FIX wrong class name "CUnits instead CMeasuringUnits"	2019-02-19 09:24:30 +01:00
Laurent Destailleur	e644de4a70	Fix for font awesome 5	2019-02-15 15:30:21 +01:00
Laurent Destailleur	c480f4be68	FIX Bad remote ip address when user is using a proxy	2019-02-15 15:17:24 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
Laurent Destailleur	42f754cbc0	Merge pull request #10596 from frederic34/patch-33 Update functionsnumtoword.lib.php	2019-02-14 13:33:03 +01:00
Laurent Destailleur	6b00bb1a6f	Merge pull request #10583 from frederic34/patch-18 Update company.lib.php	2019-02-14 13:26:21 +01:00
Frédéric FRANCE	0594061ef4	Update functionsnumtoword.lib.php	2019-02-14 00:03:10 +01:00
Frédéric FRANCE	154ba78ee7	Update company.lib.php	2019-02-13 22:43:12 +01:00
Frédéric FRANCE	b9d37c276d	update doc in barcode.lib.php	2019-02-13 22:23:14 +01:00
Laurent Destailleur	2311912d8a	Merge branch 'develop' into dev_importproduct_measuringunit	2019-02-13 16:35:46 +01:00
Laurent Destailleur	69313cbf0d	Merge pull request #10567 from frederic34/patch-18 Update images.lib.php	2019-02-13 16:25:32 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
florian HENRY	e2d13c0e1f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importproduct_measuringunit Conflicts: htdocs/contact/consumption.php htdocs/webservices/server_productorservice.php	2019-02-13 09:23:52 +01:00
florian HENRY	5c059c897d	fix travis (mosty for dev no conerne by my changes)	2019-02-13 09:21:14 +01:00
florian HENRY	d88475c61a	Merge branch 'develop' of local repository into dev_importproduct_measuringunit	2019-02-13 08:59:18 +01:00
Frédéric FRANCE	e4b73e8273	Update images.lib.php	2019-02-12 23:39:59 +01:00
Frédéric FRANCE	2aae952760	fix doc in tax.lib.php	2019-02-12 23:25:26 +01:00
Laurent Destailleur	5fceee3048	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/8.0.0-9.0.0.sql	2019-02-12 19:02:19 +01:00
Laurent Destailleur	affbd20cdb	FIX Bad link in menu manager	2019-02-12 18:56:32 +01:00
florian HENRY	5b5f96bafb	NEW : measuring unit dictionnary and product size/unit import	2019-02-12 16:58:11 +01:00
Alexandre SPANGARO	b99149b940	Move error on function dol_include_once() to LOG_WARNING	2019-02-12 16:34:52 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
ATM-Nicolas	4e35ebe52a	FIX : Default sign out icon if not using Font Awesome 5	2019-02-12 10:43:00 +01:00
Laurent Destailleur	27cad29e1e	Fix regression of right alignement	2019-02-11 15:06:52 +01:00
Laurent Destailleur	0bd30b160a	Fix picto logout with fontawesome 5	2019-02-11 11:55:48 +01:00
Frédéric FRANCE	152d8ffcbf	Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-10 11:08:59 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	522afd8e7b	Fix font awesome 5	2019-02-09 13:11:02 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Laurent Destailleur	38d4284638	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php	2019-02-08 11:26:08 +01:00
Laurent Destailleur	471f11dace	Merge pull request #10502 from hregis/9.0_merge FIX wrong merged conflict	2019-02-08 09:34:49 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	3bdf017d41	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-07 19:39:59 +01:00
Laurent Destailleur	8d82135033	Fix missing \n	2019-02-07 19:39:23 +01:00
Laurent Destailleur	491bfbdbfc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-07 19:39:04 +01:00
Laurent Destailleur	89af7b0e98	Add doctype to web site	2019-02-07 19:38:36 +01:00
Laurent Destailleur	789c089e14	Code comment	2019-02-05 13:08:28 +01:00
Regis Houssin	8860eab6b1	FIX wrong merged conflict	2019-02-05 07:40:50 +01:00
Frédéric FRANCE	e1e14ae6e6	wip	2019-02-03 22:58:56 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	49d695c9b2	Merge pull request #10479 from frederic34/patch-2 remove psr2 warning for else if usage	2019-02-03 19:06:38 +01:00
Frédéric FRANCE	273d68381c	psr2 end file new line none found	2019-02-03 15:21:21 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Frédéric FRANCE	25abceb116	remove psr2 warning for else if usage	2019-02-02 08:59:37 +01:00
Frédéric FRANCE	96de1b175c	clean missing spaces in the last merge	2019-02-02 08:51:30 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	08050434a1	Merge pull request #10435 from wdammak/patch-22 Wrapping for stock movements	2019-02-01 16:11:37 +01:00
Laurent Destailleur	cf89fbd165	Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab New contact related item tab	2019-02-01 15:39:39 +01:00
Laurent Destailleur	eb3621839a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/members.lang htdocs/langs/fr_FR/members.lang	2019-02-01 15:14:19 +01:00
ATM-Nicolas	2cbb58c2eb	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab	2019-02-01 10:54:42 +01:00
ATM-Nicolas	f432a874e6	NEW : Contact related items tab	2019-02-01 10:51:28 +01:00
Laurent Destailleur	3e6aef472d	css	2019-01-31 20:53:59 +01:00
Laurent Destailleur	189323ad58	Fix when using image into description	2019-01-31 18:12:34 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Pierre Ardoin	b6df02e795	Correction oubli date de livraison Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs	2019-01-29 11:47:39 +01:00
Laurent Destailleur	08a181bfbf	Fix substitution of REF_CLIENT and REF_SUPPLIER	2019-01-29 11:00:17 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
wdammak	388efb6773	Wrapping for stock movements	2019-01-28 04:36:26 +01:00
Frédéric FRANCE	ff39491f15	wip	2019-01-27 23:31:37 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	462c1f9c1a	Merge pull request #10413 from mapiolca/patch-8 Add date_livraison substitution	2019-01-26 15:38:00 +01:00
Pierre Ardoin	6fdbded588	Update functions.lib.php	2019-01-26 14:40:00 +01:00
Laurent Destailleur	fd192f10c4	Merge pull request #10341 from hregis/8.0_bug FIX security broken with Multicompany	2019-01-26 14:28:13 +01:00
Pierre Ardoin	78f8607d41	Add date_livraison substitution Complete the substitution for supplier orders.	2019-01-25 13:15:24 +01:00
Laurent Destailleur	e860d664d7	Fix substitution of __REF_CLIENT__	2019-01-23 11:54:20 +01:00
Laurent Destailleur	8104b7fa2d	look and feel v10	2019-01-22 15:40:51 +01:00
Laurent Destailleur	42743027d4	Merge branch 'develop' into objectline_etc	2019-01-21 18:04:48 +01:00
torvista	9b1cf648dc	more validation fixes	2019-01-21 16:19:31 +01:00
torvista	07b2bb6715	Swap of align/valign/border/width for css Removal of type="text/javascript"	2019-01-20 23:36:39 +01:00
Laurent Destailleur	7493ba018a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/8.0.0-9.0.0.sql	2019-01-20 20:38:26 +01:00
Laurent Destailleur	3ddfcbe3bb	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml dev/setup/codesniffer/ruleset.xml	2019-01-20 20:36:45 +01:00
Regis Houssin	d5b66eeffb	FIX $user is already in parameters	2019-01-19 18:12:48 +01:00
Laurent Destailleur	4ffd7de9f7	doc	2019-01-19 16:15:05 +01:00
Laurent Destailleur	f311deb405	Fix hash for gol_getprefix must not contains special char.	2019-01-19 16:14:45 +01:00
Philippe GRAND	29fdad144d	update with html5 compliant code	2019-01-19 12:40:17 +01:00
Laurent Destailleur	05cc5b6398	Show duration of jobs	2019-01-17 17:50:21 +01:00
gauthier	d997309bcb	FIX : if(!method_exists(dol_loginfunction))	2019-01-17 14:49:30 +01:00
Regis Houssin	c4b9bdd569	FIX remove var_dump	2019-01-16 19:15:02 +01:00
Regis Houssin	45a7e03562	FIX a user can always read its own card	2019-01-16 19:13:21 +01:00
Laurent Destailleur	3a8afafabd	Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice New manage multicompany for invoice	2019-01-16 18:51:01 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
Laurent Destailleur	a72d92006b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 13:57:33 +01:00
Laurent Destailleur	638be67f96	Fix tooltip	2019-01-16 13:56:13 +01:00
Laurent Destailleur	c357cb8c4e	Clean code	2019-01-16 12:42:54 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Laurent Destailleur	1f87b8bb18	FIX Position of price symbol (before) for nl_NL	2019-01-16 01:54:08 +01:00
ptibogxiv	c96f349c21	update head with schedule	2019-01-15 14:55:15 +01:00
Regis Houssin	7c9d85d091	FIX problem with multicompany transverse mode Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2019-01-15 12:18:04 +01:00
Laurent Destailleur	126e02798a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/cashdesk.lang htdocs/langs/fr_FR/cashdesk.lang	2019-01-07 19:49:15 +01:00
Laurent Destailleur	1306918eb0	FIX #10299	2019-01-07 16:03:55 +01:00
AXeL-dev	66e1df753e	run_sql function: support for numbers in database prefix	2019-01-07 09:33:24 +01:00
ldestailleur	451b3e30cc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/langs/en_US/cashdesk.lang	2019-01-04 19:36:20 +01:00
ldestailleur	5638ac8f4d	FIX title on picto no more visible Conflicts: htdocs/core/lib/functions.lib.php	2019-01-04 15:25:14 +01:00
ldestailleur	b4fc4b0178	FIX title on picto no more visible	2019-01-04 15:22:59 +01:00
ldestailleur	ab9fe1a757	Add option to use fontawesome 5 with fontawesome 4	2019-01-03 21:14:59 +01:00
ldestailleur	7c1ed5b913	FIX #9972 #10297	2019-01-03 13:28:35 +01:00
ldestailleur	7cb3b8dfec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:26 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	a9e8e13bb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: ChangeLog htdocs/user/param_ihm.php	2019-01-02 19:41:39 +01:00
ldestailleur	3d8479291d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-02 19:39:35 +01:00
Laurent Destailleur	422e18ee8e	Merge pull request #10268 from hregis/develop_upgrade FIX remove old unused and deprecated function "getStaticMember"	2019-01-02 19:37:49 +01:00
ldestailleur	8645a7f524	FIX Interface regression for bind people. Fix option MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-02 18:58:45 +01:00
Laurent Destailleur	294107bba0	FIX vars for substitution must be null if not applicable (and not '')	2018-12-27 05:07:11 +01:00
Laurent Destailleur	6a708666b2	FIX vars for substitution must be null if not applicable (and not '')	2018-12-27 05:06:37 +01:00
Regis Houssin	4ee09c9d5b	FIX remove old unused and deprecated function	2018-12-25 07:58:32 +01:00
Laurent Destailleur	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +01:00
Laurent Destailleur	2b3fbecd49	Fix when random_int is not available	2018-12-22 18:15:49 +01:00
Laurent Destailleur	b7b69b79dc	Fix phpdoc	2018-12-21 09:59:21 +01:00
Laurent Destailleur	8a70cf9ede	NEW Add parameter replaceambiguouschars on getRandomPassword function	2018-12-21 09:56:54 +01:00
Laurent Destailleur	eed4d9509b	Merge pull request #10243 from AXeL-dev/patch-3 fix executable files security check regex	2018-12-17 21:09:32 +01:00
Laurent Destailleur	3a4538f429	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-17 19:37:56 +01:00
Laurent Destailleur	c444ef3b4d	FIX wrapper could not download shared files	2018-12-17 19:37:17 +01:00
Laurent Destailleur	623afd1020	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-12-17 18:50:06 +01:00
Laurent Destailleur	ffaff4dc7f	Debug website module	2018-12-17 17:29:04 +01:00
Laurent Destailleur	4e940ebaf1	FIX Download of files with hashp when files are into user dir	2018-12-17 15:35:20 +01:00
Laurent Destailleur	17b2fd295f	FIX Css of amount on remain to pay on expense report	2018-12-17 13:57:30 +01:00
AXeL-dev	7f014d76cc	fix executable files security check regex	2018-12-17 12:31:12 +01:00
Laurent Destailleur	527ad04ae8	FIX Mandatory field feature should works on textarea Conflicts: htdocs/core/lib/functions.lib.php	2018-12-15 18:13:30 +01:00
Laurent Destailleur	6188156c52	FIX Mandatory field feature should works on textarea	2018-12-15 18:11:40 +01:00
Laurent Destailleur	319c571d76	Merge pull request #10125 from defrance/patch-131 NEW massfilesarea feature for plugin modules	2018-12-15 15:13:13 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	4ffafae025	Merge pull request #10116 from defrance/patch-126 Introduce standard sql date format filter	2018-12-14 17:58:45 +01:00
Laurent Destailleur	77c01a1fae	Update date.lib.php	2018-12-14 17:58:33 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	fec64a78ab	Merge branch 'develop' into New_manage_loan_schedule	2018-12-14 10:54:09 +01:00
Laurent Destailleur	539e2c55cd	FIX #9629 #9625	2018-12-14 10:33:07 +01:00
Laurent Destailleur	c1ce902f91	FIX #9629 #9625	2018-12-14 10:31:09 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	1ee1b7a321	Merge pull request #10212 from atm-john/new_pdf_improve_desc_item_visibility NEW Hidden conf to improve pdf desc item visibitity	2018-12-13 20:06:50 +01:00
Laurent Destailleur	434cf2e046	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-11 09:58:14 +01:00
Laurent Destailleur	3213b3be07	Standardize code: Move jabberid into social network module	2018-12-11 09:17:02 +01:00
Laurent Destailleur	cf74e5b9a8	Change order of tabs	2018-12-10 00:25:10 +01:00
ATM John BOTELLA	c6521dbfea	NEW improve pdf desc item visibitity	2018-12-08 17:56:03 +01:00
Laurent Destailleur	cd3716ff9f	Dolibarize module ticket	2018-12-08 16:37:41 +01:00
Laurent Destailleur	21b3bbc2e6	Merge	2018-12-08 11:55:27 +01:00
Laurent Destailleur	a915d82883	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-08 11:42:30 +01:00
Laurent Destailleur	5ce26bae1b	Fix form of bank info for CH	2018-12-04 22:01:35 +01:00
Laurent Destailleur	6d093b03f6	Code comment	2018-12-04 18:07:02 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Laurent Destailleur	ea119a26c7	Update ajax.lib.php	2018-12-02 17:03:11 +01:00
BENKE Charlene	044c54da94	Warning error if $conf->browser->layout is empty	2018-12-02 10:45:37 +01:00
Laurent Destailleur	a8009d4a72	Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources FIX Work with new table actioncomm_resources and multiple contact affectation	2018-12-01 16:16:50 +01:00
Laurent Destailleur	9ac984af76	Update company.lib.php	2018-12-01 16:15:34 +01:00
Laurent Destailleur	f94f7e15ca	Update date.lib.php	2018-12-01 15:07:55 +01:00
BENKE Charlene	60d0a5efab	massfilesarea feature for plugin modules	2018-12-01 14:44:34 +01:00
BENKE Charlene	fca332995b	scrutinizer major error	2018-12-01 11:37:50 +01:00
BENKE Charlene	19e4698488	Update date.lib.php	2018-12-01 10:32:37 +01:00
BENKE Charlene	085101376c	Introduce standard sql date format filter refactoring standard sql filter for date	2018-12-01 00:41:46 +01:00
Laurent Destailleur	bbfd134733	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-29 11:24:18 +01:00
Laurent Destailleur	950dfeef58	Merge pull request #10081 from oscim/patch-1 Update company.lib.php	2018-11-29 11:15:52 +01:00
Laurent Destailleur	f3ce49806d	Update company.lib.php	2018-11-29 11:15:27 +01:00
Laurent Destailleur	10fc0149d8	responsive	2018-11-29 11:03:02 +01:00
Laurent Destailleur	b9c08853be	CSS	2018-11-28 16:54:21 +01:00
Laurent Destailleur	01181ba3a4	Fix avoid warning	2018-11-28 13:06:39 +01:00
Laurent Destailleur	70bd931d08	FIX empty page due to preg_replace JIT error on large strings	2018-11-27 16:20:31 +01:00
Laurent Destailleur	b9e544d291	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/resource/list.php	2018-11-26 23:08:06 +01:00
oscim	f5ebcca475	error space after comment	2018-11-26 15:47:51 +01:00
oscim	2af24903e9	Update company.lib.php Fix list in agenda for tab customer / provider , no thirdparty selected because name of class is not Societe	2018-11-26 10:53:34 +01:00
Laurent Destailleur	2e139d1960	Fix var $hidedetails not defined	2018-11-25 12:08:49 +01:00
Laurent Destailleur	13e24dc894	Code comment	2018-11-23 15:35:40 +01:00
Laurent Destailleur	5bd9c14929	Update demo data for 8.0 and 9.0	2018-11-23 14:05:45 +01:00
Laurent Destailleur	0fbf213739	Fix length of field	2018-11-22 13:08:18 +01:00
Laurent Destailleur	1d4c756783	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-22 11:44:37 +01:00
Laurent Destailleur	5e9abe6aad	Fix getLanguageCodeFromCountryCode	2018-11-21 16:28:36 +01:00
Laurent Destailleur	b6dac7da20	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-21 15:40:15 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Laurent Destailleur	c891f6ed10	Disable javascript feature with no javascript	2018-11-20 21:26:22 +01:00
Laurent Destailleur	1ecdaa548c	Remove the no more used and deprecated dol_print_graph function	2018-11-20 20:28:46 +01:00
Laurent Destailleur	929635d468	Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter Fix Contact Agenda events filter when no Third Party	2018-11-19 18:35:55 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
Regis Houssin	7cba680f38	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-18 17:07:03 +01:00
Laurent Destailleur	6b8a3094f0	Fix missing some keys in substitution arrays	2018-11-17 00:14:23 +01:00
Laurent Destailleur	5d596fe584	Fix trackid must contains an id of instance	2018-11-16 16:43:13 +01:00
atm-quentin	a0d5607ba5	FIX error travis	2018-11-16 15:29:05 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
François J	a5777d30e1	Fix Contact Agenda events filter when no Third Party Handle case where the contact is not linked to any third party.	2018-11-16 10:09:25 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Regis Houssin	2350908d4e	FIX change getEntity doc and changelog	2018-11-15 19:00:14 +01:00
Laurent Destailleur	e1407c8289	Merge pull request #10012 from hregis/develop_mc FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-15 17:19:28 +01:00
Laurent Destailleur	85cdc44105	Several fixes in project creation, cache of dolGetIfFromCode, ...	2018-11-15 13:39:12 +01:00
Regis Houssin	2bc25fc008	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-14 15:24:41 +01:00
Laurent Destailleur	a7989eb893	Fix menu	2018-11-14 13:55:10 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
Laurent Destailleur	77582b2a41	FIX the autofocus feature	2018-11-13 11:36:57 +01:00
François J	10dd5652ee	Add SELECT DISTINCT to show_actions_done() SQL request	2018-11-12 12:34:25 +01:00
François J	9a6a3d8df4	Join llx_actioncomm_resources only if we have a contact object.	2018-11-12 12:20:07 +01:00
Regis Houssin	ce317e6110	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project Conflicts: htdocs/admin/limits.php	2018-11-12 08:37:21 +01:00
Regis Houssin	854bb99cc0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project	2018-11-11 08:52:20 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	9a31a61c9d	FIX #9971	2018-11-08 20:05:01 +01:00
Laurent Destailleur	588de2cc86	Fix filter on entity on project	2018-11-08 18:45:02 +01:00
Laurent Destailleur	c55f83b0b7	Fix multicompany filter missing	2018-11-08 11:25:29 +01:00
François J	121297b5bd	SQL Join actioncomm_resources	2018-11-07 17:10:51 +01:00
François J	aea01b3208	NEW Work with new table actioncomm_resources and multiple contact affectation	2018-11-07 17:04:18 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	9a0b5fb599	Fix extrafields	2018-11-07 12:25:22 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	763f3cd518	Debug modulebuilder	2018-11-05 18:10:38 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	d65bf1fbc7	Fix emailcollector	2018-11-05 15:31:41 +01:00
Laurent Destailleur	68ec172798	Fix setup to enable reminder b email	2018-11-03 12:37:52 +01:00
Laurent Destailleur	c764d7f8d5	Fix remove var_dump	2018-10-30 21:34:17 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Regis Houssin	26b00dc5ca	NEW possibility to defined rounding rules by currency	2018-10-30 17:40:05 +01:00
Laurent Destailleur	c9d00848e6	Merge pull request #9914 from frederic34/patch-27 make play and playdisable equals	2018-10-30 14:49:54 +01:00
Laurent Destailleur	4a71374cf7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:48:09 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	7a268d8d9f	Clean code	2018-10-30 14:27:14 +01:00
Laurent Destailleur	81c70898bf	Merge pull request #9884 from hregis/develop_bug FIX $forceentity is not used, replace by $currentobject if needed	2018-10-30 14:16:29 +01:00
Laurent Destailleur	d4fd55c4cf	FIX #9907	2018-10-30 13:54:11 +01:00
Laurent Destailleur	ca6d15a3eb	Merge pull request #9820 from laudeco/hotfix/9640_member_email FIX the member e-mail on resign and validation.	2018-10-30 12:41:34 +01:00
Laurent Destailleur	9bb1572e63	Update functions.lib.php	2018-10-30 12:41:06 +01:00
Frédéric FRANCE	450a837393	make play and playdisable equals	2018-10-29 18:50:15 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Regis Houssin	866a7df510	FIX $forceentity is not used, replace by $currentobject if needed	2018-10-26 18:23:48 +02:00
De Coninck Laurent	d347cf3a85	set a message	2018-10-26 16:18:27 +02:00
Laurent Destailleur	0e464ea4f5	Merge pull request #9866 from frederic34/emptylines Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-26 15:31:24 +02:00
Laurent Destailleur	d28c9ddea5	Merge pull request #9872 from laudeco/feature/improvement_module_picto improve img_picto by returning ASAP	2018-10-26 15:20:40 +02:00
De Coninck Laurent	70cd68ebef	improve img_picto by returning ASAP We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).	2018-10-25 18:21:00 +02:00
atm-ph	f41e7e05e1	Fix PHP warnings printed in javascript	2018-10-25 12:01:17 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	eaab953ba2	Renamed mouvement.php into movement_list.php to follow dev rules	2018-10-24 03:50:18 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	f8316abfc0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/compta/bank/class/account.class.php htdocs/theme/md/style.css.php	2018-10-24 02:58:29 +02:00
Laurent Destailleur	612e3a9805	Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr into aspangaro-9.0_accountancy # Conflicts: # htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php # htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php # htdocs/accountancy/class/lettering.class.php	2018-10-24 02:54:57 +02:00
Laurent Destailleur	919c4fc5bc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/theme/md/style.css.php	2018-10-24 02:40:57 +02:00
Laurent Destailleur	e0b20c2632	Add holiday for India	2018-10-23 12:49:48 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Alexandre SPANGARO	d3856d9289	Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy	2018-10-20 06:35:39 +02:00
Frédéric FRANCE	f322c73dd7	Update ajax.lib.php	2018-10-19 22:52:18 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	36ae81c749	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-19 14:17:20 +02:00
Laurent Destailleur	de4ead2558	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/class/accountancycategory.class.php htdocs/core/actions_massactions.inc.php htdocs/product/reassort.php	2018-10-19 14:16:53 +02:00
atm-greg	f0849aaf81	schedule as a tab	2018-10-18 17:16:38 +02:00
Alexandre SPANGARO	a5ebcff2ee	Fix lettering function	2018-10-16 22:27:34 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Laurent Destailleur	c8607a74bf	Load websitepage	2018-10-16 01:39:04 +02:00
Laurent Destailleur	568197656f	Fix canonical of home	2018-10-15 21:43:01 +02:00
Laurent Destailleur	c246ef38c0	Fix canonical	2018-10-15 21:42:43 +02:00
Laurent Destailleur	96ddebad4a	Set canonical tag	2018-10-15 17:48:39 +02:00
Laurent Destailleur	ac143b28ae	Work on multilang	2018-10-14 20:54:28 +02:00
Laurent Destailleur	45860b2494	Work on multilang	2018-10-14 20:04:25 +02:00
Laurent Destailleur	fabc11191d	Merge pull request #9739 from frederic34/patch-11 fix size of $head when replacing by hook	2018-10-14 16:27:14 +02:00
Frédéric FRANCE	65c69c4564	fix standard prepare_head	2018-10-14 10:57:27 +02:00
Frédéric FRANCE	787658ac98	reduce complexity of payments.lib.php	2018-10-14 10:56:03 +02:00
Frédéric FRANCE	70a98743e8	Update functions.lib.php	2018-10-14 10:48:06 +02:00
Frédéric FRANCE	1f1a614b47	Update import.lib.php	2018-10-14 10:21:06 +02:00
Frédéric FRANCE	0f8ac57c85	remove var_dump	2018-10-12 22:34:23 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
Laurent Destailleur	88ff7241f5	FIX Quick hack to solve pb of bad definition of public holidays	2018-10-11 13:12:36 +02:00
Laurent Destailleur	e1e1599a6d	FIX shared link ko on proposals	2018-10-11 11:59:14 +02:00
Laurent Destailleur	ced4038443	FIX qty not visible for a lot when making shipment on a dedicated stock	2018-10-11 11:56:52 +02:00
Laurent Destailleur	8f4b74733c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php	2018-10-10 01:51:54 +02:00
Laurent Destailleur	2539f0047f	FIX Sending of reminder for expired subscriptions	2018-10-09 23:10:39 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
atm-quentin	6a8092dfae	NEW entete reception card	2018-10-05 16:21:50 +02:00
Laurent Destailleur	5437c2ae85	Fix popup on img_picto	2018-10-05 14:32:19 +02:00
Laurent Destailleur	4e84ed0e80	FIX Symbol of currency in substitution variables	2018-10-05 13:59:46 +02:00
Laurent Destailleur	d1ad5dd4f1	FIX Symbol of currency in substitution variables	2018-10-05 13:58:38 +02:00
florian HENRY	cba4676032	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161	2018-10-05 10:36:03 +02:00
florian HENRY	68c99d01a7	OMG!!!! var_dump....	2018-10-05 10:35:32 +02:00
Laurent Destailleur	ac86eac508	Merge pull request #9675 from atm-ph/fix_7.0_dom_error Fix minor error in dom	2018-10-04 18:32:52 +02:00
Laurent Destailleur	31916c94f0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-04 17:57:20 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	13759ea146	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2018-10-04 17:53:40 +02:00
Laurent Destailleur	3060647212	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/pdf.lib.php	2018-10-04 17:50:19 +02:00
Laurent Destailleur	8690d65479	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/pdf.lib.php	2018-10-04 17:47:22 +02:00
Laurent Destailleur	1c735ea6d5	Merge pull request #9673 from atm-florian/dev_resource NEW : add event tab on resource card	2018-10-04 17:45:01 +02:00
Laurent Destailleur	2aca9cb394	Update company.lib.php	2018-10-04 17:44:47 +02:00
atm-quentin	00f532c436	validation modèle de données	2018-10-04 09:50:39 +02:00
florian HENRY	e95921eb93	better test	2018-10-04 09:47:04 +02:00
florian HENRY	7f4f27ebfe	indent	2018-10-04 09:45:12 +02:00
florian HENRY	292dab192b	FIX : #9161	2018-10-04 09:42:11 +02:00
atm-ph	2acd69033c	Fix minor error in dom	2018-10-03 22:48:29 +02:00
florian HENRY	d09bbe4690	NEW : add event tab on resource card	2018-10-03 21:13:02 +02:00
Laurent Destailleur	378013b863	Better select language component	2018-10-03 20:58:45 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
atm-quentin	41d8cb87a3	debut reception setup page	2018-10-03 12:22:41 +02:00
atm-greg	583ea05567	fix missing letter...	2018-10-03 12:13:53 +02:00
gauthier	587766b39b	FIX : wrong function name	2018-10-03 10:38:47 +02:00
Laurent Destailleur	5f897eb7ee	Clean code	2018-10-01 00:40:02 +02:00
Laurent Destailleur	adc36e7d63	Clean code	2018-10-01 00:20:47 +02:00
Laurent Destailleur	851fd4cc18	NEW Can set the default focus of each page. NEW Can set if a field is mandatory on form level.	2018-09-28 00:52:15 +02:00
Laurent Destailleur	a623d80830	Work on mandatory form fields	2018-09-27 16:38:18 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	7b86776f6b	Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression on feature to report vat by rate when rate is zero	2018-09-27 12:42:52 +02:00
Laurent Destailleur	7e58662c6f	Merge branch 'develop' into patch-9	2018-09-27 09:18:42 +02:00
Laurent Destailleur	79ade6a1af	Work on website	2018-09-26 15:20:37 +02:00
Laurent Destailleur	f2d53e80e5	Optimize performance of cron that rotate logs	2018-09-26 01:45:24 +02:00
Laurent Destailleur	eff1d1c89e	Work on website module	2018-09-25 16:35:59 +02:00
Laurent Destailleur	e6be047178	Work on new management for website module	2018-09-25 15:00:37 +02:00
Laurent Destailleur	ba3ca550ce	Fix date in text for substitution. Removed not used translation keys.	2018-09-25 11:36:40 +02:00
Laurent Destailleur	f04b8eea6d	Work on website module	2018-09-24 19:21:21 +02:00
Frédéric FRANCE	86072ad1d7	remove superfluous space	2018-09-24 10:43:57 +02:00
Laurent Destailleur	ad6895aa2e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-24 10:23:09 +02:00
Laurent Destailleur	57e359cd40	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:18:13 +02:00
Laurent Destailleur	1569770855	Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC	2018-09-23 15:41:22 +02:00
gauthier	7b46bedce6	NEW : hidden configuration	2018-09-21 14:35:36 +02:00
Laurent Destailleur	3be13f0cb6	Fix css	2018-09-21 11:45:04 +02:00
Laurent Destailleur	5bd538fb2c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php	2018-09-20 23:43:34 +02:00
Laurent Destailleur	df395847d3	FIX #9567	2018-09-20 19:14:32 +02:00
Laurent Destailleur	12b449fe49	It's easier to select fields to show on list	2018-09-19 16:41:33 +02:00
Philippe GRAND	c3bbe70e2d	fix merge	2018-09-18 16:38:14 +02:00
Laurent Destailleur	4580ed0b09	Fix bad link	2018-09-18 15:31:25 +02:00
Laurent Destailleur	dcc1c855fb	Merge pull request #9542 from frederic34/patch-24 reduce complexity of company lib	2018-09-18 14:58:17 +02:00
Laurent Destailleur	e07ce644e8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/admin.lib.php htdocs/langs/en_US/admin.lang	2018-09-18 11:49:35 +02:00
Philippe GRAND	72f906683f	Standardize and update code	2018-09-18 11:02:18 +02:00
Laurent Destailleur	2d8eb034e3	FIX Maxi debug to allow to load chart of account with multicompany	2018-09-17 21:02:07 +02:00
Frédéric FRANCE	aec1f779ff	reduce complexity of company lib	2018-09-16 21:40:28 +02:00
Laurent Destailleur	eeb919dcda	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 14:24:13 +02:00
Laurent Destailleur	055a0b2859	Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0	2018-09-16 13:29:13 +02:00
Laurent Destailleur	79b15b81f2	Fix list of tasks on time consumed	2018-09-16 13:28:37 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	d06785e91a	Fix responsive	2018-09-16 12:48:36 +02:00
Laurent Destailleur	eebd329c7c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modAgenda.class.php htdocs/core/modules/modFacture.class.php htdocs/langs/en_US/admin.lang htdocs/langs/en_US/main.lang htdocs/stripe/transaction.php	2018-09-16 09:50:13 +02:00
Philippe GRAND	18f4755a90	Standardize and update code	2018-09-14 10:20:21 +02:00
gauthier	b68523b9c1	FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product	2018-09-13 14:37:12 +02:00
Laurent Destailleur	ca85356b45	Merge pull request #9427 from frederic34/patch-6 deprecate Form::select_date	2018-09-12 22:07:23 +02:00
Laurent Destailleur	b4264ee0a0	Use font awesome for sort image	2018-09-12 21:57:32 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	c5e30b61c0	Fix translation	2018-09-12 21:25:14 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	6c17edd1d1	remove superfluous space	2018-09-12 18:23:58 +02:00
Laurent Destailleur	81f4bae159	Merge pull request #9461 from grandoc/new_branch_11_09_2018 New branch 11 09 2018	2018-09-12 18:15:03 +02:00
Laurent Destailleur	10becd2046	Merge pull request #9483 from ptibogxiv/patch-54 New donation module	2018-09-12 17:34:21 +02:00
Laurent Destailleur	bdcbc71ce9	Merge pull request #9443 from frederic34/patch-10 Completely comment unused code	2018-09-12 17:28:29 +02:00
Philippe GRAND	69bf43f851	Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018	2018-09-12 14:48:50 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Laurent Destailleur	53da80a79f	FIX Missing translation in predefined email to membership renewal	2018-09-12 12:55:10 +02:00
Philippe GRAND	05772f5327	Standardize and update code	2018-09-11 17:30:43 +02:00
Philippe GRAND	b4cbb0561d	Standardize and update code	2018-09-11 10:36:39 +02:00
Laurent Destailleur	016bc6851b	Fix generation of tpl	2018-09-10 23:37:51 +02:00
Laurent Destailleur	b0be1ddadb	Fix files generated	2018-09-10 23:20:31 +02:00
Laurent Destailleur	d2c6c7ddff	Fix import	2018-09-10 22:58:34 +02:00
Frédéric FRANCE	b7179fd500	fix phpcs	2018-09-09 14:47:33 +02:00
Laurent Destailleur	5719a38ea7	Work on website module. Support now links to company logos.	2018-09-09 14:05:23 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Laurent Destailleur	700e3b9748	Standardize code for modulepart=mycompany like others modulepart.	2018-09-09 12:53:30 +02:00
Laurent Destailleur	d9eeb43118	FIX translation no visible for access forbidden	2018-09-09 11:59:38 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Laurent Destailleur	c2b3b0ce7b	Fix syntax error	2018-09-08 18:28:21 +02:00
Laurent Destailleur	4017a96aef	Debug website	2018-09-08 14:30:27 +02:00
Laurent Destailleur	ba71648c2d	Code comment	2018-09-08 14:10:29 +02:00
Philippe GRAND	e9c2a475bc	fix merge	2018-09-06 19:27:28 +02:00
Laurent Destailleur	2a471df828	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:42:55 +02:00
Laurent Destailleur	ed31eec5ee	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-09-05 20:40:19 +02:00
Laurent Destailleur	dfea391c88	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/pdf.lib.php	2018-09-05 20:39:38 +02:00
ptibogxiv	6e209b550b	add payment link for donation	2018-09-05 17:40:26 +02:00
Philippe GRAND	50a26aaf16	fix merge	2018-09-04 14:33:34 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Laurent Destailleur	252335318f	Update pdf.lib.php	2018-09-04 09:57:01 +02:00
Marc de Lima Lucio	e285b42a18	FIX: PDF address: handle when contact thirdparty different from document thirdparty	2018-09-03 17:57:30 +02:00
Laurent Destailleur	540999faa5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/lib/company.lib.php	2018-09-03 14:06:51 +02:00
Laurent Destailleur	6641a05744	Fix missing class	2018-09-03 11:59:19 +02:00
Philippe GRAND	4fba7cdf45	fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496	2018-09-03 09:45:06 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Laurent Destailleur	ddd6ac296c	Fix missing class	2018-09-02 16:09:40 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Laurent Destailleur	dee9442720	Fix regression	2018-09-01 13:12:09 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Laurent Destailleur	b89202572e	Merge pull request #9342 from ptibogxiv/patch-51 fix multicompany and footer ticket public page	2018-09-01 12:33:55 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Frédéric FRANCE	b015d05f07	function Comment Missing	2018-08-31 22:25:11 +02:00
Frédéric FRANCE	e47059fa36	function Comment Missing	2018-08-31 22:14:09 +02:00
Frédéric FRANCE	5d27318e3b	function Comment Missing	2018-08-31 22:03:12 +02:00
Frédéric FRANCE	df6eccc5dd	function Comment Missing	2018-08-31 22:01:13 +02:00
Frédéric FRANCE	ebcf43ec73	function Comment Missing	2018-08-31 21:39:23 +02:00
Laurent Destailleur	b08971b03b	FIX vat rate code not return by get_product_vat_for_country	2018-08-31 14:52:34 +02:00
Laurent Destailleur	8dc208c961	Fix missing legal ids in source address	2018-08-30 19:19:43 +02:00
Laurent Destailleur	151d84405a	FIX trans on null object	2018-08-30 17:01:49 +02:00
Laurent Destailleur	d14bd829fb	FIX trans on null object	2018-08-30 17:01:22 +02:00
ptibogxiv	de73f1545f	fix multicompany and footer - fix viewimage and multicompany + no login - delete ticket footer for common payment.lib.php footer	2018-08-30 02:42:14 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	74b3e3e814	Fix for compatibility with lines with no prices (some external modules)	2018-08-29 14:50:12 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	6f427cbed3	Merge pull request #9293 from frederic34/patch-25 NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars	2018-08-28 01:42:35 +02:00
Laurent Destailleur	5185d32cc9	Merge pull request #9286 from frederic34/patch-22 Update propal.lib.php	2018-08-28 01:40:58 +02:00
Laurent Destailleur	7a35b560a6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-23 19:51:52 +02:00
Laurent Destailleur	499d93b8c4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.formmail.class.php htdocs/projet/class/task.class.php htdocs/projet/tasks/task.php	2018-08-23 19:50:58 +02:00
Frédéric FRANCE	6abd5d478a	Update functions.lib.php	2018-08-23 17:15:14 +02:00
Frédéric FRANCE	692352e0e4	Update propal.lib.php	2018-08-22 22:55:12 +02:00
Laurent Destailleur	cd09052e80	FIX badge on time spent on project and tasks	2018-08-21 14:52:22 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Frédéric FRANCE	391995c09b	Update propal.lib.php	2018-08-18 17:26:42 +02:00
Laurent Destailleur	ab22c9d0de	Work on import	2018-08-16 21:48:16 +02:00
Cédric	fe6779c223	Erreur de syntaxe ( + au lieu de . )	2018-08-16 17:20:38 +02:00
Laurent Destailleur	f7da76e1c0	Use session cache for stats	2018-08-16 14:24:59 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Laurent Destailleur	37ca3ff230	Fix separator	2018-08-14 20:51:24 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	6954ab00f9	Update functions.lib.php	2018-08-12 18:11:27 +02:00
Frédéric FRANCE	79aaddbb66	test phpcs v3	2018-08-09 14:46:00 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
John BOTELLA	3036c94198	Add new situation retained warranty field	2018-08-07 15:18:42 +02:00
ATM-Nicolas	70adfb135d	FIX : Missing behavior	2018-08-03 09:51:29 +02:00
Laurent Destailleur	e106fda5e6	Merge pull request #9113 from torvista/export-import Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359	2018-08-02 18:38:46 +02:00
Laurent Destailleur	0e3473701a	Update bank.lib.php	2018-08-02 18:38:33 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
ATM-Nicolas	b9a44fc76b	FIX : Wrong position of firstname lastname	2018-07-31 12:15:18 +02:00
Laurent Destailleur	7af42c66cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php	2018-07-27 12:54:45 +02:00
Laurent Destailleur	83ae27d122	FIX Deletion of files in migration	2018-07-27 12:33:36 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Philippe GRAND	7d5464cfbc	Clean and update code	2018-07-25 15:25:23 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
Laurent Destailleur	a1bdc6022d	Website module	2018-07-24 01:10:38 +02:00
Laurent Destailleur	174394c476	Work on website module	2018-07-23 14:08:20 +02:00
Frédéric FRANCE	d582f72bd9	__NEXT_MONTH __PREVIOUS_MONTH give day instead month	2018-07-22 17:27:02 +02:00
Laurent Destailleur	c4e207e8b7	Fix dol_string_onlythesehtmltags	2018-07-22 15:51:19 +02:00
Laurent Destailleur	2c7029850a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php htdocs/website/index.php	2018-07-21 20:28:26 +02:00
Laurent Destailleur	8247bb683c	Debug website module	2018-07-19 21:35:21 +02:00
Laurent Destailleur	445db58966	FIX website in inline edit mode	2018-07-19 16:06:48 +02:00
Laurent Destailleur	e362a0e9df	FIX website in inline edit mode	2018-07-19 16:06:06 +02:00
Laurent Destailleur	efa5cdeab1	More complete list of allowed html tags	2018-07-19 15:24:48 +02:00
Laurent Destailleur	26507ee712	Code comment	2018-07-17 14:02:08 +02:00
Laurent Destailleur	7fcec5f6c3	Fix duplicate tab "contact" on thirdparty	2018-07-17 13:54:13 +02:00
Laurent Destailleur	8249179fb8	Fix duplicate tab "contact" on thirdparty	2018-07-17 13:50:26 +02:00
Laurent Destailleur	d4a5491753	Fix duplicate tab "contact" on thirdparty	2018-07-17 13:48:08 +02:00
Steve	9d3a0442c0	dolibarr-develop, php 7.2.7 On third party, add bank account. After spanish account has been added, on summary screen ..../htdocs/societe/paymentmodes.php a correct account number causes the error: Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359 This is `$sum += $values[$i] * substr($InumCta, $i, 1);` Since substr returns a string it cannot be summed (I assume). I changed it to `$sum += $values[$i] * (int)substr($InumCta, $i, 1)`	2018-07-16 17:10:33 +02:00
Laurent Destailleur	e5f2fbf8db	Fix trans	2018-07-16 15:21:29 +02:00
Laurent Destailleur	41605ed4a7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-07-16 11:29:47 +02:00
Laurent Destailleur	c477ca8266	Fix scrutinizer	2018-07-16 11:25:21 +02:00
Laurent Destailleur	e3d9e609d5	Fix var not defined	2018-07-16 11:20:54 +02:00
Laurent Destailleur	d3cc2c81eb	Better detail for time elapsed	2018-07-16 11:14:39 +02:00
Laurent Destailleur	1e42db0641	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-15 20:16:54 +02:00
Laurent Destailleur	bff4ed8103	Merge pull request #9098 from atm-florian/develop fix list of event of thirdparty and unformize code	2018-07-15 20:10:19 +02:00
Laurent Destailleur	a5442033ac	Code comment	2018-07-15 20:09:51 +02:00
Laurent Destailleur	ba36d1aef0	Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes fix sql error functions.lib.php	2018-07-15 20:00:54 +02:00
Laurent Destailleur	0ca9f6f522	Update functions.lib.php	2018-07-15 20:00:43 +02:00
florian HENRY	09fe2f83fa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2018-07-12 18:27:22 +02:00
florian HENRY	1fa13fc747	fix list of event unformize code	2018-07-12 18:27:09 +02:00
ias-ceo	076bf0a3a7	fix sql error	2018-07-12 05:09:36 +03:00
Laurent Destailleur	4c65f4d498	Log	2018-07-11 09:38:40 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Laurent Destailleur	44626a3a48	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/lib/functions.lib.php	2018-07-10 13:57:24 +02:00
Laurent Destailleur	aeb5f5e4f3	Fix phpcs	2018-07-10 13:56:03 +02:00
Laurent Destailleur	a55abb4da7	Fix version	2018-07-10 13:54:20 +02:00
Laurent Destailleur	b6180fcb58	Fix fetch index in ecm when using multicompany	2018-07-10 12:00:09 +02:00
Laurent Destailleur	8e0a663b7c	Code comment	2018-07-10 10:53:59 +02:00
Laurent Destailleur	f5d9403c7d	Fix permission to see HR tab on user. All HR on same tabs.	2018-07-09 15:38:00 +02:00
Laurent Destailleur	e427496ddf	FIX Injection	2018-07-09 14:13:01 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +02:00
Laurent Destailleur	3a593f88f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/upgrade2.php	2018-07-05 10:28:24 +02:00
Laurent Destailleur	5883899bc7	Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-07-05 02:33:39 +02:00
Laurent Destailleur	91b7ee5fc2	NEW Add function isValidMXRecord	2018-07-04 11:07:28 +02:00
Laurent Destailleur	e1e813b895	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:26 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Regis Houssin	df718cca5c	Fix: better sql request with multicompany transverse mode	2018-07-02 10:09:56 +02:00
BENKE Charlene	43c5d7abdc	add holliday_admin_prepare_head sorry eldy i forget it	2018-07-01 17:33:35 +02:00
Regis Houssin	80adac12c0	Fix: use object entity ID instead current entity	2018-07-01 16:01:30 +02:00
Laurent Destailleur	d8c7c61951	Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into hregis-8.0_canvas # Conflicts: # htdocs/product/canvas/product/tpl/list.tpl.php	2018-06-30 18:29:08 +02:00
Laurent Destailleur	ee2d543781	Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist NEW support selllist in the module builder	2018-06-30 15:33:17 +02:00
Regis Houssin	f998f64db0	Works on use new list engine instead template for canvas Conflicts: htdocs/product/list.php	2018-06-30 10:52:26 +02:00
Laurent Destailleur	3112244529	Merge pull request #8884 from defrance/patch-117 New : fichinter models (like factureRec)	2018-06-30 01:19:03 +02:00
Laurent Destailleur	b1d94af439	Merge pull request #8931 from ruistrecht-alt/MAIN_DOCUMENTS_DESCRIPTION_FIRST NEW Add hidden option MAIN_DOCUMENTS_DESCRIPTION_FIRST	2018-06-29 20:04:24 +02:00
Laurent Destailleur	9eaca045e4	Fix default message with online payment link must be hidden when no online payment mode exists.	2018-06-27 11:34:40 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	9f77ea0ece	Code comment	2018-06-25 17:05:15 +02:00
Laurent Destailleur	06342ff80c	FIX contextpage on contact list	2018-06-23 12:06:17 +02:00
Laurent Destailleur	4dcc74d08f	Fix the "back to list" link also restore the contextpage	2018-06-23 11:55:04 +02:00
Laurent Destailleur	533c19cc2c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/customer/list.php htdocs/core/lib/functions.lib.php	2018-06-22 15:29:26 +02:00
Laurent Destailleur	a3b9d4f01b	Fix tooltip on subsidiary list	2018-06-20 22:02:36 +02:00
Regis Houssin	8fc2f7441c	Fix: to avoid deleting line breaks	2018-06-20 09:06:16 +02:00
Laurent Destailleur	63fb82931c	Update functions.lib.php	2018-06-18 10:41:11 +02:00
Laurent Destailleur	186f08e67b	Fix preview of PDF for supplier objects	2018-06-16 15:08:13 +02:00
altatof	5d6cd381b9	Fix <br/> detection	2018-06-15 15:59:14 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	1d7d16649a	Code comment	2018-06-11 12:31:26 +02:00
Laurent Destailleur	f0446d2a3b	Fix for content editable sites	2018-06-11 10:25:22 +02:00
Laurent Destailleur	557db7661c	Fix for content editable sites	2018-06-11 10:19:42 +02:00
Laurent Destailleur	8142a672a7	PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3	2018-06-07 21:12:30 +02:00
Rui Strecht	083acb1af5	Added MAIN_DOCUMENTS_DESCRIPTION_FIRST option to allow desc to appear before product/service label in documents	2018-06-07 16:24:45 +01:00
Laurent Destailleur	d10c9cf565	FIX dir for modules must not have s at end (fix contracts into contract)	2018-06-06 23:47:48 +02:00
Laurent Destailleur	bb97119233	Fix duplicate function name	2018-06-06 18:07:32 +02:00
Laurent Destailleur	30b04c0d3d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:16:32 +02:00
Laurent Destailleur	4c21ad4e4e	FIX: dol_delete_file must work in a context without db handler loaded Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:12:14 +02:00
Laurent Destailleur	1671c8b6cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-05 18:06:30 +02:00
Laurent Destailleur	9c32e49bd3	FIX: dol_delete_file must work in a context without db handler loaded	2018-06-05 18:05:33 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Laurent Destailleur	d8d4d15b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 12:13:40 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	02da9b6992	FIX #8893 to get formatted price as substitution vars	2018-05-30 11:04:44 +02:00
BENKE Charlene	4a7ac774f7	introduce fichinter rec models	2018-05-28 16:38:11 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
patrick Delcroix	ef37fccef4	Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist	2018-05-26 23:43:17 +02:00
patrick Delcroix	adda3144bc	Fix Show double(x,y) fields	2018-05-26 23:39:36 +02:00
Laurent Destailleur	75b6dc6f61	Update modulebuilder.lib.php	2018-05-25 12:23:39 +02:00
Laurent Destailleur	8303dc1e6f	Merge pull request #8815 from atm-florian/develop_fixproject NEW: add filter on project task list	2018-05-25 10:56:10 +02:00
Laurent Destailleur	c56ef86bc3	Update project.lib.php	2018-05-25 10:50:16 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
delcroix Patrick	c85d216f8e	Merge branch 'develop' into patch-modulebuilder-supportsellist	2018-05-22 22:24:20 +02:00
patrick Delcroix	2ccaf1ad95	New: support sellist in modulebuilder	2018-05-22 22:00:20 +02:00
Laurent Destailleur	1b20ec05d1	Save translation	2018-05-21 19:37:47 +02:00
florian HENRY	dd946dd197	add ressource	2018-05-21 11:03:48 +02:00
florian HENRY	f5c245cd19	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject	2018-05-21 10:59:10 +02:00
florian HENRY	986b4f78ba	fix eldy comment	2018-05-18 13:54:07 +02:00
florian HENRY	a27c263747	NEW: add filter on project task list	2018-05-18 10:33:32 +02:00
Laurent Destailleur	e503aeb2e5	Merge pull request #8787 from aspangaro/8.0-a24 Update module assets	2018-05-18 09:05:46 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Alexandre SPANGARO	9c6f92986e	Upgrade works	2018-05-11 21:48:22 +02:00
Laurent Destailleur	63b9384ef6	No transmormation of data objectid before calling trigger	2018-05-10 12:34:23 +02:00
Laurent Destailleur	2fb5de6136	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-10 12:30:14 +02:00
Laurent Destailleur	c094a6c43e	Reorder permissions	2018-05-10 12:29:58 +02:00
Laurent Destailleur	fddd628f08	Merge pull request #8764 from hregis/develop_email NEW add pdf function to check if pdf file is protected/encrypted	2018-05-10 12:08:58 +02:00
Laurent Destailleur	9077f18dd6	Update security.lib.php	2018-05-10 11:37:22 +02:00
Laurent Destailleur	8837193545	Merge branch 'develop' into permissions_hook	2018-05-10 11:36:08 +02:00
Laurent Destailleur	bc9eaaab84	Update security.lib.php	2018-05-10 11:34:20 +02:00
Laurent Destailleur	7be804dcf5	Update security.lib.php	2018-05-10 11:32:08 +02:00
Laurent Destailleur	0891766a3e	Update security.lib.php	2018-05-10 11:31:27 +02:00
Laurent Destailleur	ea4c48047a	All new hooks must be addreplace hooks	2018-05-10 11:30:27 +02:00
Regis Houssin	415b7425fd	NEW add pdf function to check if pdf file is protected/encrypted	2018-05-08 09:45:10 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
altatof	a8ecce9e6d	add hook for more permissions control	2018-05-05 14:31:17 +02:00
Laurent Destailleur	5cff4c152b	Add tab "time spent" in project view. Can swith gantt/list.	2018-05-04 11:25:21 +02:00
Laurent Destailleur	08cf034e2f	FIX to allow IRPF not null even if main VAT is null. From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/	2018-05-03 13:39:44 +02:00
Laurent Destailleur	124abd39b6	Code comment	2018-05-01 20:31:57 +02:00
Laurent Destailleur	dc9892f803	Fix bad log	2018-05-01 20:17:03 +02:00
Laurent Destailleur	3cad7c6998	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-01 12:51:46 +02:00
Laurent Destailleur	4eb4cf6506	Merge pull request #8693 from Librethic/fix-api-product-check-perm FIX : missing english name for object	2018-05-01 10:19:27 +02:00
Laurent Destailleur	55f982e504	Removed deprecated FPDI option and reorganise PDF setup page	2018-04-30 09:28:24 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	e72c2e6a11	Enhance sorting of field for lists on field with several sort criterias	2018-04-28 19:54:41 +02:00
Laurent Destailleur	94d6e178f7	Work on vat report code rewrite	2018-04-28 16:06:46 +02:00
jfefe	7cedf55c27	FIX : missing english name for object 'product' is used by API to check perms and return a 401 error even if user has correct permissions	2018-04-27 20:54:48 +02:00
Laurent Destailleur	257dc1cf77	Work on rewriting VAT reports	2018-04-27 19:17:34 +02:00
Laurent Destailleur	19d15c79dd	Merge pull request #8673 from frederic34/variantonservice NEW Module variant supported on services	2018-04-27 10:01:28 +02:00
Laurent Destailleur	3faeb08b78	Merge pull request #8672 from ATM-Nicolas/fix_action_contact FIX : Related contact printed in societe agenda	2018-04-27 10:00:18 +02:00
Laurent Destailleur	1d40d34123	Merge pull request #8669 from tomours/develop Fix french bank holidays (Easter related)	2018-04-27 09:56:01 +02:00
Laurent Destailleur	42722da824	Update date.lib.php	2018-04-27 09:55:44 +02:00
Laurent Destailleur	dde86628e7	Update date.lib.php	2018-04-27 09:49:52 +02:00
Laurent Destailleur	e1cfe0e2dd	Update date.lib.php	2018-04-27 09:49:15 +02:00
Laurent Destailleur	59e5545aa7	Fix phpunit	2018-04-27 09:18:25 +02:00
Laurent Destailleur	69db960a92	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/activity/perweek.php	2018-04-26 18:33:02 +02:00
Laurent Destailleur	d988585f86	Save spaces in timesheet report page	2018-04-26 11:07:20 +02:00
Laurent Destailleur	6b2bd93469	NEW Add dol_is_link function	2018-04-25 17:59:05 +02:00
Laurent Destailleur	39aef07c6b	FIX Only voters can send comments in public survey page	2018-04-25 17:14:18 +02:00
Laurent Destailleur	83b762b681	FIX CVE-2018-9019	2018-04-25 16:01:06 +02:00
Laurent Destailleur	75a4891113	Add az09comma to sanitize sortfield/sortorder	2018-04-25 15:47:42 +02:00
Frédéric FRANCE	5f4e2dc565	variant on services	2018-04-24 11:01:17 +02:00
ATM-Nicolas	736c56705b	FIX : Related contact printed in societe agenda	2018-04-24 10:02:26 +02:00
Thomas OURSEL	4fd0ab3f31	Merge remote-tracking branch 'upstream/develop' into develop	2018-04-23 15:57:09 +02:00
Thomas OURSEL	f402753fa3	Fix french holidays (Easter related)	2018-04-23 15:14:34 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	0358e0f29f	Debug ticketsup	2018-04-19 15:11:26 +02:00
Laurent Destailleur	fc167612c2	NEW class reposition can also work on POST (not only GET)	2018-04-19 13:59:20 +02:00
Laurent Destailleur	4472234637	Can set email in dol_print_error_email	2018-04-19 12:12:54 +02:00
Laurent Destailleur	d8e05c90f7	Can set email in dol_print_error_email	2018-04-19 12:12:19 +02:00
Laurent Destailleur	0f16ccbc4a	Enhance dol_encode/dol_decode function	2018-04-19 12:03:42 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	a0f8aa50d5	CSS	2018-04-18 00:00:37 +02:00
Laurent Destailleur	4dadfac74b	Debug usage of the new extrafield architecture	2018-04-17 14:34:17 +02:00
Laurent Destailleur	7b53ec5198	FIX timestamp must be an int not a float	2018-04-17 12:41:13 +02:00
Laurent Destailleur	c3970f1a52	Code comment	2018-04-17 09:44:57 +02:00
Laurent Destailleur	1e0a660d24	More font awesome picto instead of img	2018-04-16 19:57:46 +02:00
Laurent Destailleur	f19abe38d7	FIX pdf thumb for expense report	2018-04-16 18:17:35 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	72de21537c	Clean code	2018-04-15 20:09:09 +02:00
Laurent Destailleur	6450f95c90	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-15 19:13:38 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	57c03553dd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/functions.lib.php	2018-04-15 12:09:07 +02:00
Laurent Destailleur	13ba69e085	Merge pull request #8595 from hregis/develop_ldap Fix: broken $pdf object !	2018-04-15 11:38:51 +02:00
Laurent Destailleur	da66e5c5a7	Update pdf.lib.php	2018-04-15 11:38:29 +02:00
Laurent Destailleur	37e4da30d0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-04-15 11:33:27 +02:00
Laurent Destailleur	ffffd848a9	Look and feel v8	2018-04-14 22:34:46 +02:00
Laurent Destailleur	77b686500c	css	2018-04-14 21:07:20 +02:00
Regis Houssin	fb4765c472	Fix clean code	2018-04-14 15:24:52 +02:00
Regis Houssin	732f019fb2	Fix: json format in llx_const	2018-04-14 15:17:51 +02:00
Regis Houssin	25a87507b9	NEW add new parameters for tcpf encryption	2018-04-14 15:12:51 +02:00
Juanjo Menent	bfed1b9db1	FIX: some localtaxes errors	2018-04-14 12:45:40 +02:00
Regis Houssin	d97c052d08	Fix: broken $pdf object !	2018-04-14 10:41:38 +02:00
Laurent Destailleur	c25e21de4b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-13 23:19:22 +02:00
Laurent Destailleur	ecfabc6633	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-04-13 23:18:39 +02:00
Laurent Destailleur	a0e243a29b	Clean code	2018-04-13 23:11:19 +02:00
Laurent Destailleur	93ea46c58c	Merge branch 'develop' into develop-ecmfiles	2018-04-13 23:08:26 +02:00
Laurent Destailleur	374a0723bf	Fix VAT report by rate	2018-04-13 22:20:14 +02:00
Regis Houssin	556a418132	Fix: best method	2018-04-13 19:30:11 +02:00
Regis Houssin	199bf4c044	Fix: avoid focus problem when select2 is in a modal dialog window	2018-04-13 17:10:07 +02:00
fappels	e054d1ae8d	Try to fix travis	2018-04-13 16:49:03 +02:00
Laurent Destailleur	4251748aca	Clean code	2018-04-13 16:18:33 +02:00

... 20 21 22 23 24 ...

6349 Commits