Commit Graph

190 Commits

Author SHA1 Message Date
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074 Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
2765cee005 CSS 2019-04-09 19:36:56 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Laurent Destailleur
b23f74eab1 FIX Status of opportunity should never be -1 2019-04-08 12:17:57 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
2019-04-04 17:45:02 +02:00
Laurent Destailleur
fa95f5575c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/list.php
2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
23ce97fb2d NEW Introduce css "nobottomiftotal" 2019-03-19 16:01:03 +01:00
Frédéric FRANCE
ec956e1c72 replace html code by html5 in project 2019-02-23 22:24:26 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +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
Philippe GRAND
af36883d72 update with html5 compliant code 2019-01-21 10:04:43 +01:00
Laurent Destailleur
83efdee7d3 Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
a9a191819f Work on billing time spent 2018-12-06 21:25:28 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +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
8a89da25c6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php
2018-11-08 20:18:13 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
7c5ceff569 Fix search on project 2018-09-07 15:01:34 +02:00
Philippe GRAND
57f51fda3e Standardize 2018-08-15 12:48:13 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
90b2314d98 Code comment 2018-06-20 21:24:57 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Frédéric FRANCE
622c394283 loadlangs 2018-05-26 21:11:25 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not
visible.
2018-04-24 11:37:57 +02:00
Ferran Marcet
6ced1a3264 New: Add same parameters on 'printFieldListTitle' hooks 2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00