Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
26177489c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:46:39 +02:00
Laurent Destailleur
25d1a2a1d8 Restore missing png file 2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3 Update logo 2020-05-25 13:32:57 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
0409ec00d7 CSS 2020-05-25 13:01:32 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb Fix logo 2020-05-25 12:50:54 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
laurantines
962d795740
Update list.php
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 12:26:05 +02:00
laurantines
52ee3a7056
Merge pull request #1 from Dolibarr/develop
PULL
2020-05-25 12:19:46 +02:00
Laurent Destailleur
384e1e31ad Fix Popup 2020-05-25 11:30:57 +02:00
Laurent Destailleur
c67eeeaf6c CSS 2020-05-25 11:30:52 +02:00
Laurent Destailleur
a44f0d24eb Fix Popup 2020-05-25 11:06:16 +02:00
Laurent Destailleur
61545703d1 CSS 2020-05-25 10:58:18 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
47465f4108 Fix for situation invoice (exclude credit not when searching last
invoice to use)
2020-05-25 00:20:00 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Laurent Destailleur
6158e41822 CSS 2020-05-24 23:44:04 +02:00
Laurent Destailleur
aee6fce9f8 Fix remove bad use 2020-05-24 20:04:26 +02:00
andreubisquerra
d60bcb871f
Fix travis 2020-05-24 18:24:41 +02:00
Laurent Destailleur
84ec747109 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 18:04:26 +02:00
Laurent Destailleur
7a17bbacb9 Can force lang during import 2020-05-24 18:04:08 +02:00
andreubisquerra
957c40e072
Fix travis 2020-05-24 18:03:07 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
andreubisquerra
3632111705
Fix travis 2020-05-24 17:29:35 +02:00
andreubisquerra
c80989d74f
phone.php improvements 2020-05-24 16:31:22 +02:00
andreubisquerra
221e8d8ce1
invoice.php improvements 2020-05-24 16:30:42 +02:00
andreubisquerra
26ee0d1949
genimg improvements 2020-05-24 16:29:42 +02:00
Laurent Destailleur
65708ec360 Fix responsive 2020-05-24 15:07:57 +02:00
Laurent Destailleur
75fc8b9adf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 12:11:53 +02:00
Laurent Destailleur
e2f0f0d71d Add exclude id 2020-05-24 12:11:39 +02:00
Francis Appels
4eb50ac339 Merge remote-tracking branch 'Dolibarr/12.0' into 12 2020-05-24 11:05:18 +02:00
Laurent Destailleur
dacb326c15 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 01:10:41 +02:00
Laurent Destailleur
509ce9f571 CSS 2020-05-24 01:09:45 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
4cb0ffeb1f Fix css 2020-05-24 01:04:56 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
2020-05-24 01:02:08 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
02d5359749 Fix transifex sync 2020-05-23 23:30:52 +02:00
Laurent Destailleur
c843da5272 Sync transifex 2020-05-23 22:29:45 +02:00
Laurent Destailleur
3dca55661c Fix Add unit test to avoid the big % instead of comon % char. 2020-05-23 22:01:17 +02:00
Frédéric FRANCE
67b8ab13c9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 21:45:18 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-23 21:44:14 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule 2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
024e62a582 Fix navigation 2020-05-23 20:27:25 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
2020-05-23 20:20:53 +02:00
Laurent Destailleur
fe6453194e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-23 20:18:17 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
2020-05-23 20:18:10 +02:00