Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
ac8837d01f
Fix url
2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e
Remove google+
2019-10-05 19:27:14 +02:00
Laurent Destailleur
3e5cd877b8
FIX Bad list of ticket on public interface for ticket emailcollector
2019-10-05 14:27:42 +02:00
Laurent Destailleur
e90234c2bc
FIX escape email alias
2019-10-05 14:27:37 +02:00
Laurent Destailleur
7c685bc76f
FIX Bad list of ticket on public interface for ticket emailcollector
2019-10-05 14:25:20 +02:00
Laurent Destailleur
c36d49a8c3
FIX escape email alias
2019-10-05 14:15:14 +02:00
Laurent Destailleur
b053663fe6
Look and feel v11
2019-10-05 13:13:11 +02:00
Laurent Destailleur
083db12490
FIX access to public interface when origin email has an alias.
2019-10-05 11:53:08 +02:00
Laurent Destailleur
031c5523d4
NEW Add link to the public interface on the ticket card.
2019-10-05 11:52:30 +02:00
Laurent Destailleur
5c11a0d6cd
FIX access to public interface when origin email has an alias.
2019-10-05 11:52:02 +02:00
Laurent Destailleur
a06b1b9f3f
Fix escaping chars
2019-10-05 11:43:28 +02:00
Laurent Destailleur
827b1fe5d2
Use small image instead of mini for preview on document list
2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca
FIX Attachement of linked files on ticket when sending a message
2019-10-04 19:41:35 +02:00
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
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