Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,938 Commits 36 Branches 190 Tags
47ea0c274b51e6022a511bf9d582657c63d0a38f
Commit Graph

7483 Commits

Author SHA1 Message Date
Laurent Destailleur
7885c44adb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-06-05 14:13:36 +02:00
Laurent Destailleur
150afca950 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-05 13:59:11 +02:00
Laurent Destailleur
bb35375c54 Debug v18 2023-06-05 13:58:48 +02:00
Laurent Destailleur
ea7d96b6eb Merge pull request #24931 from kev-73/kev-73-patch-1 
NEW: add field 'ref' (of supplier product) for import supplier PO lines
 2023-06-05 11:17:10 +02:00
kev-73
6bdc98868f Update modFournisseur.class.php 2023-06-05 08:56:23 +02:00
Laurent Destailleur
85188ca3e9 Merge pull request #24896 from defrance/patch-263 
add planned_workload field on odt
 2023-06-04 21:40:02 +02:00
Laurent Destailleur
f6ea26dfa8 Merge pull request #24923 from frederic34/phpmin 
Phpmin
 2023-06-04 15:22:39 +02:00
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
Adrien Raze
984ad5febf FIX : Add/Update required modules for thirdparties (by categ) & partnership 2023-06-01 11:03:12 +02:00
kev-73
42519bd4fc NEW : add field 'ref' (of supplier) for import supplier PO lines 
When import supplier PO lines, the field 'ref' for supplier product ref is not available. If we not use database products, and we want use "free line" for type "product", this field is important.
 2023-06-01 08:48:50 +02:00
Frédéric FRANCE
3d6c899de2 put phpmin info in one place 2023-05-31 09:32:51 +02:00
Frédéric FRANCE
c61d96c98f put phpmin info in one place 2023-05-31 09:31:22 +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
Florian HENRY
37a85ba0ae feat: min php version for Dav module 2023-05-27 11:56:59 +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
Charlène Benke
2581513c90 add planned_workload field on odt 2023-05-26 17:08:55 +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