Commit Graph

57572 Commits

Author SHA1 Message Date
Laurent Destailleur
cd2f655333 Merge pull request #6440 from GPCsolutions/5.0-escapejsvar
Fix: [Payments] Properly escape variable for JS
2017-02-17 17:16:54 +01:00
Raphaël Doursenaud
b697da7399
Fix: [Payments] Properly escape variable for JS
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
2017-02-17 16:16:41 +01:00
Laurent Destailleur
7f21c3f3f2 Fix css email topic 2017-02-17 13:16:29 +01:00
Laurent Destailleur
0e6c329695 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 13:10:03 +01:00
Laurent Destailleur
a91d57037e FIX #6433 2017-02-17 13:09:28 +01:00
Laurent Destailleur
c61c13d9fd Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies
fix the enabling of a dependency module already ON
2017-02-17 10:47:29 +01:00
Laurent Destailleur
37caae3466 Merge pull request #6427 from laudeco/fix/calendar_move_error
allow the drag and drop of an event only for allowed users
2017-02-17 10:46:15 +01:00
Laurent Destailleur
bde6815e5d Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error
Fix: [Multicurrency] properly display API error
2017-02-17 10:45:45 +01:00
Laurent Destailleur
c2ec6d5946 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 10:30:29 +01:00
Laurent Destailleur
d42d7343bc Merge pull request #6419 from aspangaro/5.0-26
Fix : Link to loan admin isn't required, already support by page default account
2017-02-17 10:24:19 +01:00
a-schild
cea25ecb28 Use correct numeric format for all soldes 2017-02-17 10:23:00 +01:00
a-schild
2083d88609 Use correct numeric format for all soldes 2017-02-17 10:22:56 +01:00
Laurent Destailleur
beaa56306c Add united arab emirates to states. 2017-02-17 10:06:49 +01:00
Laurent Destailleur
4c310964a9 Fix list of supplier proposals 2017-02-17 01:41:33 +01:00
Laurent Destailleur
9778ca414a Better translation 2017-02-17 00:07:02 +01:00
Laurent Destailleur
4a8006b330 Fix style 2017-02-16 23:15:47 +01:00
De Coninck Laurent
fd6c4fd4d0 fix the enabling of a dependency module already ON
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
2017-02-16 09:26:18 +01:00
De Coninck Laurent
979a5e70bf allow the drag and drop of an event only for allowed users
The drag and drop of the event didn't take into account the user rights.
2017-02-16 07:51:46 +01:00
Laurent Destailleur
ad890561c4 Prepare release 5.0 2017-02-16 02:00:34 +01:00
Laurent Destailleur
1a3b9fada5 Som fixes on generator of samples 2017-02-16 01:50:02 +01:00
Laurent Destailleur
abb3c810de FIX false error message in shipment card 2017-02-16 01:39:16 +01:00
Laurent Destailleur
0d1bb5e7eb FIX If bank module on, field must be required to register payment of
expense report.
2017-02-15 23:22:47 +01:00
Laurent Destailleur
ea4a83838c Missing not visible paramater 2017-02-15 18:30:27 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error 2017-02-15 13:20:38 +01:00
Alexandre SPANGARO
66ff7fab34 Remove one step in accountancy index 2017-02-14 06:50:57 +01:00
Alexandre SPANGARO
d7614af96e Fix : Link to loan admin isn't required, already support by page default account 2017-02-14 06:45:12 +01:00
Laurent Destailleur
bcd624e5a5 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-13 01:37:53 +01:00
Laurent Destailleur
25e8caa64e Fix reversing test for a test 2017-02-13 01:37:12 +01:00
Laurent Destailleur
ae740b7c1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/langs/en_US/errors.lang
2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd Fix control of module format. 2017-02-13 01:13:41 +01:00
Laurent Destailleur
32b1f4261b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-12 20:57:00 +01:00
Laurent Destailleur
abffd29179 Try a fix for #6334, #6416 2017-02-12 20:55:54 +01:00
Laurent Destailleur
0e6ba5df4e Merge pull request #6410 from aspangaro/5.0-25
Fix : Bank account label not shown in dol_banner_tab
2017-02-12 20:42:38 +01:00
Laurent Destailleur
7e3785d446 FIX the dolCopyDir fails if target dir does not exists. 2017-02-11 15:42:57 +01:00
Laurent Destailleur
b9db7eba1b Fix: deployement of a module 2017-02-10 19:14:58 +01:00
Laurent Destailleur
f6a8aacc8d Fix: deployement of a module 2017-02-10 18:42:59 +01:00
Laurent Destailleur
ca67917e80 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-10 17:28:49 +01:00
Laurent Destailleur
a4d9f7dbbe Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-10 17:27:47 +01:00
Laurent Destailleur
d463511cff Fix: no way to know type of invoice. 2017-02-10 17:24:47 +01:00
Laurent Destailleur
d461c0dfa4 Fix left align 2017-02-10 10:47:19 +01:00
Laurent Destailleur
66542b6367 Fix translation and link to direct debit payment 2017-02-10 10:43:54 +01:00
Laurent Destailleur
ad308e33cc Fix scrutinizer warning 2017-02-09 18:29:04 +01:00
Alexandre SPANGARO
5c9c761911 Fix : Bank account label not shown in dol_banner_tab 2017-02-09 05:58:39 +01:00
De Coninck Laurent
04d73668cc fix correct url for expense report note in expense report list 2017-02-08 19:28:01 +01:00
Laurent Destailleur
366df59658 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-08 19:25:41 +01:00
Laurent Destailleur
e74927a54c Merge pull request #6400 from atm-florian/4.0
FIX #6234
2017-02-08 19:22:46 +01:00
Laurent Destailleur
6db0e909d6 Fix pagination 2017-02-08 18:41:23 +01:00
florian HENRY
ab0783edcc FIX #6234 2017-02-08 17:18:06 +01:00
Laurent Destailleur
e0850b29cd Merge pull request #6399 from fappels/5.0
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00