Commit Graph

2712 Commits

Author SHA1 Message Date
Frédéric FRANCE
6e3a1a1d41 fix tests 2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680 replace ... by one char in dol_trunc 2021-02-21 13:00:31 +01:00
Frédéric FRANCE
5096c5bf2d cache socialnetworks array 2021-02-21 10:18:05 +01:00
Laurent Destailleur
581d137aa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
Laurent Destailleur
eeedbccc71 Merge pull request #16351 from aspangaro/14a16
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-19 18:20:17 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Anthony Berton
a858666b15 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into ADD_SUBSTITUTION_DELIVRY_DATE 2021-02-19 09:13:37 +01:00
Laurent Destailleur
485dd07f67 NEW Can show the holidays on the agenda view. 2021-02-18 23:13:55 +01:00
Alexandre SPANGARO
f462455e89 NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD 2021-02-18 21:39:25 +01:00
Anthony Berton
bacafd326e Update functions.lib.php 2021-02-18 16:13:40 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Laurent Destailleur
36e0deba3f Look and feel v14 2021-02-17 17:56:08 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
c8824ccea0 Look and feel v14 2021-02-16 17:05:38 +01:00
Laurent Destailleur
6f25f7c2cb Clean code 2021-02-16 11:43:26 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
d183a7eedf Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
b98a654321 NEW The setup for mandatory field can be done on combo list too. 2021-02-15 15:37:43 +01:00
Laurent Destailleur
e802dd87f4 Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +01:00
Frédéric FRANCE
917f15a781 Use dictionary to display social network icon 2021-02-14 21:30:54 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +01:00
Laurent Destailleur
c0aa7e7db5 Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Laurent Destailleur
d0bbf5bf35 Update functions.lib.php 2021-02-08 15:08:24 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Frédéric FRANCE
c83ccb1e0f Update functions.lib.php 2021-02-08 00:46:46 +01:00
Laurent Destailleur
1f32d4a815 Avoid warning 2021-02-07 21:21:21 +01:00
Laurent Destailleur
7b72ac5a7a Look and feel v14 2021-02-06 12:10:27 +01:00
Laurent Destailleur
3dedd81f37 Same width for all picto of menu 2021-02-06 11:56:27 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
21a9a69ba1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/SecurityTest.php
2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
a4f6c2d0c6 More log 2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea Look and feel v14 2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
2021-01-31 12:03:39 +01:00