6872 Commits

Author	SHA1	Message	Date
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
Frédéric FRANCE	8c23b41f9a	autoloader for egulias lib needed by swiftmailer	2019-03-02 14:32:52 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +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	7606c73fd5	Merge pull request #10704 from iouston/patch-1 ... NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT	2019-02-28 11:18:12 +01:00
Laurent Destailleur	c240c66789	Update html.formfile.class.php	2019-02-28 11:17:43 +01:00
Frédéric FRANCE	cc1ee2d883	add visibility	2019-02-27 23:55:18 +01:00
wdammak	8e8c68345a	phpcs simplification	2019-02-27 21:41:55 +01:00
Frédéric FRANCE	9b165f6b3f	add visibility	2019-02-27 20:45:07 +01:00
Laurent Destailleur	b3fb0eaf5b	Merge branch 'develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 15:48:31 +01:00
Laurent Destailleur	3bffa69f1d	Remove deprecated code	2019-02-27 15:23:56 +01:00
Laurent Destailleur	836eff1233	Merge pull request #10698 from wdammak/patch-32 ... Add parent establishment	2019-02-27 13:34:50 +01:00
Laurent Destailleur	f2dc687202	Update html.formfile.class.php	2019-02-27 13:26:37 +01:00
iouston	d1716babef	disable the auto renaming on upload ... add a global variable for disable the auto renaming on upload file corresponds to the request of this post : https://www.dolibarr.fr/forum/12-howto--aide/55094-fichiers-joints-decocher-la-case-sauver-sous#107392	2019-02-27 11:17:33 +01:00
atm-quentin	7f68750ec9	FIX blank space travis	2019-02-27 09:23:15 +01:00
atm-quentin	f51b89def3	NEW supplier buyprice barcode	2019-02-27 09:22:34 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
wdammak	64bd995978	Fix camelCase syntax and remove disabling of phpcs	2019-02-27 04:02:11 +01:00
Laurent Destailleur	401f587868	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_project.php	2019-02-27 02:27:33 +01:00
Laurent Destailleur	cbaa57b1e2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-27 02:25:42 +01:00
Laurent Destailleur	86e2ffe323	Merge pull request #10390 from glu000/8.0 ... Fix #10278	2019-02-27 02:24:55 +01:00
Laurent Destailleur	238894a7e4	Merge pull request #10624 from frederic34/patch-2 ... selectMulticurrency avoid malformed empty value	2019-02-27 02:06:24 +01:00
Laurent Destailleur	7618a7348f	Merge branch 'develop' into 10.0_accountancy2	2019-02-27 01:51:01 +01:00
Laurent Destailleur	6373e1db84	Merge branch 'develop' into 10.0_linkedin	2019-02-27 01:16:21 +01:00
Laurent Destailleur	94166c505b	Merge pull request #10690 from frederic34/patch-3 ... Update extrafields.class.php	2019-02-27 01:15:13 +01:00
Frédéric FRANCE	d608921f1e	add visibility	2019-02-26 23:15:28 +01:00
Frédéric FRANCE	242bf0ba49	Update html.formticket.class.php	2019-02-26 22:56:50 +01:00
Frédéric FRANCE	8b4e920d5e	add visibility	2019-02-26 22:42:19 +01:00
Frédéric FRANCE	81f2f99db5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-26 21:16:01 +01:00
wdammak	99fb702833	Add Select Establishment	2019-02-26 18:42:05 +01:00
Laurent Destailleur	3a2a1b4a56	Debug module ticket	2019-02-26 13:43:09 +01:00
Laurent Destailleur	5bcce53e40	Fix preselection when key is '0'	2019-02-26 12:20:22 +01:00
Laurent Destailleur	e0c7c32fae	Fix preselection when key is '0'	2019-02-26 11:44:44 +01:00
Laurent Destailleur	528bfca690	Fix preselection when key is '0'	2019-02-26 11:44:16 +01:00
Frédéric FRANCE	915841eeb9	wip	2019-02-25 22:50:19 +01:00
Frédéric FRANCE	c89e4d79b8	wip	2019-02-25 22:27:04 +01:00
Frédéric FRANCE	1e6ed94c5e	Update extrafields.class.php ... The property $errno was declared of type integer, but $this->db->lasterrno() is of type string	2019-02-25 21:39:45 +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
Laurent Destailleur	2eb48a6046	Merge pull request #10673 from frederic34/patch-3 ... Update extrafields.class.php	2019-02-24 20:43:44 +01:00
Laurent Destailleur	52bcef38fc	Merge pull request #10672 from frederic34/patch-1 ... Update html.formfile.class.php	2019-02-24 20:39:32 +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
Frédéric FRANCE	03714e4bed	Update extrafields.class.php	2019-02-24 09:17:45 +01:00
Frédéric FRANCE	042c6cc56e	Update html.formfile.class.php	2019-02-24 08:50:35 +01:00
Frédéric FRANCE	c7df326a91	replace html code by html5	2019-02-23 22:31:57 +01:00
Frédéric FRANCE	9dd58cf9ce	Update html.formfile.class.php	2019-02-23 16:52:26 +01:00
Laurent Destailleur	114cd5fa30	Merge pull request #10646 from grandoc/new_branch_21_02_2019 ... fix : When comparing two booleans, it is generally considered safer t…	2019-02-23 14:19:22 +01:00
Laurent Destailleur	50da34e26b	Merge pull request #10660 from frederic34/patch-22 ... Update html.formmail.class.php	2019-02-23 14:09:54 +01:00
Laurent Destailleur	fa45d2c5a9	Merge pull request #10657 from frederic34/patch-17 ... doc comment html.formfile.class.php	2019-02-23 14:09:42 +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
Frédéric FRANCE	b75519fefe	Update html.formmail.class.php	2019-02-23 11:25:49 +01:00
Frédéric FRANCE	f7c0044e60	doc comment	2019-02-23 09:33:21 +01:00
Laurent Destailleur	5a18588bb7	CSS	2019-02-21 22:27:56 +01:00
Laurent Destailleur	2891758c23	FIX Stock visibility for service when option stock on service is on ... NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO	2019-02-21 20:13:03 +01:00
Philippe GRAND	54da44b506	Translation	2019-02-21 19:50:03 +01:00
Laurent Destailleur	4296f959ca	Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION ... Reorganize levels of menu accountancy	2019-02-20 04:55:35 +01:00
Philippe GRAND	047ec90d78	update with html5 compliant code	2019-02-19 17:38:14 +01:00
Laurent Destailleur	163db3d132	Code comment	2019-02-18 19:41:23 +01:00
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	ad7b8371da	FIX Mark credit note as available for credit note in other currency ... Conflicts: htdocs/compta/paiement.php htdocs/core/class/discount.class.php	2019-02-18 18:30:15 +01:00
Laurent Destailleur	07d1559802	FIX Mark credit note as available for credit note in other currency	2019-02-18 18:27:06 +01:00
Alexandre SPANGARO	49a975beb3	Update works	2019-02-18 07:14:21 +01:00
Frédéric FRANCE	b017213131	selectMulticurrency avoid malformed empty value	2019-02-17 20:59:39 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
Laurent Destailleur	67c8ab47ea	Merge branch 'develop' into patch-21	2019-02-14 13:27:46 +01:00
Laurent Destailleur	518d42e309	Merge pull request #10572 from aspangaro/10.0_subledger ... NEW: Add employee/user to subledger account list	2019-02-14 13:24:59 +01:00
Laurent Destailleur	3050366372	Fix table of units already exists. Merge duplicate c_measuring_units ... with c_units.	2019-02-14 13:02:44 +01:00
Frédéric FRANCE	b18927a6c1	Update cunits.class.php	2019-02-13 23:13:48 +01:00
Laurent Destailleur	2311912d8a	Merge branch 'develop' into dev_importproduct_measuringunit	2019-02-13 16:35:46 +01:00
Laurent Destailleur	534eac1a54	Merge pull request #10566 from frederic34/patch-17 ... Update rssparser.class.php	2019-02-13 16:24:45 +01:00
Laurent Destailleur	ced386fdca	Fix phpcs	2019-02-13 11:32:00 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
Alexandre SPANGARO	4c8ee6950b	NEW: Add employee/user to subledger account list ... With ACCOUNTANCY_COMBO_FOR_AUX	2019-02-13 09:41:44 +01:00
florian HENRY	5c059c897d	fix travis (mosty for dev no conerne by my changes)	2019-02-13 09:21:14 +01:00
Frédéric FRANCE	fa31f95356	Update rssparser.class.php	2019-02-12 23:31:21 +01:00
florian HENRY	eba4be2335	ad missing files	2019-02-12 17:03:47 +01:00
Laurent Destailleur	205152501e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/public/payment/newpayment.php	2019-02-12 13:39:39 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Laurent Destailleur	f42d07d6da	Merge pull request #10529 from frederic34/patch-2 ... desactivate button on click to avoid multiple clicks	2019-02-12 13:12:30 +01:00
Laurent Destailleur	f0e56abac7	NEW Module ticket is available as a stable module	2019-02-11 19:16:37 +01:00
Laurent Destailleur	c095f802dd	Dolibarrize module ticket	2019-02-11 14:51:59 +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	2d4ccec309	Fix document generation of modulebuilder	2019-02-09 14:12:36 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Laurent Destailleur	5483856543	Fix phpcs	2019-02-08 23:53:40 +01:00
Laurent Destailleur	e2934a6b5f	Error message returned by old non "addreplace" hooks is propagated too	2019-02-08 19:38:52 +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
Frédéric FRANCE	f548a0ed79	desactivate button on click to avoid multiple clicks	2019-02-08 11:01:47 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
Laurent Destailleur	7334f02e5c	Merge pull request #10514 from atm-florian/dev_defautselectcustomertype ... Dev defautselectcustomertype	2019-02-08 09:56:29 +01:00
florian HENRY	6ee5a9e2a6	fix travis	2019-02-07 12:21:33 +01:00
florian HENRY	3f20cae6d3	NEW: setup default thridparty type (customer or prospect/customer)	2019-02-06 10:54:11 +01:00
florian HENRY	95cc9faf7e	fix php warning	2019-02-06 09:01:24 +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	410b291ad8	Fix quote not closed	2019-02-03 20:52:39 +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	326996d392	Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound ... psr2 end file new line none found	2019-02-03 19:04:28 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +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
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +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	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
Laurent Destailleur	ae81bbac93	Better var name	2019-02-01 13:49:07 +01:00
Laurent Destailleur	b14a16a119	Code comment	2019-02-01 13:48:09 +01:00
Laurent Destailleur	849b3b640b	Code comment	2019-02-01 13:41:23 +01:00
Frédéric FRANCE	f83ee43a19	Merge branch 'develop' into nospaceaftercomma	2019-01-30 22:15:22 +01:00
Laurent Destailleur	c1f3f4c2b5	Fix: text for empty line not visible in select	2019-01-30 20:03:04 +01:00
Laurent Destailleur	200d30f2b9	Fix: text for empty line not visible in select	2019-01-30 20:01:55 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +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
Laurent Destailleur	3198f9fbbe	Merge pull request #10441 from aspangaro/10.0_email ... Move my email to the new one	2019-01-30 14:59:58 +01:00
Laurent Destailleur	3d218cadb7	FIX last_main_doc var not saved ... Conflicts: htdocs/core/class/commonobject.class.php	2019-01-29 19:03:45 +01:00
Laurent Destailleur	9ef93bceca	FIX last_main_doc var not saved	2019-01-29 18:40:47 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +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	b4400b95db	Merge pull request #10411 from BitKFu/develop ... Added new calculation fields for the doc generator	2019-01-26 14:17:43 +01:00
Laurent Destailleur	c989b8d102	Update commondocgenerator.class.php	2019-01-26 14:17:01 +01:00
Laurent Destailleur	59e993e834	Code comment	2019-01-25 12:03:07 +01:00
Gerhard Stephan	a78e406e76	Added new calculation fields for the doc generator ... - object_total_up : Sum of all lines (subprice * qty) - object_total_up_locale : Localized sum of all lines (subprice * qty) - object_total_discount : Total discount in percent - object_total_discount_locale : Localized total discount in percent - line_total_up : Total sum of a line (subprice * qty) - line_total_up_locale : Localized Total sum of a line (subprice * qty)	2019-01-24 21:08:13 +01:00
Laurent Destailleur	f9686c47af	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/fr_FR/members.lang htdocs/langs/fr_FR/stocks.lang htdocs/website/index.php	2019-01-23 19:22:42 +01:00
Laurent Destailleur	e33f102dc2	FIX Edit of virtualhost	2019-01-23 14:57:43 +01:00
Laurent Destailleur	8fba387673	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-22 10:39:18 +01:00
Laurent Destailleur	3cca0df28e	Support getFormatedCustomerRef into contract list	2019-01-22 10:39:06 +01:00
Günter Lukas	1cf786acff	Fix #10278 ... Fix #10278	2019-01-22 00:09:36 +01:00
Laurent Destailleur	eba8a8f34d	Merge pull request #10376 from atm-maxime/fix_extrafields_computed ... Compute value of computed extrafield on fetch, not on show	2019-01-21 23:41:06 +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
Laurent Destailleur	8950720fb5	NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods	2019-01-21 15:22:35 +01:00
Maxime Kohlhaas	23438b1f48	Compute extrafields after having set all others	2019-01-21 14:40:33 +01:00
Maxime Kohlhaas	f50de03585	Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed	2019-01-21 14:36:23 +01:00
Maxime Kohlhaas	a2f5c72b54	Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed	2019-01-21 14:33:25 +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	844643c37d	Merge pull request #10375 from grandoc/new_branch_19_01_2019 ... update with html5 compliant code	2019-01-20 19:48:32 +01:00
Maxime Kohlhaas	c0b0d5484c	Compute value of computed extrafield on fetch, not on show	2019-01-19 17:14:56 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime ... Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	29fdad144d	update with html5 compliant code	2019-01-19 12:40:17 +01:00
wdammak	aaa61254ac	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:36:09 +01:00
wdammak	191900d258	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:35:16 +01:00
wdammak	13e7d18291	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:33:56 +01:00
wdammak	9f60c208ca	Update stats.class.php ... Fix div/0 warnings	2019-01-18 22:25:51 +01:00
Laurent Destailleur	d6b0f852c5	Work on invoicing time spent	2019-01-15 21:01:01 +01:00
Laurent Destailleur	f8ca44e42c	NEW Preview of images into the filemanager component	2019-01-15 15:48:28 +01:00
Frédéric FRANCE	cf55b54cf5	correct list of links	2019-01-14 10:02:48 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
Laurent Destailleur	acc665a9f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php	2019-01-08 14:16:23 +01:00
Laurent Destailleur	1ee0d42408	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 14:08:22 +01:00
Laurent Destailleur	9a6c3ac3df	FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-08 14:05:07 +01:00
Laurent Destailleur	3d4879c538	Code comment	2019-01-06 05:16:50 +01:00
Laurent Destailleur	6e078105ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2019-01-06 01:22:10 +01:00
Laurent Destailleur	c9e6074551	Code clean	2019-01-05 15:14:06 +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	dbbfdd984a	Fix emailcollector can't be used without syntax rules	2019-01-03 11:47:27 +01:00
Laurent Destailleur	8b380489f2	Update commonobject.class.php ... Conflicts: htdocs/core/class/commonobject.class.php	2019-01-02 19:55:51 +01:00
Laurent Destailleur	85d60b93d6	Update commonobject.class.php	2019-01-02 19:53:59 +01:00
Günter Lukas	2857447aee	Update commonobject.class.php	2018-12-30 00:20:38 +01:00
ldestailleur	7b91c14cb3	FIX sql error when resetting payment mode / term	2018-12-28 23:14:41 +01:00
ldestailleur	c0eef25b31	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:14:36 +01:00
ldestailleur	2fef2b633a	FIX sql error when resetting payment mode / term	2018-12-28 23:13:39 +01:00
ldestailleur	8ad06463e0	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:06:04 +01:00
Laurent Destailleur	64de31ef67	Clean log	2018-12-27 06:09:27 +01:00
Laurent Destailleur	deba3249f8	FIX Bad trigger name	2018-12-27 06:09:03 +01:00
Laurent Destailleur	8ab2ef0cf0	Add log	2018-12-27 06:08:48 +01:00
Laurent Destailleur	fb813fcfb1	Clean log	2018-12-27 06:06:32 +01:00
Laurent Destailleur	88ad059f25	FIX Bad trigger name	2018-12-27 06:04:55 +01:00
Laurent Destailleur	0ffefd71f3	Add log	2018-12-27 05:58:27 +01:00
Laurent Destailleur	eda3a5bc8c	FIX Init of email topic when using a template	2018-12-27 05:18:16 +01:00
Laurent Destailleur	0f76279a03	FIX Missing token and style	2018-12-27 03:46:14 +01:00
Laurent Destailleur	791b2f485a	FIX Missing token and style	2018-12-27 03:45:30 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Laurent Destailleur	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +01:00
Laurent Destailleur	6557dcfb81	CSS	2018-12-23 00:49:26 +01:00
Laurent Destailleur	da3d1ab8b8	CSS	2018-12-23 00:24:10 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	94ee18a20a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-22 19:00:15 +01:00
Laurent Destailleur	8d39edf430	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/price.php	2018-12-22 18:59:49 +01:00
Laurent Destailleur	a5dccd1cc3	Enable by default the test on anti CSRF token	2018-12-22 18:09:26 +01:00
Laurent Destailleur	6c54ea925b	Add token into confirm link so we will be able to check we accept the ... confirmation on interface for critical actions	2018-12-22 17:42:33 +01:00
Laurent Destailleur	91f63f025b	Add rolling token into confirm url	2018-12-22 17:34:57 +01:00
Laurent Destailleur	33564ddafc	Fix css	2018-12-22 16:45:57 +01:00
Laurent Destailleur	7d1b48815d	Fix css	2018-12-22 11:57:23 +01:00
Regis Houssin	9b215e117a	FIX check if "entity" is already defined in "$param"	2018-12-21 11:23:44 +01:00
Laurent Destailleur	86502d881a	Merge pull request #10253 from grandoc/new_branch_18_12_2018 ... fix align issue	2018-12-19 13:02:25 +01:00
Laurent Destailleur	2978522006	Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change ... FIX: contact/address tab issue when changing company	2018-12-19 12:59:32 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Laurent Destailleur	4b6ae9d424	FIX Error reported when creation of thirdparty from member fails ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php	2018-12-18 21:32:41 +01:00
Laurent Destailleur	f2318716ec	FIX Error reported when creation of thirdparty from member fails	2018-12-18 21:27:16 +01:00
Philippe GRAND	7b84825d2b	fix align issue	2018-12-18 17:30:24 +01:00
Marc de Lima Lucio	7e2eca661b	FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account	2018-12-18 09:40:58 +01:00
Laurent Destailleur	e80e366fb1	Merge pull request #10187 from AlainRnet/patch-6 ... Update vcard.class.php	2018-12-15 15:59:34 +01:00
Laurent Destailleur	eb66d45947	Merge branch 'develop' into 10.0_accoutancy_stats	2018-12-15 15:17:15 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	0cbc0fa0fc	Fix shortkey	2018-12-14 19:33:43 +01:00
Laurent Destailleur	32f51838ec	Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys ... NEW: Improve Displaying Access Keys in Navigation	2018-12-14 19:29:50 +01:00
Laurent Destailleur	d5bbb3033c	Update html.form.class.php	2018-12-14 19:29:15 +01:00
Laurent Destailleur	f9c06cdb82	FIX #9498 #10132	2018-12-14 19:04:17 +01:00
Laurent Destailleur	59bc15377d	CSS	2018-12-14 18:58:55 +01:00
Laurent Destailleur	0ac287c356	Merge pull request #10046 from frederic34/htmlformmail ... reduce complexity of htmlformmail class	2018-12-14 17:37:34 +01:00
Laurent Destailleur	bd7df9869f	Update html.formmail.class.php	2018-12-14 17:37:08 +01:00
Laurent Destailleur	4dc32dafaa	Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook ... NEW Add afterSelectContactOptions hook	2018-12-14 17:35:16 +01:00
Laurent Destailleur	89909ebab0	Update html.form.class.php	2018-12-14 17:32:41 +01:00
Laurent Destailleur	9fb672d51b	Merge pull request #10127 from atm-florian/develop_scrunitizer ... fix scrunitizer	2018-12-14 17:28:34 +01:00
Laurent Destailleur	7665c368a2	Merge branch 'develop' into allow_ajax_search_on_product_desc	2018-12-14 17:24:52 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	59e38d4a81	Merge pull request #9897 from Vaadasch/develop ... NEW Update working chkbxlst filter for lists	2018-12-14 15:33:50 +01:00
altatof	d5bf9691ee	allow product ajax search on description	2018-12-14 15:10:32 +01:00
Laurent Destailleur	dc4a122697	Merge pull request #10224 from fmarcet/develop ... Qual: Better management of select type of lines	2018-12-14 11:06:33 +01:00
Laurent Destailleur	8c9f81807f	Merge pull request #9702 from bafbes/abb80027 ... New : Link to create new element on linked fields	2018-12-14 11:01:39 +01:00
Laurent Destailleur	42de7da334	Update commonobject.class.php	2018-12-14 11:01:27 +01:00
Laurent Destailleur	9bb3382002	Merge pull request #9534 from wdammak/patch-16 ... Add the ability to sort products by category	2018-12-14 10:02:08 +01:00
Laurent Destailleur	e1baf3ab2b	Update html.form.class.php	2018-12-14 10:01:12 +01:00
Laurent Destailleur	5d5add641b	Fix scrutinizer	2018-12-14 09:58:23 +01:00
Laurent Destailleur	4fc2cefce3	Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report ... NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'	2018-12-13 20:53:32 +01:00
Laurent Destailleur	3484b50511	Update html.form.class.php	2018-12-13 20:51:45 +01:00
Laurent Destailleur	7a3ab13196	FIX #10183 using backport of fix done in 9.0	2018-12-13 20:45:51 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	860492a19f	Merge pull request #10201 from joseplluis/patch-3 ... Fix: add ID property to select objects	2018-12-13 20:03:46 +01:00
Ferran Marcet	555698a3af	Qual: Better management of select type of lines	2018-12-13 10:36:30 +01:00
Philippe GRAND	58175b76f2	to avoid html issue	2018-12-12 12:17:28 +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	b35a9c0e64	FIX Edition of menu fails (mainmenu required for top menu)	2018-12-10 17:50:58 +01:00
Laurent Destailleur	af5b63954a	Clean code	2018-12-10 12:49:20 +01:00
Laurent Destailleur	3f912ebfff	FIX restore security event login/logout	2018-12-10 11:19:52 +01:00
Laurent Destailleur	cd3716ff9f	Dolibarize module ticket	2018-12-08 16:37:41 +01:00
Josep Lluís	1c9ccc1442	Fix: add ID property to select objects ... Add ID property to select objects I.e: id="select_'.$htmlname.'"	2018-12-07 17:28:31 +01:00
aljawaid	292dd5290a	Amend Add Access Keys in Navigation Tooltips ... - Fix travis	2018-12-07 12:39:20 +00:00
AlainRnet	d8c600636c	Update vcard.class.php ... update from vcard 2.1 to vcard 3.0	2018-12-06 00:26:54 +01:00
IJ	8bd2efe648	NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT' ... - Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off	2018-12-05 12:36:46 +00:00
Laurent Destailleur	d9bb39970f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/barcode.php	2018-12-04 13:20:40 +01:00
Laurent Destailleur	5061a9b0c2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/install/mysql/tables/llx_paiementfourn.sql	2018-12-04 13:17:25 +01:00
Alexandre SPANGARO	3b8dd71816	Remove public $db	2018-12-03 21:25:44 +01:00
Alexandre SPANGARO	0c6f6b80cb	Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats	2018-12-03 21:16:53 +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	07425e4e19	Merge pull request #10156 from grandoc/7.0_bug ... FIX #3234	2018-12-02 17:06:06 +01:00
Alexandre SPANGARO	7eee155439	Correct documentation	2018-12-02 14:07:38 +01:00
IJ	30e84f8f2c	Amend Add Access Keys in Navigation Tooltips ... - based on suggested code by @eldy - Added `classfortooltip` for better display	2018-12-02 10:29:04 +00:00
Alexandre SPANGARO	088c002ed1	NEW: Add stats on entries & movements by fiscal year	2018-12-02 11:01:11 +01:00
Philippe GRAND	8ec2bac36a	FIX #3234	2018-12-02 10:02:05 +01:00
Maxime Kohlhaas	ad05b531e7	Fix display user photo with new path	2018-12-02 00:02:43 +01:00
Maxime Kohlhaas	09b967bb1b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo	2018-12-01 23:39:28 +01:00
Maxime Kohlhaas	5e2f3a53c9	Fix expense report in ecm auto dir	2018-12-01 19:39:00 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
Laurent Destailleur	cb9ada2119	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/class/html.formmail.class.php htdocs/core/modules/modSociete.class.php htdocs/product/price.php	2018-12-01 18:19:45 +01:00
Maxime Kohlhaas	8c13c87429	Fix path for user photo	2018-12-01 16:55:42 +01:00
Inovea Conseil	18281d9d43	FIX #6580 ... FIX #6580	2018-12-01 16:48:50 +01:00
Maxime Kohlhaas	748dd12e4d	Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model ... FIX : Select first mail model by default	2018-12-01 16:39:22 +01:00
florian HENRY	faf7ea345f	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 15:23:46 +01:00
florian HENRY	dacc959937	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 15:18:51 +01:00
ATM John BOTELLA	c6f4879575	Fix issue from scrutinizer	2018-12-01 12:04:34 +01:00
Laurent Destailleur	c5bd11951f	Fix bar not visible on some screen	2018-11-29 02:09:07 +01:00
Marc de Lima Lucio	c13cc5d697	FIX: form actions: select_type_actions could be too small + bad init	2018-11-28 15:46:27 +01:00
Laurent Destailleur	780a538fe0	Fix multicompany not accessible from website.	2018-11-27 17:37:39 +01:00
IJ	825f41bfda	Add Access Keys in Navigation Tooltips	2018-11-27 00:22:21 +00:00
Laurent Destailleur	f0ab6e60ec	FIX Loading translation of cron tasks	2018-11-26 13:31:05 +01:00
Laurent Destailleur	82b4b3ccb3	Merge pull request #10047 from frederic34/patch-9 ... doc cmail class	2018-11-24 11:20:49 +01:00
wdammak	5c9d5bb6ad	order by category	2018-11-23 21:30:34 +01:00
wdammak	5c3daf4a6a	order by category	2018-11-23 21:27:22 +01:00
wdammak	064816242a	Order by category	2018-11-23 21:26:10 +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	b6dac7da20	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-21 15:40:15 +01:00
Frédéric FRANCE	4e60e48f34	Update CMailFile.class.php	2018-11-19 23:43:58 +01:00
Frédéric FRANCE	2179e2011e	doc cmail class	2018-11-19 23:38:07 +01:00
Frédéric FRANCE	32706f570d	reduce complexity of htmlformmail class	2018-11-19 21:19:39 +01:00
Laurent Destailleur	e020597ba7	Fix deletion for class build with modulebuilder	2018-11-19 21:11:26 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +01:00
Laurent Destailleur	25ee999d27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:32 +01:00
Laurent Destailleur	8191df4857	Merge pull request #9962 from atm-john/fix_extrafield_view ... FIX hidden extrafield	2018-11-19 18:37:18 +01:00
Laurent Destailleur	8535844737	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:27:00 +01:00
Laurent Destailleur	1931fd33eb	Merge pull request #10041 from atm-ph/fix_8.0_optional_param ... Fix new params has been added not optional	2018-11-19 18:26:21 +01:00
Laurent Destailleur	4bedeabc5b	FIX #10036	2018-11-19 18:02:29 +01:00
François J	37f3b8bbde	Update @since version to 9.0	2018-11-19 17:51:00 +01:00
François J	6aaf0f4655	Add afterSelectOptions hook & selectcontacts context	2018-11-19 17:40:16 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
atm-ph	129034ba76	Fix new params has been added not optional	2018-11-19 15:46:30 +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
Frédéric FRANCE	30b1db34cd	Update CMailFile.class.php	2018-11-17 11:33:01 +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
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Laurent Destailleur	f3228dc4f8	Merge pull request #10010 from atm-john/Fix_cat_photo_upload ... Fix event message on upload category picture fail	2018-11-15 16:43:59 +01:00
Laurent Destailleur	3ca45e0e40	Fix double dot in sql filename	2018-11-15 10:59:55 +01:00