Commit Graph

88002 Commits

Author SHA1 Message Date
Tim Otte
08fc988d3a
Merge pull request #5 from Dolibarr/develop
Merge changes since last PR
2020-07-28 11:07:22 +02:00
Laurent Destailleur
81cb5501bc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
364fb05ed3 Fix phpcs 2020-07-28 09:46:31 +02:00
Laurent Destailleur
4e4f0a4575 Use same case for all sql files 2020-07-28 09:44:48 +02:00
Laurent Destailleur
98064f7329 FIX Bad param 2020-07-28 03:02:38 +02:00
Laurent Destailleur
fef180cf86 Fix scrutinizer errors 2020-07-28 02:54:37 +02:00
Laurent Destailleur
8c425ae796 FIX Bad param 2020-07-28 02:47:46 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
6d8060bc50 FIX DO not erase variable $key and $label during output of extrafields
Conflicts:
	htdocs/core/tpl/extrafields_view.tpl.php
2020-07-27 14:22:55 +02:00
Laurent Destailleur
b93f60c446 Look and feel v13 2020-07-27 14:19:50 +02:00
Laurent Destailleur
10484ba06e FIX DO not erase variable $key and $label during output of extrafields 2020-07-27 14:04:41 +02:00
Laurent Destailleur
988e9e5817 Update to jquery 3.5.1 2020-07-27 13:52:19 +02:00
Laurent Destailleur
19b550009b Trans 2020-07-27 02:38:31 +02:00
Laurent Destailleur
9798bb1b30 Fix responsive 2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248 FIX Setup of clicktodial hang on smartphone 2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7 Fix responsive 2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a FIX Setup of clicktodial hang on smartphone 2020-07-27 02:25:09 +02:00
Laurent Destailleur
26c253113b Removed not used files 2020-07-26 22:04:19 +02:00
Laurent Destailleur
cef996926e WIP Add publilc interface for recruitment 2020-07-26 22:03:40 +02:00
Laurent Destailleur
01adf73e53 WIP Add publilc interface for recruitment 2020-07-26 22:02:49 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:07:39 +02:00
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4 FIX Picto of HRM module 2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +02:00
Laurent Destailleur
f847cad197 Fix perm 2020-07-26 20:02:29 +02:00
Laurent Destailleur
12bb44ed03 Fix recruitment 2020-07-26 19:57:42 +02:00
Laurent Destailleur
4fadd747ae Trans 2020-07-26 19:53:51 +02:00
Laurent Destailleur
353e99c26a Fix look and feel 2020-07-26 19:43:55 +02:00
Laurent Destailleur
cdf7261c7e Fix look and feel 2020-07-26 19:27:29 +02:00
Laurent Destailleur
378c45fe5c Fix look and feel 2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d Look and feel 2020-07-26 18:34:50 +02:00
Laurent Destailleur
b93cab2e77 css 2020-07-26 00:04:10 +02:00
Laurent Destailleur
116e947933 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-25 19:06:09 +02:00
Laurent Destailleur
e33722750c Fix option THEME_SHOW_BORDER_ON_INPUT 2020-07-25 19:05:52 +02:00
Laurent Destailleur
5a71148d69 Fix option THEME_SHOW_BORDER_ON_INPUT 2020-07-25 19:04:37 +02:00
Laurent Destailleur
52f238a351 Fix label 2020-07-25 14:50:09 +02:00
Laurent Destailleur
2d45fd04fe Doc 2020-07-25 14:47:43 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
Laurent Destailleur
3ed4773d7f Fix tab popup when there is 2 head tabs in same page 2020-07-24 18:31:14 +02:00
Laurent Destailleur
b82b6736d1 Look and feel 2020-07-24 18:13:01 +02:00
Laurent Destailleur
6d4b113c72 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 14:25:59 +02:00
Laurent Destailleur
d6f1a897f6 Fix size of module box 2020-07-24 13:44:32 +02:00