Commit Graph

101158 Commits

Author SHA1 Message Date
Florian HENRY
ca53abcef2 fix email template type 2021-07-05 15:35:05 +02:00
Florian HENRY
dd3c0ac5ab Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Francis Appels
df5878b3d6 Fix php 8 warning in inventory module 2021-07-05 14:45:00 +02:00
Laurent Destailleur
87241c94a3 Code comment 2021-07-05 14:41:40 +02:00
Laurent Destailleur
383c678200 Trans 2021-07-05 14:09:01 +02:00
Francis Appels
5d824899e5 Fix php 8 warning on home page 2021-07-05 13:44:05 +02:00
Laurent Destailleur
d43e043b48 Fix regression when adding a product with multicompany 2021-07-05 12:49:10 +02:00
Laurent Destailleur
2eddc02deb Fix selection of Autofill description 2021-07-05 11:59:30 +02:00
Laurent Destailleur
b7c86f3aec Fix ldap 2021-07-05 11:41:55 +02:00
Laurent Destailleur
dfee489e7e Fix sanitizing entity 2021-07-05 11:33:32 +02:00
stickler-ci
bcb06d5c90 Fixing style errors. 2021-07-05 07:40:44 +00:00
jpb
ad62062cd5 add filter 2021-07-05 08:55:03 +02:00
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +02:00
ATM john
752fe22c68 Add simple auto mode 2021-07-04 23:24:38 +02:00
ATM john
a709cc583f Add modal option to btn 2021-07-04 22:59:53 +02:00
Laurent Destailleur
f37a62b1d4 CSS v14 2021-07-04 21:40:30 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
744a95ce7e Fix var init 2021-07-04 18:30:20 +02:00
damien clochard
cb7ac94e15 FIX #18085: Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos 2021-07-04 14:27:51 +02:00
Lenin Rivas
d51599f8f1
Update unicode and name of currency 2021-07-03 22:41:16 -05:00
Laurent Destailleur
ab1ba5bc6a css 2021-07-03 19:26:04 +02:00
Laurent Destailleur
affe6d9631 Sync transifex 2021-07-03 19:00:58 +02:00
Laurent Destailleur
df498def86 Fix css 2021-07-03 18:38:43 +02:00
Laurent Destailleur
d1c6a9899c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-03 18:33:00 +02:00
Laurent Destailleur
30f9eb9f23 Fix phpcs 2021-07-03 18:32:52 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
8a3b92a32d Fix filter 2021-07-03 18:30:58 +02:00
Laurent Destailleur
bb0daa4f0d Prepare v14 2021-07-03 18:11:01 +02:00
Laurent Destailleur
7fb0946022 Fix link 2021-07-03 18:09:48 +02:00
Laurent Destailleur
e35ecdf58d Fix trans 2021-07-03 17:58:37 +02:00
Laurent Destailleur
b43fddfc74
Merge pull request #18058 from altairisfr/exportprices
add labels and export only latest prices
2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20
Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 16:35:14 +02:00
Laurent Destailleur
f0eb245f45
Merge pull request #18068 from FHenry/13_fix_trigger_paiement_online
fix: payment ok should trigger PAYMENTONLINE_PAYMENT_OK even on custom object
2021-07-02 16:34:08 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Destailleur
8bade0e4e7 Fix add permission 2021-07-02 16:11:42 +02:00
Laurent Destailleur
1a455ad5d6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:57 +02:00
Laurent Destailleur
01cf608ef4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:48 +02:00
Laurent Destailleur
d03cbd88ae Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:59 +02:00
Laurent Destailleur
a7f850dafb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:51 +02:00
lmarcouiller
2a30c699ac Fix #18063 : search filter status lost "Back to list" 2021-07-02 16:05:28 +02:00
lmarcouiller
903adadcc4 Fix Error type ent in fourn/commande/list.php 2021-07-02 16:05:14 +02:00
Laurent Destailleur
a562cd227a
Merge pull request #18072 from Hystepik/develop#1
Fix #18063 : search filter status lost "Back to list"
2021-07-02 16:03:41 +02:00
Laurent Destailleur
2595e91f51
Merge pull request #18067 from Hystepik/develop#2
Fix Error type ent in fourn/commande/list.php
2021-07-02 16:02:55 +02:00
Laurent Destailleur
6abc7ef81b
Merge pull request #18065 from frederic34/patch-7
fix can't remove extrafield date or datetime value
2021-07-02 16:02:06 +02:00