428 Commits

Author	SHA1	Message	Date
Philippe GRAND	d86d7323fb	Update code	2018-09-01 22:46:35 +02:00
Philippe GRAND	091b8269a6	fix conflict	2018-09-01 22:42:42 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Philippe Grand	df4a4aa6c9	Merge branch 'develop' into develop	2018-09-01 17:23:43 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	0dc812cf10	precise label comment	2018-09-01 13:02:27 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 ... New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	7973489f8a	fix display comment issue	2018-08-31 17:18:08 +02:00
Philippe Grand	5ec22d9fad	Update accountingaccount.class.php	2018-08-30 14:25:25 +02:00
Philippe Grand	e96e3bdf42	Update accountancycategory.class.php	2018-08-30 14:19:21 +02:00
Philippe GRAND	ba6a48360e	Standardize and update code	2018-08-30 12:26:59 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Philippe GRAND	b29721df61	Fix white spaces	2018-08-29 12:17:59 +02:00
Philippe GRAND	79988282af	Fix white spaces	2018-08-29 12:14:07 +02:00
Frédéric FRANCE	846778657f	fix syntax error	2018-08-29 11:44:26 +02:00
Philippe Grand	df05eb785b	Update accountingjournal.class.php	2018-08-28 10:38:42 +02:00
Philippe Grand	34ea3d479f	Update accountingaccount.class.php	2018-08-28 10:38:01 +02:00
Philippe Grand	c352bbbd18	Update accountancycategory.class.php	2018-08-28 10:37:16 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	3309badd8d	Update accountingaccount.class.php	2018-08-22 22:43:17 +02:00
Philippe Grand	ec8422af73	Update accountingaccount.class.php	2018-08-22 22:31:54 +02:00
Philippe Grand	25b1b08d92	Update accountancysystem.class.php	2018-08-22 22:30:09 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00