Commit Graph

77508 Commits

Author SHA1 Message Date
Laurent Destailleur
d1e5c525aa Fix warning 2019-05-16 14:47:42 +02:00
Laurent Destailleur
399ffb2dcc Fix phpcs 2019-05-16 14:38:01 +02:00
Laurent Destailleur
ac1bab1711 Fix sanitize params 2019-05-16 12:28:57 +02:00
Laurent Destailleur
2d0b3b7b23 Fix dol_sort_array for objects 2019-05-16 12:25:14 +02:00
Nicolas ZABOURI
304e403d88 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-16 09:52:59 +02:00
Laurent Destailleur
bdb467b17a fix typo 2019-05-16 09:32:06 +02:00
Laurent Destailleur
9d831617f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-15 19:16:59 +02:00
Laurent Destailleur
fd5048ef73 Fix reported by phpstan 2019-05-15 19:16:48 +02:00
Laurent Destailleur
2016c0bd93 Fix reported by phpstan 2019-05-15 19:12:33 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213 Fix doc 2019-05-15 17:50:35 +02:00
Nicolas ZABOURI
7ba1fffcbb Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-15 17:08:28 +02:00
Laurent Destailleur
379c6e1bb1 Removed deprecated scripts 2019-05-15 16:33:38 +02:00
Laurent Destailleur
2b5b6c16b7 Add conf for phpstan 2019-05-15 13:20:11 +02:00
Laurent Destailleur
a9b3748006 __DIR__ was not replaced into scripts dir 2019-05-15 13:20:02 +02:00
Laurent Destailleur
f94b9e5a12 Fix editorconfig 2019-05-15 12:46:55 +02:00
Alexandre SPANGARO
f123f9951f NEW Add OpenConcerto export format 2019-05-15 12:16:03 +02:00
Laurent Destailleur
710e2085e6 Fix editorconfig 2019-05-15 11:55:07 +02:00
javierybar
114ddea54f Simplify terminal variables 2019-05-14 19:58:08 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard
invoices.
2019-05-14 12:00:58 +02:00
Laurent Destailleur
49d65710ba Fix date missing 2019-05-14 10:31:11 +02:00
Alexandre SPANGARO
60d00e2f5c FIX FEC Remove useless field 'validated' 2019-05-14 06:46:06 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Francis Appels
79a347ab11 Fix PHPCS contract list 2019-05-13 22:49:43 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
Alexandre SPANGARO
6f9010c362 NEW add category in export of chart of accounts 2019-05-13 22:02:43 +02:00
Francis Appels
6e5d826d65 Clean PHPCS for commonobject.class 2019-05-13 22:02:33 +02:00
Laurent Destailleur
04f7261bfc Fix field date was not visible 2019-05-13 21:34:30 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
278d4fdb8e Fix css 2019-05-13 20:55:05 +02:00
Laurent Destailleur
b63803e8ef Fix missing dir 2019-05-13 20:42:09 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display
fix useless calculation
2019-05-13 20:20:01 +02:00
Laurent Destailleur
f576d441bc FIX #11171
Upgrade Mobile_Detect. This
2019-05-13 19:53:04 +02:00
Laurent Destailleur
94387cd0e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-13 12:28:25 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
1626c9fb6e
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces
FIX : use dol_sanitizeFileName() function to remove double spaces in …
2019-05-13 12:01:05 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Laurent Destailleur
30e08d8f9c
Merge pull request #11167 from andreubisquerra/master
TakePOS as stable
2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
Laurent Destailleur
39c9efbc51 Fix remove non existing status 2019-05-13 10:23:09 +02:00
Laurent Destailleur
ec8b640182 Fix remove non existing status 2019-05-13 10:22:26 +02:00
Laurent Destailleur
8b0a0352e6 Fix responsive of help center 2019-05-13 09:47:58 +02:00
John BOTELLA
b0e780fab0 Fix travis 2019-05-13 09:39:45 +02:00
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
5876582030 Fix responsive 2019-05-12 15:56:29 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00