5483 Commits

Author	SHA1	Message	Date
Laurent Destailleur	e6e18ff616	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/product/stock/card.php htdocs/product/stock/info.php htdocs/product/stock/movement_list.php	2019-02-14 15:33:17 +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
Laurent Destailleur	fbfb4ce566	FIX creation of new left menu entry	2019-02-14 10:10:31 +01:00
florian HENRY	dd9896516b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/margin/agentMargins.php htdocs/product/stock/movement_card.php htdocs/projet/tasks/time.php htdocs/resource/class/html.formresource.class.php	2019-02-13 12:52:07 +01:00
Laurent Destailleur	5c27ec5d25	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/compta/compta-files.php	2019-02-13 11:21:20 +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
Laurent Destailleur	11f48460b2	Fix	2019-02-12 23:26:25 +01:00
Laurent Destailleur	d86017b8ff	Fix create left menu entry	2019-02-12 23:21:53 +01:00
Laurent Destailleur	639dfa09aa	Fix creation of left menu	2019-02-12 23:17:40 +01:00
Laurent Destailleur	1f9f335e44	FIX creation of menu entry with parent id not int ... Conflicts: htdocs/admin/menus/edit.php	2019-02-12 19:11:05 +01:00
Laurent Destailleur	986fb2ae38	FIX creation of menu entry with parent id not int	2019-02-12 19:09:27 +01:00
florian HENRY	5b5f96bafb	NEW : measuring unit dictionnary and product size/unit import	2019-02-12 16:58:11 +01:00
Laurent Destailleur	843f7bea8d	Merge pull request #10546 from frederic34/patch-20 ... Update index.php	2019-02-12 13:46:33 +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
Frédéric FRANCE	be9cfdae85	Update index.php	2019-02-11 00:05:38 +01:00
Frédéric FRANCE	4d6dcf400e	first parameter of print_liste_field_titre was translated	2019-02-10 17:30:34 +01:00
Frédéric FRANCE	ba32c3b782	first parameter of print_liste_field_titre was translated	2019-02-10 16:06:07 +01:00
Frédéric FRANCE	aecac3632f	wip	2019-02-10 11:08:48 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	7f4bbcf9a5	Some minor fix in default values and modulebuilder	2019-02-09 13:40:22 +01:00
Laurent Destailleur	aa574c2a47	Merge pull request #10517 from frederic34/patch-18 ... fix phpcs	2019-02-08 09:56:50 +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
Frédéric FRANCE	c0686733e8	fix phpcs	2019-02-06 15:56:13 +01:00
Laurent Destailleur	9e28db4202	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/export.php	2019-02-06 00:51:10 +01:00
Laurent Destailleur	44f5223c90	Remove warning	2019-02-05 18:54:38 +01:00
Laurent Destailleur	d49dd8d593	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-05 15:16:44 +01:00
Laurent Destailleur	bb8b3d4e5c	Add br	2019-02-05 00:25:42 +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
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	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Frédéric FRANCE	b2e2b2e186	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-31 18:27:27 +01:00
Philippe GRAND	0cc8053708	update with html5 compliant code	2019-01-31 12:42:38 +01:00
Philippe GRAND	1cda3106b2	update with html5 compliant code	2019-01-31 12:40:50 +01:00
Philippe GRAND	2a9c378c1f	update with html5 compliant code	2019-01-31 12:35:49 +01:00
Philippe GRAND	ff46a0ee30	update with html5 compliant code	2019-01-31 12:33:01 +01:00
Laurent Destailleur	4c31749f4b	Add tooltip on setup	2019-01-31 11:11:56 +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	6d3529b606	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-30 14:47:28 +01:00
Laurent Destailleur	340412ed00	FIX generation of document for supplie rinvoice	2019-01-30 14:07:50 +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	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +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