Commit graph

133486 commits

Author SHA1 Message Date
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
c8c2141573
Merge pull request #24797 from daraelmin/patch-5
FIX PHP 8 Warning in adherent categorie view
2023-05-17 15:20:41 +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
e7e781d1eb
FIX PHP 8 Warning in adherent index.php 2023-05-17 12:38:10 +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
5dae5b57a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-05-17 12:27:46 +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
Frédéric FRANCE
bed87447c4
fix warnings 2023-05-17 12:25:01 +02:00
Laurent Destailleur
53aed716e8
Merge pull request #24789 from noec764/15_Fix_missing_error_message_intervention
FIX: Missing error message display on insertExtrafields()
2023-05-17 11:54:04 +02:00
Noé Courtier
0531f9a853 FIX: Missing error message display on insertExtrafields() 2023-05-17 10:56:15 +02:00
hystepik
507604b597 fix bad function and bad usage 2023-05-17 10:31:34 +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
77b976163c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/expedition/card.php
2023-05-17 00:37:40 +02:00
Laurent Destailleur
c8186209ad Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
	htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
	htdocs/projet/tasks.php
	htdocs/projet/tasks/time.php
2023-05-17 00:36:12 +02:00
Laurent Destailleur
c1a5ce3578 Debug v18 2023-05-17 00:20:36 +02:00
FLIO
a42325e166 New attributes on supplier_proposal card 2023-05-17 00:08:40 +02:00
FLIO
eeb52bcd1a remove change 2023-05-17 00:07:09 +02:00
FLIO
74beeb4fce New attributes on supplier_proposal card 2023-05-17 00:04:50 +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
39da668060
Merge pull request #24739 from noec764/15_FIX_Tasks_event_not_displayed
FIX: Task events not displayed
2023-05-16 22:57:35 +02:00
Laurent Destailleur
4f2adabd1c
Merge pull request #24783 from rycks/add_hook_on_paymentmodes
add hook to be able to insert lists of payments
2023-05-16 22:53:18 +02:00
Laurent Destailleur
20a9dc1951 Add field ref_ext in table of timespent 2023-05-16 22:33:32 +02:00
Laurent Destailleur
9635fa35d8
Merge pull request #24706 from alexandre-janniaux/constructor-bump-phpunit/1
FIX test/phpunit: add $name to __construct()
2023-05-16 20:58:15 +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
be816bf9d0
Merge pull request #24709 from bomuux/develop
FIX: Inventory lines values deleted when changing page length
2023-05-16 20:54:16 +02:00
Laurent Destailleur
86122780a9
Merge pull request #24708 from ptibogxiv/patch-83
FIX list orders API
2023-05-16 20:53:05 +02:00
Laurent Destailleur
2c6ca0364a
Merge pull request #24711 from aspangaro/18a6
FIX #24690 Product list - Search on accountancy account product with virtual zero
2023-05-16 20:52:21 +02:00
Laurent Destailleur
997ef573fa
Merge pull request #24712 from fappels/16_fix_ecotaxe_dict
Fix search in hidden ecotaxe dictionary by code.
2023-05-16 20:51:42 +02:00
Laurent Destailleur
53c835419e
Merge pull request #24713 from altairis-benjamin/fixPublicTicketTokens
FIX token errors on public interface
2023-05-16 20:51:07 +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
4bf136ae44
Merge pull request #24722 from noec764/15_FIX_No_error_message_if_pu_ht_is_null_supplier_proposal
FIX: No error message because  $price_ht_devise is equal to '0' if not filled because of price2num
2023-05-16 20:44:08 +02:00
Laurent Destailleur
f5ecf0beb3
Merge pull request #24727 from MaximilienR-easya/dev_New_update_ref_if_already_taken
update ticket ref when the ref is already used at the creation
2023-05-16 20:20:44 +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
8fa177d8eb Trans 2023-05-16 20:01:26 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
584131140d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:47 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
Laurent Destailleur
ebdd397d7c
Merge pull request #24779 from FliyFly/editcommandeattribute
New attributes on commande card
2023-05-16 19:42:24 +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
e90727c028
Merge pull request #24782 from ggppdk/patch-1
Add missing loading of Societe Class. Fatal error during signing proposal without order
2023-05-16 19:36:52 +02:00
Laurent Destailleur
fe94cf7cc3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:24:09 +02:00
Laurent Destailleur
412b145d42
Merge pull request #24787 from avolani/16.0-patch001
Fix proposal line ids when cloning
2023-05-16 19:23:21 +02:00
Laurent Destailleur
aff8feac85
Merge pull request #24785 from frederic34/patch-1
translation
2023-05-16 19:21:22 +02:00