Commit Graph

107444 Commits

Author SHA1 Message Date
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
Laurent Destailleur
aaa2ad710c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-16 20:06:06 +01:00
Laurent Destailleur
45e3f19bd7 Fix remove files not expected 2022-11-16 20:05:52 +01:00
Laurent Destailleur
844a46cd58
Merge pull request #22864 from Easya-Solutions/14.0_fix-mailing-card-merge-errors
FIX merge errors on mailing card
2022-11-16 11:37:58 +01:00
VESSILLER
10154cc357 FIX remove not initialized variable 2022-11-16 11:05:39 +01:00
VESSILLER
6e33d1e2b1 FIX merge errors on mailing card 2022-11-16 10:48:25 +01:00
Laurent Destailleur
3b1058ed72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:44:55 +01:00
Laurent Destailleur
8ea9f11664 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:40:44 +01:00
Laurent Destailleur
81187106c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:40:36 +01:00
Laurent Destailleur
f4b1d31013 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-15 19:36:37 +01:00
Laurent Destailleur
bb01ad7d9a
Merge pull request #22850 from daraelmin/patch-4
FIx #18304 No adh create if error on public form
2022-11-15 13:12:02 +01:00
stickler-ci
c81c91755d Fixing style errors. 2022-11-15 10:55:09 +00:00
daraelmin
cd2b9538c1
FIx #18304 No adh create if error on public form
FIX #18304 - Member subscription confirmation email sent even if mandatory fields are missing
2022-11-15 11:51:20 +01:00
Laurent Destailleur
90b44fc184
Merge pull request #22743 from noec764/14_FixAssetsExtraFieldsList
FIX: Wrong extrafields element in assets list
2022-11-14 22:16:31 +01:00
Laurent Destailleur
0d7c9b0a84 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-14 22:02:49 +01:00
Laurent Destailleur
b766e6de66 FIX #22786 2022-11-14 21:08:54 +01:00
Laurent Destailleur
c657a8b5d4
Merge pull request #22839 from Hystepik/develop_v15#1
Fix #11555 : Message display on adherent public
2022-11-14 20:36:12 +01:00
lmarcouiller
eb63c8c5c6 Fix #11555 : Message display on adherent public 2022-11-14 15:32:16 +01:00
Laurent Destailleur
7205901437
Merge pull request #22808 from frederic34/patch-7
fix extrafields create in holiday card
2022-11-12 12:37:58 +01:00
Laurent Destailleur
fc8a136a34
Merge pull request #22818 from thomas-Ngr/14.0_fix_supplier_proposal_line_clone_subprice_zero
Fix supplier proposal clone : when a line subprice is empty, it should be saved as 0 in the Database, not null.
2022-11-12 12:37:17 +01:00
Laurent Destailleur
2155d56095 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-11 14:58:28 +01:00
Laurent Destailleur
886fa7a812 Fix phpcs 2022-11-11 14:57:02 +01:00
Thomas Negre
dba6c68181 Fix supplier proposal clone : when a line subprice is empty, it should be saved as 0 in the Database, not null. 2022-11-10 16:55:23 +01:00
Frédéric FRANCE
5a1f1bf058
Update list.php 2022-11-10 10:12:46 +01:00
Frédéric FRANCE
8cb7b7e8ef
fix extrafields create in holiday card 2022-11-10 10:03:51 +01:00
Laurent Destailleur
026404657d
Merge pull request #22747 from FHenry/14_fix_notif
fix: bad SQL parenthesis in notification
2022-11-07 19:00:21 +01:00
Laurent Destailleur
145176642c
Merge pull request #22762 from aspangaro/15p4
FIX Accountancy - Better warning for situation invoice in index
2022-11-07 18:46:00 +01:00
Alexandre SPANGARO
221ce01cdc FIX Accountancy - Better warning for situation invoice in index 2022-11-05 08:02:56 +01:00
Florian HENRY
d375aca2c8 fix bad SQL parenthesis in notification 2022-11-04 11:29:52 +01:00
Noé Courtier
f85b6315fb FIX: Wrong Extrafields Element For Assets" 2022-11-03 16:46:15 +01:00
Laurent Destailleur
ecdc92e219
Merge pull request #22688 from altairis-noe/public_ticket_check
FIX: check if contact is active before creating associated ticket
2022-11-02 16:54:20 +01:00
Noé Cendrier
bcfcbf19ec strictly inferior, please 2022-11-02 14:11:37 +01:00
Laurent Destailleur
870ffb6dda
Update create_ticket.php 2022-11-02 01:10:17 +01:00
Laurent Destailleur
414b183ead
Update create_ticket.php 2022-11-02 01:07:31 +01:00
Laurent Destailleur
634348d048
Update create_ticket.php 2022-11-02 01:02:52 +01:00
Laurent Destailleur
53b0e49886
Merge pull request #22687 from FHenry/15_fix_propal_right
15 fix propal right
2022-11-02 00:39:02 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
2022-11-02 00:15:21 +01:00
Laurent Destailleur
ff16d74bd2 FIX install wizard error management 2022-11-02 00:00:02 +01:00
Laurent Destailleur
ab2d306abd
Merge pull request #22692 from thomas-Ngr/14.0_fix_propal_page_reload
Fix propal page reload : use thirdparty values
2022-11-01 23:33:23 +01:00
Laurent Destailleur
8e9be8f40f
Update card.php 2022-11-01 23:33:08 +01:00
Laurent Destailleur
8b3c73a96a
Merge pull request #22702 from OPEN-DSI/14.0_fix_request_sql_entity_filter_for_usergroup
FIX: Fix the request SQL for transversal user
2022-11-01 21:48:19 +01:00
Laurent Destailleur
3b8d9c73a0
Merge pull request #22717 from inovea-conseil/15.0
15.0
2022-11-01 19:58:51 +01:00
Laurent Destailleur
f0b4cfc875
Merge pull request #22724 from aspangaro/14p42
FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format
2022-11-01 19:36:17 +01:00
Alexandre SPANGARO
d3d55240f9 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 08:00:37 +01:00
Alexandre SPANGARO
4bd9bdaccd FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 07:56:24 +01:00
IC-Nicolas
4bee8cc8ab
Merge pull request #2 from inovea-conseil/FIX-change_communication_status_prospect
FIX change in the communication status of the prospect
2022-10-31 14:23:27 +01:00
IC-faycal
5888f37677 FIX change in the communication status of the prospect 2022-10-31 13:53:26 +01:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
Alexandre SPANGARO
f45f3740e2 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-10-28 08:10:39 +02:00