Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

31712 Commits

Author SHA1 Message Date
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
3350105f3f Merge pull request #24691 from FHenry/dev_upgrade_default_pdf_models 
feat: Upgrade default PDF models to the 'new' ones (eproved since 4 dolibarr versions from now)
 2023-05-22 12:57:24 +02:00
Laurent Destailleur
ffd5176fdd Fix allow download of json log files 2023-05-22 10:19:10 +02:00
daraelmin
3039c62738 FIX better box member by tag 
Fix total is missing for each row
Fix Link on category points now in the adherent list filtered by category
Fix order in box is now same as the select in the list
 2023-05-21 18:18:12 +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
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02:00
Laurent Destailleur
0a80a0b5fa Debug v18 2023-05-21 14:33:59 +02:00
Laurent Destailleur
cb8047d0b8 Clean code 2023-05-21 13:48:24 +02:00
Laurent Destailleur
0a2ae8e8d5 Clean code 2023-05-21 13:01:23 +02:00
Laurent Destailleur
421f7ecff4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-21 11:36:42 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +02:00
Laurent Destailleur
7167ff89b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-05-21 11:21: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
51493ed24a Merge pull request #24646 from MaximilienR-easya/dev_New_link_client_mail_to_messages 
link clients mail/card to ticket messages
 2023-05-21 02:35:37 +02:00
Laurent Destailleur
544114166f Merge pull request #24795 from TimoScheuer/odt-template-invoice-propal-variables 
fixed access to proposal (propal) variables for invoice ODT templates
 2023-05-20 11:58:35 +02:00
Laurent Destailleur
b5876fa449 Merge pull request #24815 from daraelmin/patch-2 
FIX  #24796 PHP 8 Warning missing PROJECT_USE_SEARCH_TO_SELECT const
 2023-05-20 11:53:10 +02:00
Laurent Destailleur
65a6ef8678 Merge pull request #24818 from daraelmin/patch-5 
FIX PHP 8 Warning in box_membres_by_tags.php
 2023-05-20 11:52:55 +02:00
Laurent Destailleur
75fe01ad16 Merge pull request #24821 from MaximilienR-easya/dev_Fix_html_extrafields 
Fix html extrafields
 2023-05-20 11:52:38 +02:00
ptibogxiv
c5ceb40a93 NEW vcard url substitution 2023-05-19 19:18:28 +02:00
Maximilien Rozniecki
726ca61776 Fix "html" type extrafields now accept some html balises with the flag "htmlrestricted" inside the "GETPOST" 2023-05-19 11:36:53 +02:00
Laurent Destailleur
862460a2dd Doc 2023-05-18 12:09:42 +02:00
daraelmin
e5cfd4851e FIX PHP 8 Warning in box_membres_by_tags.php 2023-05-18 11:21:36 +02:00
stickler-ci
b70676cc1f Fixing style errors. 2023-05-17 21:47:51 +00:00
daraelmin
b57dd059e9 clean code 2023-05-17 23:19:33 +02:00
daraelmin
954636159d FIX #24796 PHP 8 Warning missing PROJECT_USE_SEARCH_TO_SELECT const 2023-05-17 23:05:25 +02:00
daraelmin
8fa581f936 FIX #24798 Deleting member subscription is not possible 
object subscription has no getfullname method, it's in adherent class
 2023-05-17 22:59:51 +02:00
stickler-ci
a0953a53b3 Fixing style errors. 2023-05-17 15:11:36 +00:00
Philippe GRAND
2ac7cb6a83 fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/files.lib.php on line 3138 2023-05-17 17:07:18 +02:00
Laurent Destailleur
8db4d42ff2 Update doc_generic_invoice_odt.modules.php 2023-05-17 15:33:04 +02:00
Laurent Destailleur
96f577f1fb Merge pull request #24791 from frederic34/patch-1 
fix warnings in member pages
 2023-05-17 15:26:29 +02:00
Laurent Destailleur
3f1572c7f8 Merge pull request #24793 from daraelmin/patch-1 
Fix PHP 8 Warning in box member type
 2023-05-17 15:21:20 +02:00
Laurent Destailleur
649f09016f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-17 14:23:45 +02:00
Laurent Destailleur
76de309cd9 FIX error management on emoji and utf8 validity by emailcollector 2023-05-17 14:23:14 +02:00
daraelmin
8996e51e68 FIX PHP 8 Warning in adherent categorie view 2023-05-17 14:09:57 +02:00
Timo Scheuer
3c5b385444 fixed access to propal array 2023-05-17 13:04:08 +02:00
daraelmin
95a42312ec Fix PHP 8 Warning in box member type 2023-05-17 12:32:23 +02:00
Frédéric FRANCE
436b23bc1a Update box_members_by_type.php 2023-05-17 12:28:41 +02:00
Laurent Destailleur
aefc34d622 Merge pull request #24719 from altairis-benjamin/ticketModule 
FIX broken feature : send private message by email
 2023-05-17 01:14:58 +02:00
Laurent Destailleur
bc2e095dec Debug v18 2023-05-17 01:09:09 +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
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
Laurent Destailleur
0ec45022ea Merge pull request #24767 from daraelmin/daraelmin-stats-adh-by-status 
NEW : Uniformize member stats in boxes and index
 2023-05-16 23:22:22 +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
df4472b1f4 Merge pull request #24721 from hregis/fix_takepos_php8 
FIX missing constant and avoid submit button conflict
 2023-05-16 20:46:34 +02:00
Laurent Destailleur
da1bd3a725 Merge pull request #24759 from frederic34/patch-5 
add errors-to for swiftmailer
 2023-05-16 20:15:35 +02:00
Laurent Destailleur
a637a9b07c Merge pull request #24781 from altairisfr/masknextvalue 
NEW mask next value sql on mask only
 2023-05-16 19:37:39 +02:00
Laurent Destailleur
f71e53e6b2 Clean vars 2023-05-16 19:21:14 +02:00