5264 Commits

Author	SHA1	Message	Date
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	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
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