Commit Graph

12926 Commits

Author SHA1 Message Date
Laurent Destailleur
a5d5847e04 Clean code 2023-06-29 11:20:19 +02:00
Laurent Destailleur
28b7f7d20a Fix remove foreign key on user
Transifex sync
2023-06-27 13:56:18 +02:00
Laurent Destailleur
f5da656a64 Trans 2023-06-27 12:04:45 +02:00
Laurent Destailleur
0c988e8ce1 Update admin.lang 2023-06-25 01:44:30 +02:00
Laurent Destailleur
47d586b109 Merge pull request #25179 from DATUC/patch-28
Update companies.lang
2023-06-23 02:34:25 +02:00
Laurent Destailleur
d67c98a275 Merge pull request #25178 from DATUC/patch-27
Update companies.lang
2023-06-23 01:46:14 +02:00
Laurent Destailleur
bcdddc2c1c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-22 21:31:26 +02:00
DATUC
d3e64c8899 Update companies.lang
Update local CM ref in English ProfId
2023-06-22 15:49:39 +01:00
DATUC
aa07a80ec0 Update companies.lang
Update local CM ref in french ProfId
2023-06-22 15:44:22 +01:00
Hystepik
af6424fd4b Fix #25150 : add trans for api permission 2023-06-20 15:02:19 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
886eaa9117 Fix error management and better merging behaviour 2023-06-15 12:48:12 +02:00
Laurent Destailleur
c67ea96e19 FIX Multicompany for SEPA file generation 2023-06-14 15:09:36 +02:00
Alexandre SPANGARO
30da01a599 FIX Accountancy - Closure - Button is hidden... 2023-06-10 21:41:29 +02:00
Jean
751d918576 FIX #25046 user landing page url setting 2023-06-10 12:29:36 +02:00
Laurent Destailleur
332ab226aa Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/langs/en_US/ticket.lang
2023-06-10 12:13:46 +02:00
Nicolas
455293da94 FIX #24695 2023-06-09 10:08:09 +02:00
Laurent Destailleur
e1169091e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/js/lib_head.js.php
2023-06-08 23:33:45 +02:00
Alexandre SPANGARO
217b3d6f59 FIX Donation - Missing Language key 2023-06-08 21:58:30 +02:00
Laurent Destailleur
e9c17980f9 Trans 2023-06-05 23:59:33 +02:00
Lamrani Abdel
0f4feec3ff fix some problems 2023-06-05 16:15:52 +02:00
Laurent Destailleur
0766bd8e7a Merge pull request #24929 from fappels/18_debug_list_det
Debug Lines of order page.
2023-06-04 17:59:57 +02:00
Laurent Destailleur
6efa2ecfbb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 03:34:49 +02:00
Laurent Destailleur
6c8b5d489f NEW Add option MAIN_ALLOW_LOCAL_LINKS_AS_EXTERNAL_LINKS 2023-06-03 11:20:24 +02:00
Laurent Destailleur
7be8ea782d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
# Conflicts:
#	htdocs/compta/facture/card.php
#	htdocs/fourn/facture/card.php
2023-06-01 08:01:32 +02:00
Laurent Destailleur
faf8f8d19e Debug v18 2023-06-01 07:58:52 +02:00
Laurent Destailleur
f0a4732d0b Fix php 8.2 2023-06-01 07:35:41 +02:00
Francis Appels
1484ac243f Fix translation 2023-05-31 15:36:42 +02:00
Laurent Destailleur
7bfd03d36e Trans 2023-05-26 19:41:56 +02:00
Laurent Destailleur
57fd5b82ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-26 17:49:01 +02:00
Laurent Destailleur
2c4e50195a Merge pull request #24252 from Raksha-ch/real-swissqr
Invoices - Add valid SwissQR code on Crabe & Sponge
2023-05-26 17:45:04 +02:00
Laurent Destailleur
1ec4689705 Add tooltips on setup page 2023-05-26 16:24:28 +02:00
Laurent Destailleur
6a445e844f Merge pull request #24858 from noec764/NEW_ADD_SSL_NORSH_OPTION_ON_EMAIL_COLLECTOR
NEW: Add Encryption method and NoRSH configuration on email collector
2023-05-26 00:16:19 +02:00
Laurent Destailleur
b7cd3bd860 Merge pull request #24859 from lamrani002/MenusModuleBuilderOptimize
optimize menu section on modulebuilder
2023-05-24 11:10:18 +02:00
Laurent Destailleur
8f981fb734 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-05-24 03:23:30 +02:00
Lamrani Abdel
0de29550f2 optimize all menu section 2023-05-23 17:37:52 +02:00
Noé Courtier
961303e1cd NEW: Add en_US Translations 2023-05-23 17:04:24 +02:00
Noé Courtier
77a8341c4e NEW: Add Encryption and noRSH config on emailcollector object 2023-05-23 16:58:20 +02:00
Laurent Destailleur
0e88b6a24b Debug v18 2023-05-23 16:33:50 +02:00
David Beniamine
f929aee3af Add a setting to send subscription reminder to a cc address 2023-05-23 14:12:41 +02:00
Laurent Destailleur
a5dd423d2f Merge pull request #24850 from Hystepik/develop#3
Fix : Thirdparty global discount page
2023-05-22 20:13:05 +02:00
hystepik
1aae4f1cce Fix : thirdparty global discount page 2023-05-22 16:02:19 +02:00
Laurent Destailleur
9972277679 Debug v18 2023-05-22 15:59:48 +02:00
Laurent Destailleur
5d39fe8926 Merge pull request #24717 from Hystepik/develop#1
New : Dispatch card on expedition object
2023-05-22 15:44:30 +02:00
Laurent Destailleur
5bc87a590c NEW Add partial payment reason "withholding tax" 2023-05-21 22:29:46 +02:00
Laurent Destailleur
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02:00
Laurent Destailleur
5e4edac94d FIX delete of warehouse 2023-05-21 15:25:52 +02:00
Laurent Destailleur
9bcbe23792 Fix message in output of batch to send invoice on validation date 2023-05-17 19:44:02 +02:00
Laurent Destailleur
4354cad74b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-17 12:25:17 +02:00