Commit Graph

87205 Commits

Author SHA1 Message Date
Laurent Destailleur
7b661e707e FIX Creation of Stripe card from backoffice must return a clean message 2020-02-03 14:54:35 +01:00
ptibogxiv
eb5ac0d9a9
fix url field in edit mode societe/card.php 2020-02-03 14:28:57 +01:00
stickler-ci
24ec364081 Fixing style errors. 2020-02-03 11:10:04 +00:00
Tobias Sekan
90f29c060a
New show counts of categories 2020-02-03 12:03:17 +01:00
Regis Houssin
e74e63941d FIX use "usergroup" instead "user" 2020-02-03 11:55:55 +01:00
Regis Houssin
bc3a210d12 FIX compatibility with multicompany (avoid duplicate data) 2020-02-03 11:46:18 +01:00
Tobias Sekan
2f951c0441
New - Show list of users in user category card 2020-02-03 11:01:58 +01:00
AdrianDominik
cc09257fcd Withdrawing changes 2020-02-03 10:04:58 +01:00
AdrianDominik
cb657d4b3b Merge remote-tracking branch 'origin/11.0' into 11.0 2020-02-03 09:57:37 +01:00
stickler-ci
ae95cc6869 Fixing style errors. 2020-02-03 09:54:35 +01:00
AdrianDominik
9f7b51938f FIX: #12908 User login with credentials from self-subscription form fails 2020-02-03 09:54:35 +01:00
stickler-ci
5dcd5e5b87 Fixing style errors. 2020-02-03 09:54:35 +01:00
AdrianDominik
ed269a387f FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page 2020-02-03 09:54:34 +01:00
AdrianDominik
ad2e10a679 FIX: #12908 User login with credentials from self-subscription form fails 2020-02-03 09:54:34 +01:00
stickler-ci
478f927df3 Fixing style errors. 2020-02-03 09:54:34 +01:00
AdrianDominik
540e82102b FIX: #12908 User login with credentials from self-subscription form fails 2020-02-03 09:54:34 +01:00
Tobias Sekan
7903e0379b
Fix wrong category name on user category card 2020-02-03 09:50:44 +01:00
Tobias Sekan
22824026ef
Merge pull request #9 from Dolibarr/develop
merge from develop
2020-02-03 09:49:16 +01:00
AdrianDominik
283b6be828 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-02-03 09:48:32 +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
andreubisquerra
a4c1c00728
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
2020-02-02 21:02:43 +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