Commit Graph

7420 Commits

Author SHA1 Message Date
Laurent Destailleur
7cdfe05862 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 14:20:48 +02:00
Laurent Destailleur
93c8a35ec1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-04 14:19:13 +02:00
Laurent Destailleur
aa6e512826 Fix warnings 2023-06-04 02:03:37 +02:00
Laurent Destailleur
7fc823a9ae Debug v18 2023-06-04 01:56:05 +02:00
Laurent Destailleur
342558d0fc Debug v18 2023-06-04 01:54:32 +02:00
Laurent Destailleur
98dd286342 Fix syntax error 2023-06-04 01:49:04 +02:00
Laurent Destailleur
66393753c4 Clean code - fix warnings 2023-05-30 13:29:57 +02:00
Laurent Destailleur
130a2dc4f7 Fix warning 2023-05-30 12:57:30 +02:00
Noé Courtier
5d165fb726 FIX: Change $key into $tmpkey 2023-05-29 11:33:10 +02:00
Laurent Destailleur
066df875bc Fix error management 2023-05-26 20:13:37 +02:00
Laurent Destailleur
17609c5375 Fix restore old more INVOICE_ADD_SWISS_QR_CODE and introduce option
'bottom' for new one that is broken due to php compatibility errors
2023-05-26 19:36:18 +02:00
Laurent Destailleur
089107850b Fix regressions 2023-05-26 17:55:25 +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
Noé Courtier
b7419ff73f FIX: String was compared to an integer 2023-05-26 14:39:06 +02:00
Laurent Destailleur
f6678ca818 Merge pull request #24860 from solution-libre/remove-invoice-ref-check-import
Remove invoice Ref check for import
2023-05-24 14:10:12 +02:00
Laurent Destailleur
5a6ca0d5d3 NEW: Module Webhook upgraded to stable status 2023-05-24 04:03:44 +02:00
Laurent Destailleur
d1ce063667 NEW: Module Workstations Management upgraded to stable status 2023-05-24 03:26:52 +02:00
Florent Poinsaut
cdc05f2f1a Remove invoice Ref check for import 2023-05-23 17:38:59 +02:00
Laurent Destailleur
1234976ba9 Clean code 2023-05-23 01:56:30 +02:00
Florian HENRY
a53625dded feat: Upgrade default PDF models to the 'new' ones 2023-05-21 17:49:51 +02:00
HENRY Florian
4f22b1b9b2 Merge branch 'develop' into dev_upgrade_default_pdf_models 2023-05-21 17:37:27 +02:00
Laurent Destailleur
9c78304bfb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-05-21 11:20:41 +02:00
Laurent Destailleur
61adc1854e FIX #24839 2023-05-21 11:13:58 +02:00
Laurent Destailleur
8db4d42ff2 Update doc_generic_invoice_odt.modules.php 2023-05-17 15:33:04 +02:00
Timo Scheuer
3c5b385444 fixed access to propal array 2023-05-17 13:04:08 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
ca18bfc587 Merge pull request #24705 from mrbidon/develop
Add hidden option COMPANY_AQUARIUM_NO_PREFIX to ignore PREFIX
2023-05-16 20:55:35 +02:00
Laurent Destailleur
2b55ecceb0 Fix trans key must be short 2023-05-16 12:58:55 +02:00
Laurent Destailleur
b1811ce466 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 12:38:02 +02:00
Laurent Destailleur
23a7491e12 NEW: Add option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after
specific assigned contact on PDF
2023-05-15 11:30:45 +02:00
Laurent Destailleur
5876e71072 NEW: Add option PDF_SHOW_PHONE_AFTER_USER_CONTACT to show phone after
specific assigned contact on PDF
2023-05-15 11:20:18 +02:00
Laurent Destailleur
b51e6ac025 Fix column length 2023-05-14 20:51:36 +02:00
Laurent Destailleur
80f5358e6e Fix label for title of table must be short value 2023-05-14 20:44:52 +02:00
Laurent Destailleur
8705cf1e7d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-14 20:40:59 +02:00
Laurent Destailleur
977c845d56 Fix sentence overwrite on proposal PDF 2023-05-14 20:40:47 +02:00
Laurent Destailleur
70ddfd1bec Fix sentence overwrite on proposal PDF 2023-05-14 20:37:51 +02:00
Laurent Destailleur
33defc20dc Fix sentence overwrite on sale order PDF 2023-05-14 20:09:04 +02:00
Laurent Destailleur
37a722f99f FIX label of columns must be short into invoice PDF table 2023-05-14 19:53:17 +02:00
Laurent Destailleur
49faae3a0b Debug v18 2023-05-14 17:38:08 +02:00
Laurent Destailleur
bc63d70e02 NEW: authentication mode: Add experimental support for Google OAuth2
connexion
2023-05-14 03:32:26 +02:00
Laurent Destailleur
ef91b55d9c Debug v18 2023-05-13 22:09:19 +02:00
Laurent Destailleur
a05f0b9c4e Debug v18 2023-05-13 20:16:57 +02:00
Laurent Destailleur
3322a5eeb8 Fix label 2023-05-11 21:16:49 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
f59987af77 Fix typo 2023-05-11 02:04:25 +02:00
Laurent Destailleur
4ab5489884 Clean code 2023-05-10 16:33:07 +02:00
Laurent Destailleur
5239f3c133 Debug v17 2023-05-10 13:23:07 +02:00
Laurent Destailleur
cd1523218e Debug v17 (export of attendees of an event) 2023-05-10 13:09:44 +02:00