Commit Graph

64188 Commits

Author SHA1 Message Date
Laurent Destailleur
bee64962fe Fix css 2018-01-27 19:40:11 +01:00
Laurent Destailleur
ba0a96c882 Missing param limit 2018-01-26 15:37:23 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Laurent Destailleur
3239187f6b Prepare 7.0 2018-01-26 13:14:30 +01:00
Laurent Destailleur
d4e15545b4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2018-01-26 12:10:13 +01:00
Laurent Destailleur
1834be79a0 Fix supplier suggested when creating order from project overview 2018-01-26 11:31:34 +01:00
Laurent Destailleur
5b917c039e Prepare 6.0.6 2018-01-26 11:08:08 +01:00
Laurent Destailleur
82c2079d40 Fix var not initialized 2018-01-26 10:23:24 +01:00
Laurent Destailleur
d751f9153f Fix look and feel v7 2018-01-26 10:21:53 +01:00
Laurent Destailleur
1be42a7af8 Fix comment 2018-01-26 02:23:26 +01:00
Laurent Destailleur
b298cec7d3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:42:09 +01:00
Laurent Destailleur
92cace6747 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-26 01:40:55 +01:00
Laurent Destailleur
40b63be4b9 Fix package 2018-01-26 01:40:32 +01:00
Laurent Destailleur
47d0b6583e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-01-26 01:40:04 +01:00
Laurent Destailleur
c0e719e3d8 Fix package scripts 2018-01-26 01:39:42 +01:00
Laurent Destailleur
4f9f1b51d7 Fix translation 2018-01-26 01:34:49 +01:00
Laurent Destailleur
e79f6fda2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:23:18 +01:00
Laurent Destailleur
d3c0414b4f Update changelog 2018-01-26 01:16:36 +01:00
Laurent Destailleur
2c0eeaf8de FIX #8093 2018-01-25 20:57:51 +01:00
Laurent Destailleur
c922498e79 Code comment 2018-01-25 20:35:25 +01:00
Laurent Destailleur
cff1dc6827 Rename 2018-01-25 17:57:49 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Laurent Destailleur
59c907260b Export of unalterablelog must contains init hash 2018-01-25 13:18:52 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year.
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
005bccc63d Fix missing badge of nb of permissions 2018-01-25 12:06:22 +01:00
Laurent Destailleur
e3b8eede26 Update licence tag 2018-01-24 20:59:40 +01:00
Laurent Destailleur
f66ac935c8 Fix migration for files from modules 2018-01-24 20:00:27 +01:00
Laurent Destailleur
18ed53b9a7 Fix css 2018-01-24 18:04:06 +01:00
Laurent Destailleur
60c1a1e745 Code comment on accesskey 2018-01-24 17:29:29 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
f3b89d9d39 Add missing trans 2018-01-24 14:47:52 +01:00
Laurent Destailleur
9cdb7f0f27 Code comment 2018-01-24 14:37:26 +01:00
Laurent Destailleur
e45d35dcb1 Fix code comment 2018-01-24 14:22:11 +01:00
Laurent Destailleur
fbeb66fedd Fix refreshing of captcha broken if a cache-control set by server 2018-01-24 13:40:39 +01:00
Laurent Destailleur
6e906ac0e3 Clean code 2018-01-24 13:08:09 +01:00
Laurent Destailleur
64f6e9e5c0 CSS 2018-01-24 12:23:52 +01:00
Laurent Destailleur
3a4ca8ae2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:49:36 +01:00
Laurent Destailleur
1da7b154c1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-24 11:48:31 +01:00
Laurent Destailleur
54fb59d8db Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/compta/paiement.php
2018-01-24 11:45:43 +01:00
Laurent Destailleur
af2efaf137 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:44:01 +01:00
Laurent Destailleur
561f273900 Minor fix for smartphone 2018-01-24 11:43:34 +01:00
Laurent Destailleur
e66b266432
Merge pull request #8090 from atm-arnaud/FIX_sepa_mail_encode
FIX email sent was not in HTML
2018-01-24 11:17:16 +01:00
Laurent Destailleur
f339719ae9
Merge pull request #8088 from atm-john/fix_sql_check_margin
Fix SQL error when multiple entities are used
2018-01-24 11:16:00 +01:00
Laurent Destailleur
ccb415c8b3
Merge pull request #8087 from frederic34/patch-2
Update bills.lang
2018-01-24 11:15:25 +01:00
Laurent Destailleur
adb70e0456
Merge pull request #8086 from atm-ph/fix_5.0_align_payment_total
Fix each total isn't aligned on payment card
2018-01-24 11:14:43 +01:00
Laurent Destailleur
fd48ce11f9
Merge pull request #8085 from Darkjeff/Fixing-Lettering
Fixing lettering
2018-01-24 11:14:19 +01:00
arnaud
c0481be8d8 FIX subject mail sepa 2018-01-23 17:01:03 +01:00
arnaud
19c616756a FIX email sent was not in HTML 2018-01-23 12:14:22 +01:00
John
f2ae3ee41d Fix get entity if multiple 2018-01-23 09:49:21 +01:00
Laurent Destailleur
f1b63d7cbf Fix css 2018-01-23 09:00:03 +01:00