6147 Commits

Author	SHA1	Message	Date
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	75b875ae55	Fix origin currency not visible in absolute discount view	2019-02-18 17:38:15 +01:00
Laurent Destailleur	7a79637b88	Merge pull request #10616 from frederic34/patch-27 ... Update pertype.php	2019-02-15 15:31:03 +01:00
Frédéric FRANCE	c7cec4be34	Update peruser.php	2019-02-14 21:45:40 +01:00
Frédéric FRANCE	b65532c5d8	Update pertype.php	2019-02-14 21:43:46 +01:00
Frédéric FRANCE	7886b5900c	Update card.php	2019-02-14 20:40:03 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
ptibogxiv	1771ea8eaa	Update api_proposals.class.php	2019-02-14 00:27:53 +01:00
ptibogxiv	56a0a20bb3	Fix delete contact	2019-02-14 00:27:29 +01:00
Laurent Destailleur	b9467c10bf	Merge pull request #10561 from eoxia-jimmy/develop ... NEW: API Proposal, Orders, Invoices: Add contact details	2019-02-13 16:39:57 +01:00
Laurent Destailleur	c2ab85aaf8	Update api_proposals.class.php	2019-02-13 16:39:17 +01:00
Frédéric FRANCE	95212e9cc1	Update ical.class.php	2019-02-13 00:44:34 +01:00
Frédéric FRANCE	3de192364b	Update ical.class.php	2019-02-13 00:12:20 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +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	88fb491441	Fix note output	2019-02-06 00:40:07 +01:00
Laurent Destailleur	58e6cfd635	Fix popup content	2019-02-06 00:36:11 +01:00
Philippe GRAND	577aef54e1	update with html5 compliant code	2019-02-04 10:37:51 +01:00
Philippe GRAND	1154f9a048	update with html5 compliant code	2019-02-04 10:35:53 +01:00
Philippe GRAND	eb25d12a1b	update with html5 compliant code	2019-02-04 10:32:33 +01:00
Philippe GRAND	7c8d84aa03	update with html5 compliant code	2019-02-04 10:27:26 +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	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	72f78ecf3b	FIX #10460 compatibility with MariaDB 10.4	2019-02-03 20:02:05 +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	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	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
Philippe GRAND	1501ce2c9f	update with html5 compliant code	2019-01-31 13:34:32 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	869159c09f	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:39 +01:00
Laurent Destailleur	1a292839ca	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:18 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +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	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	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	f96d730943	Merge pull request #10391 from grandoc/new_branch_22_01_2019 ... update with html5 compliant code	2019-01-26 14:09:15 +01:00