Commit Graph

79597 Commits

Author SHA1 Message Date
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
520a2652e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:10:21 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +02:00
Laurent Destailleur
114e741975
Merge pull request #12079 from frederic34/patch-17
Update box_factures_imp.php
2019-10-11 15:54:37 +02:00
Laurent Destailleur
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
112a074c82
Merge pull request #12074 from aspangaro/11.0_LDcompta
Update new LDCompta export
2019-10-11 15:53:10 +02:00
Laurent Destailleur
a6fd864145
Merge pull request #12075 from frederic34/patch-13
doxygen
2019-10-11 15:52:11 +02:00
Laurent Destailleur
c6a796d270 Try to fix #12097 2019-10-11 15:45:32 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
Laurent Destailleur
85a4bac9e0 Better translation 2019-10-11 15:22:12 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
c3aba5f1a3 FIX #12083 2019-10-11 14:53:30 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
Laurent Destailleur
c21224ef96 Align code of auguria menu handler with new architecture 2019-10-11 14:24:47 +02:00
Laurent Destailleur
60395f2a9c NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 14:09:26 +02:00
Laurent Destailleur
96dad08db7 Fix option ADD_UNSPLASH_LOGIN_BACKGROUND 2019-10-11 13:51:07 +02:00
Laurent Destailleur
89161910ff NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 13:45:51 +02:00
Laurent Destailleur
9251f04d63 Update thumbs of themes 2019-10-11 13:26:48 +02:00
Laurent Destailleur
992b92978e NEW Use the squarre logo as favicon of pages 2019-10-11 12:38:01 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
Laurent Destailleur
4db57f53f9 typo 2019-10-11 11:39:33 +02:00
Laurent Destailleur
ab8199f71a Fix avoid deletion of file if we still need it 2019-10-11 11:38:49 +02:00
Laurent Destailleur
fc886b9950 css 2019-10-11 11:29:39 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Laurent Destailleur
e7f56b67d8 Look and feel v11 2019-10-10 23:00:33 +02:00
Laurent Destailleur
fce07cf8ca CSS 2019-10-10 22:52:11 +02:00
Laurent Destailleur
5dc6e7d1a0 CSS 2019-10-10 22:45:04 +02:00
Laurent Destailleur
f82f4162c3 NEW Look and fill v11: Introduce CSS "trforbreak" 2019-10-10 22:42:23 +02:00
Laurent Destailleur
3bf6fac505 NEW Can filter on label on invoice in accounting vendor binding pages 2019-10-10 22:05:34 +02:00
Laurent Destailleur
a8676e63c8 CSS 2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33 Fix sort lost after uploading a file 2019-10-10 16:41:24 +02:00
Laurent Destailleur
060452ecf2 Fix link 2019-10-10 15:29:27 +02:00
Laurent Destailleur
3b56cf5e19 Trans 2019-10-10 15:24:26 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986 Fix trans 2019-10-10 15:20:44 +02:00
Laurent Destailleur
015d51c169 NEW Add column of module source and POS terminal in invoice list. 2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Laurent Destailleur
6d2a714d42 Fix dos2unix files 2019-10-10 10:55:29 +02:00
Laurent Destailleur
5d64cec354 Exclude medias from fixdosfiles 2019-10-10 10:52:06 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
28b87f9e27 Add image for members 2019-10-10 10:35:18 +02:00
Frédéric FRANCE
90257dc087
Update box_factures_imp.php 2019-10-10 08:09:39 +02:00
Alexandre SPANGARO
e683cd6f06 Merge remote-tracking branch 'upstream/develop' into 11.0_LDcompta 2019-10-09 20:41:21 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
ec1acf710c Fix missing br 2019-10-09 18:15:59 +02:00
Laurent Destailleur
072a0a26d6 Use a font awesome icon to show "shippable" flag on orders. 2019-10-09 18:07:00 +02:00
Laurent Destailleur
db651a607d Use fontawesome for img_warning 2019-10-09 17:33:46 +02:00