Commit Graph

83198 Commits

Author SHA1 Message Date
Laurent Destailleur
08d85f9acb
Merge pull request #13009 from TobiasSekan/NewShowCategoryCount
NEW Show count of each category elements in category card
2020-02-05 14:19:37 +01:00
Laurent Destailleur
56012405ff
Merge pull request #13006 from TobiasSekan/NewShowUsersOfCategory
NEW Show list of users in the user category card
2020-02-05 14:19:06 +01:00
Laurent Destailleur
5eea3292dc
Merge pull request #13004 from TobiasSekan/FixWrongCategoryName
[Fix] Wrong user category name
2020-02-05 14:17:14 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop
Update image path after move image directory
2020-02-05 14:10:12 +01:00
Laurent Destailleur
ddd1ca26b9 CSS 2020-02-05 14:04:19 +01:00
Laurent Destailleur
db43b2d3dd Fix unique key on llx_holiday_users 2020-02-05 13:53:35 +01:00
Laurent Destailleur
0315b53f1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-05 13:03:54 +01:00
Laurent Destailleur
bd90cdf492 FIX #13023 2020-02-05 13:03:43 +01:00
Laurent Destailleur
8051e916c0
Merge pull request #13017 from andreubisquerra/develop
Add bold tags to Receipt Printers module
2020-02-05 12:40:07 +01:00
Laurent Destailleur
a11ef1c606
Merge pull request #13020 from TobiasSekan/FixGenderPhotoInContactCard
[Fix] Missing gender photo in contact card
2020-02-05 12:22:35 +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
Tobias Sekan
24c305dc7f
Fix unset gender property in contact class 2020-02-04 09:00:31 +01:00
andreubisquerra
5a248f31a6
Add langs 2020-02-03 19:34:39 +01:00
andreubisquerra
e6dc384ee9
Add bold tags 2020-02-03 19:33:23 +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
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
Tobias Sekan
2f951c0441
New - Show list of users in user category card 2020-02-03 11:01:58 +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
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