Commit Graph

83178 Commits

Author SHA1 Message Date
Laurent Destailleur
bd90cdf492 FIX #13023 2020-02-05 13:03:43 +01:00
Laurent Destailleur
373b4ca0d9 Use constant 2020-02-05 10:59:32 +01:00
Laurent Destailleur
bc19f72306 FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:20 +01:00
Laurent Destailleur
0b45ceaf92 More logs 2020-02-04 18:59:49 +01:00
Laurent Destailleur
9c8119def9 Fix phpcs 2020-02-04 18:03:32 +01:00
Laurent Destailleur
71d0ed0754 css 2020-02-04 16:44:46 +01:00
Laurent Destailleur
bb1c9a66dd Fix code alignement on modulebuilder 2020-02-04 16:37:30 +01:00
Laurent Destailleur
976ce0a954 Fix scrutinizer 2020-02-04 14:33:25 +01:00
Laurent Destailleur
157745a1bb Fix phpcs 2020-02-04 14:18:37 +01:00
Laurent Destailleur
7b661e707e FIX Creation of Stripe card from backoffice must return a clean message 2020-02-03 14:54:35 +01:00
Laurent Destailleur
97d726733c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:36:43 +01:00
Laurent Destailleur
2cb414e17e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:35:27 +01:00
Laurent Destailleur
2813c9d4b4 FIX #12973 2020-02-03 06:31:40 +01:00
Laurent Destailleur
87f84e5b17 FIX #12973 2020-02-03 06:29:40 +01:00
Laurent Destailleur
d8ed62ea33 Fix line_max for BOM 2020-02-03 06:28:51 +01:00
Laurent Destailleur
8957a29990 FIX #12973 2020-02-03 06:28:04 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Laurent Destailleur
7c35e9aaa8 FIX #12932 2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a FIX #12932 2020-02-03 03:55:37 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
b3a50bd4b0 FIX #12874 2020-02-03 03:47:45 +01:00
Laurent Destailleur
a30da7860f FIX #12892 2020-02-03 03:32:31 +01:00
Laurent Destailleur
5633f58477 FIX #12978 2020-02-03 03:25:41 +01:00
Laurent Destailleur
ccf8e81f93 FIX #12975 2020-02-03 03:10:10 +01:00
Laurent Destailleur
ff6bcbdcf8 Fix trans 2020-02-03 03:10:03 +01:00
Laurent Destailleur
240727c3e1 FIX #12975 2020-02-03 03:08:54 +01:00
Laurent Destailleur
3f73339818 Fix trans 2020-02-03 03:01:23 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/projet/element.php
2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
5e4e02337b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-03 02:50:44 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Laurent Destailleur
69a0a1410e FIX #12991 2020-02-03 02:28:23 +01:00
Laurent Destailleur
a0e3c5292f FIX #12992 2020-02-03 02:20:38 +01:00
Laurent Destailleur
6fda058497
Merge pull request #12959 from ptibogxiv/patch-298
FIX doc of dictionnary API
2020-02-02 20:27:42 +01:00
Laurent Destailleur
fc1d6c1971
Merge pull request #13001 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2020-02-02 20:26:23 +01:00
Laurent Destailleur
047ca32229
Merge pull request #12998 from aspangaro/12.0_a8
NEW : Add French foundation chart of accounts 2018
2020-02-02 20:25:47 +01:00
Laurent Destailleur
590f8bf738
Merge pull request #12988 from aspangaro/11.0_p4
FIX: FEC export have specific name
2020-02-02 20:24:21 +01:00
Laurent Destailleur
54ef0e2074
Merge pull request #12987 from aspangaro/10.0_p34
FIX: FEC export have specific name
2020-02-02 20:24:04 +01:00
Laurent Destailleur
b632ebb52c
Merge pull request #12997 from atm-john/11.0_fix_project_loan_data
11.0 fix project loan data
2020-02-02 20:23:22 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view
NEW monthly view to enter time
2020-02-02 20:05:18 +01:00
Laurent Destailleur
d4c16c6590
Merge pull request #12981 from oscim/patch-17
Update thirdparty_lettering_supplier.php
2020-02-02 20:01:47 +01:00
Laurent Destailleur
5e58772541
Merge pull request #12980 from oscim/patch-16
Update lettering.class.php
2020-02-02 20:01:17 +01:00
Laurent Destailleur
86c1777702
Merge pull request #12976 from mapiolca/patch-28
Add support of Number2Words module (v2)
2020-02-02 19:54:49 +01:00
Laurent Destailleur
7cb2c21dc2 FIX #12974 2020-02-02 19:50:53 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-02 18:34:09 +00:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
423555c8b0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-02 19:05:47 +01:00
Laurent Destailleur
075b1ea744 FIX Log of authentication ko or ko + CVE-2020-7996 2020-02-02 19:05:38 +01:00
Laurent Destailleur
be0a25e5ed Removed never called page 2020-02-02 19:03:59 +01:00