[FIX] point_of_sale: set journal as pos payment method on setting journal in the payment methods of a pos config when none is set.
[FIX] auth_ldap: avoid to try twice the authentication to the ldap server

See #1982
Merge remote-tracking branch 'odoo/7.0' into 7.0