Commit Graph

89109 Commits

Author SHA1 Message Date
stickler-ci
a509404636 Fixing style errors. 2019-10-04 16:26:26 +00:00
Laurent De Coninck
c8fb81710f fix #12041 - Generate password
Secure the generate password method "perso".
Now the system checks the minimum possible value. If the value entered
is lower then the system will never trigger the update.

Since the update is done through GET parameters, I also added a check
backend wise. This checks should never be triggered nor in error.

[see: #12041]
2019-10-04 18:13:00 +02:00
stickler-ci
bc32d684a4 Fixing style errors. 2019-10-04 16:12:33 +00:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Laurent Destailleur
ef15bbee4a Increase delay of hide of popup so we have a chance to click on content 2019-10-04 16:53:58 +02:00
Laurent Destailleur
503973cec9 FIX Edit of ticket module parameters erased others 2019-10-04 14:04:31 +02:00
Laurent Destailleur
c3fa770871 FIX Filter "Open all" of ticket was ko. 2019-10-04 13:06:24 +02:00
Laurent Destailleur
68c28ab3c7 FIX Look and feel v10 2019-10-04 12:31:25 +02:00
altairis
85bbf1decb Merge branch 'develop' into prodstats 2019-10-04 11:05:36 +02:00
altairis
8b8a5e315a fix test error 2019-10-04 10:55:09 +02:00
altairis
55c0913884 Merge branch 'develop' into fourn 2019-10-04 10:51:28 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
VESSILLER
0e23fbc6df NEW add country code in import product model 2019-10-04 10:04:02 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Alfredo Altamirano
140784d741 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6 Add hidden options to send by email for all status 2019-10-03 20:21:13 -05:00
Frédéric FRANCE
55410a55ef
Update list.php 2019-10-04 00:45:57 +02:00
stickler-ci
cb34c7e299 Fixing style errors. 2019-10-03 20:08:42 +00:00
ATM john
a4f71f8b42 Merge branch 'develop_fix_missing_dolgetstatus' of github.com:atm-john/dolibarr into develop_fix_missing_dolgetstatus 2019-10-03 22:07:04 +02:00
ATM john
13e456d992 Fix Project LibStatus langs 2019-10-03 22:05:48 +02:00
stickler-ci
5932f0e6b1 Fixing style errors. 2019-10-03 20:03:23 +00:00
ATM john
35c6008e1a Fix supplier order libStatus to use new dolGetStatus 2019-10-03 21:58:23 +02:00
ATM john
027c8224b0 Fix dolGetStatus unused 2019-10-03 21:34:01 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
ATM john
77f666a236 Fix dolGetStatus param 2019-10-03 21:28:11 +02:00
ATM john
edc4dc3727 Fix project libStatus to use new dolGetStatus 2019-10-03 21:20:07 +02:00
Alexandre SPANGARO
8668e7157a Add bookmark fa-icon 2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f Remove constant MAIN_DISABLE_FONT_AWESOME_5 2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7 Fix Bank Fa-icon 2019-10-03 20:32:15 +02:00
Frédéric FRANCE
ee42cd000e
duration of fichinter rec 2019-10-03 19:07:26 +02:00
Laurent Destailleur
aa484d484d css 2019-10-03 19:02:29 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Laurent Destailleur
457117762a Fix bad br 2019-10-03 18:32:31 +02:00
Laurent Destailleur
ad4aa39ec5
Merge pull request #11986 from atm-john/develop_dropdown_bookmark
NEW :  dropdown bookmark and search
2019-10-03 18:18:31 +02:00
Laurent Destailleur
c223c5635b
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
[#12006] - adds the country in the address of the PDF's footer
2019-10-03 18:15:39 +02:00
Laurent Destailleur
e52b294779
Merge pull request #12012 from frederic34/ficheinter_rec
restore unfinished old commit
2019-10-03 18:10:16 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
2019-10-03 18:08:35 +02:00
Laurent Destailleur
2c91dca882
Merge pull request #12023 from frederic34/cutlonglines
cut long lines
2019-10-03 18:06:35 +02:00
Laurent Destailleur
1f3e250053
Update card.php 2019-10-03 17:58:07 +02:00
Laurent Destailleur
02af9b8fa4
Update card.php 2019-10-03 17:56:55 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Laurent Destailleur
7412335217
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
2019-10-03 17:50:35 +02:00
Laurent Destailleur
74d3850ec8
Merge pull request #12030 from altatof/fckticket
NEW : FCKeditor setup for tickets
2019-10-03 17:49:59 +02:00
Laurent Destailleur
b3e2163903
Merge pull request #12014 from andreubisquerra/develop
Price with tax when manual modify price in TakePOS
2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d Show ref of product on mouse hover thumbs 2019-10-03 17:40:59 +02:00
Frédéric FRANCE
e443538f71
wip 2019-10-03 17:23:50 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00