Commit Graph

64295 Commits

Author SHA1 Message Date
Rui Strecht
e1c54664d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-06 18:59:18 +01:00
Laurent Destailleur
25254a19fc Fix back to link 2017-09-06 19:56:01 +02:00
Laurent Destailleur
7c2c496823 Fix pagination on account list page 2017-09-06 19:53:28 +02:00
Laurent Destailleur
b4abb7151f Use autocomplete on multi selection of accounts for group definition 2017-09-06 19:42:41 +02:00
Rui Strecht
114105cd54 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-06 18:39:27 +01:00
Laurent Destailleur
859d0dfe97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
7a6f3d899c Fix initial data 2017-09-06 19:21:46 +02:00
Laurent Destailleur
33e2179b65 FIX SQL injection 2017-09-06 18:17:57 +02:00
Laurent Destailleur
032f54dd1a Fix search criteria lost during navigation 2017-09-06 15:36:16 +02:00
Ferran Marcet
9fa85a5831 Fix: Credit card field showing too small 2017-09-06 12:14:42 +02:00
Ferran Marcet
016ed12c11 Fix: Credit card field showing too small 2017-09-06 12:09:07 +02:00
Laurent Destailleur
d26b2a694d FIX Security fixes (filter onload js, less verbose error message in
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Rui Strecht
4d060a273f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-06 10:38:15 +01:00
Regis Houssin
9b35793608 Fix: avoid "Uncaught Error: [] operator not supported for strings" 2017-09-06 11:08:23 +02:00
Laurent Destailleur
9cc344f8cc Fix problem in type and customer code substitution in numbering module 2017-09-06 10:11:07 +02:00
fappels
5a75e14a8a Add supplier qty and supplier discount for export 2017-09-05 22:50:34 +02:00
Laurent Destailleur
0c066b471d Debug modulebuilder 2017-09-05 22:33:55 +02:00
fappels
f5e14c9d70 Transfer of customer order line extrafield should only transfer fields available in target 2017-09-05 21:41:49 +02:00
fappels
237270a27e Add missing transfer of line extrafields in create invoice from supplier order 2017-09-05 21:40:04 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00
Laurent Destailleur
f5ccd943f1 Fix mix of collation 2017-09-05 20:13:33 +02:00
Juanjo Menent
53f5513476 FIX: Bad const name 2017-09-05 18:10:19 +02:00
Laurent Destailleur
e599e47e84 Missing translation 2017-09-05 13:06:34 +02:00
Laurent Destailleur
48c526f87d Debug report for accounting module 2017-09-05 12:53:25 +02:00
Rui Strecht
75ce9742e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-05 10:08:16 +01:00
Laurent Destailleur
f23a681dc0 Clean code 2017-09-05 10:16:08 +02:00
Maxime Kohlhaas
4638ebac8a Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-09-05 09:46:31 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
4b11332927 Debug edit accounting groups 2017-09-05 09:42:05 +02:00
Laurent Destailleur
c1d31c34cd Work on reports per date 2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff Work on reports per date 2017-09-05 02:13:02 +02:00
Laurent Destailleur
987303a6ca Nb of sql requests divided by 2 from report per personalized categories 2017-09-05 02:12:37 +02:00
Rui Strecht
e8221b8a81 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-04 15:41:34 +01:00
Jacques83300
52986c5c07 Add some missing attributes in Adherent:makeSubstitution (type, phone numbers) for use in substitution of tags 2017-09-04 15:59:50 +02:00
Laurent Destailleur
8de51ede18 Add warning to warn against json emulation 2017-09-04 13:22:21 +02:00
Laurent Destailleur
9304df21a0 Clean code 2017-09-04 13:17:18 +02:00
Laurent Destailleur
c15454e62b Fix method to delete a bookkeeping record 2017-09-04 13:09:26 +02:00
Laurent Destailleur
4c8945e460 Fix bad use 2017-09-04 12:59:54 +02:00
Laurent Destailleur
c3daad7545 Fix not reachable code 2017-09-04 12:55:32 +02:00
Rui Strecht
94e6900662 Merge remote-tracking branch 'origin/develop' into develop 2017-09-04 11:44:13 +01:00
Scrutinizer Auto-Fixer
c2d32aaf18 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-09-04 10:42:51 +00:00
Laurent Destailleur
ee32cce33a Fix error reported by scrutinizer 2017-09-04 12:23:44 +02:00
Laurent Destailleur
5c7d2ffdc2 Fix get of contractlineid 2017-09-04 12:22:03 +02:00
Laurent Destailleur
d4ff877fdd Prepare 6.0.1 2017-09-04 12:13:12 +02:00
Laurent Destailleur
d66fac5662 Prepare 5.0.7 2017-09-04 12:12:50 +02:00
Laurent Destailleur
a158f5ab9d Doc 2017-09-04 12:01:51 +02:00
Laurent Destailleur
aa56de88cb Fix doc 2017-09-04 11:22:53 +02:00
Laurent Destailleur
67b5353861 Merge pull request #7327 from marcosgdf/bug-7000
FIX #7000 Dashboard link for late pending payment supplier invoices do not work
2017-09-04 10:54:58 +02:00
Laurent Destailleur
4dd58a94f3 Update list.php 2017-09-04 10:54:50 +02:00
Laurent Destailleur
1821be87e9 Merge pull request #7326 from marcosgdf/bug-7325
FIX #7325 Default VAT rate when editing template invoices is 0%
2017-09-04 10:53:07 +02:00