Commit Graph

7874 Commits

Author SHA1 Message Date
Laurent Destailleur
1a14c19cd2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-18 17:03:18 +01:00
Laurent Destailleur
f9426f30a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-18 17:02:55 +01:00
MaximilienR-easya
05cf98fae8 Fix lost POST data when redirection after drag_n_drop an event inside the agenda (#28212) 2024-02-18 16:38:46 +01:00
HENRY Florian
13ddcb9552 fix: filter on date lost on sort (#27467) 2024-01-12 18:04:00 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Marc de Lima Lucio
786ea1029e FIX: more correctly parse the select part to be replaced in sql queries, part 2 2023-11-18 12:40:10 +01:00
Marc de Lima Lucio
a3fa8b82fa FIX: more correctly parse the select part to be replaced in sql queries 2023-11-09 17:04:13 +01:00
Laurent Destailleur
94e8580cbb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-10 22:39:52 +02:00
Laurent Destailleur
152b0178c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-10 22:38:20 +02:00
Laurent Destailleur
e2d3404651 Merge pull request #22475 from atm-kevin/FIX_Enable_Negative_Qty_In_Propal
FIX : Propal's negative quantities
2023-10-06 19:10:07 +02:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
2023-10-04 17:48:30 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
2023-10-04 10:22:33 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
VESSILLER
2980d90bdd Fix load thirdparty object once time 2023-09-28 08:49:13 +02:00
VESSILLER
afe71305fa FIX thirdparty object in proposal card is not loaded 2023-09-27 12:15:44 +02:00
Florian HENRY
505ea31c30 FIX: TVA calc option must be the same on update line as on create line 2023-06-29 16:50:21 +02:00
Laurent Destailleur
2695dd2e7a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
2023-06-10 12:11:57 +02:00
Laurent Destailleur
71d064e8db Fix phpcs 2023-06-10 12:06:30 +02:00
Jean
e1939d1c06 FIX #20304 propaldates update 2023-06-10 09:55:47 +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
stickler-ci
2c97b66c24 Fixing style errors. 2023-05-16 14:57:46 +00:00
avolani
79cacf58c2 Update propal.class.php
Fix IDs on created proposal lines when cloning so the hook createFrom has all the clone infos
2023-05-16 16:53:58 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Adrien Raze
1d59cdc41b FIX : Add the possibility to events oxwner to check their events from the list when the perm "Read the actions (events or tasks) of others" is not active 2023-04-03 10:13:11 +02:00
Laurent Destailleur
dfd0bd8107 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-31 02:48:17 +02:00
Laurent Destailleur
520280479c Merge pull request #24197 from glu000/16.0-issue-23966-2
FIX  #[23799] - External users are not able to create events - correction
2023-03-27 08:30:41 +02:00
Gilles Lengy
885b767a1f FIX|Fix #24298 No error or 0.00 instead of NULL in database anymore when emptying an extrafield of type price on a propal card 2023-03-22 20:26:19 +01:00
Guenter Lukas
914096bd0a update 2023-03-13 08:45:29 +01:00
Laurent Destailleur
f6b8cd0208 Merge branch '16.0' into 16.0-issue-23799 2023-03-12 17:47:02 +01:00
Laurent Destailleur
1cf3cc4813 Merge pull request #24144 from frederic34/patch-8
Fix translation
2023-03-10 19:14:17 +01:00
Laurent Destailleur
7a59c0ef4b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-10 13:03:11 +01:00
Frédéric FRANCE
2863481629 Update list.php 2023-03-07 10:26:21 +01:00
Laurent Destailleur
89810f97c1 Merge pull request #23941 from ATM-Consulting/FIX_propalestats_SQL_unknown_column_fk_soc
FIX: SQL error "unknown column p.fk_soc"
2023-03-03 13:41:32 +01:00
Laurent Destailleur
51a890bf1a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:30:02 +01:00
Laurent Destailleur
59f2644d46 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:29:35 +01:00
Nicolas
50d4f2d90f FIX select for task in event card 2023-03-03 12:00:24 +01:00
GregM
87fa075ce0 Fix 16.0 propalestats 2023-03-03 10:20:45 +01:00
Laurent Destailleur
7994825086 Update list.php 2023-03-02 13:39:08 +01:00
Regis Houssin
4877c80c36 FIX missing "authorid" for getNomUrl link right access 2023-02-28 16:44:32 +01:00
atm-florian
b29ebef05f Propale stats: reworking of the fix to comply with travis rule for SQL string building 2023-02-23 18:03:00 +01:00
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
2023-02-17 00:10:00 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Guenter Lukas
3a8fbd3aa8 update 2023-02-06 10:32:54 +01:00
Laurent Destailleur
e04a44e4ce Merge pull request #23786 from glu000/16.0-issue-23785
Fix #23785 Box "Last changed vendors": External users can see all suppliers on htdocs/comm/index.php
2023-02-06 00:18:21 +01:00
Laurent Destailleur
b52203b4e0 Update peruser.php 2023-02-06 00:05:06 +01:00
Laurent Destailleur
a0f8a2454b Update peruser.php 2023-02-06 00:04:19 +01:00