Commit Graph

8514 Commits

Author SHA1 Message Date
Regis Houssin
85a08a9288 FIX sometimes a string type instead integer is return, why ? 2024-03-31 19:17:58 +02:00
Laurent Destailleur
a0b26ae7cd FIX Amount of localtaxes in foreign currency was wrong on screen and PDF 2024-03-13 22:04:44 +01:00
Laurent Destailleur
ebe68c9075 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-18 17:06:36 +01:00
Laurent Destailleur
b3720deda4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-18 17:05:11 +01:00
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
lvessiller-opendsi
e3ad92df44
FIX check parameter socid before cloning a customer proposal (#28085) 2024-02-09 14:09:03 +01:00
lvessiller-opendsi
cdad15bae3
FIX user filter in per user view of event list (#28049) 2024-02-07 16:28:12 +01:00
Laurent Destailleur
6d9065ebbe Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-28 13:45:54 +01:00
Laurent Destailleur
fd39b3270c Fix css 2024-01-28 13:37:16 +01:00
Maximilien Valenzano
da625fc847 fix: propal use devise changes 2024-01-25 12:06:13 +01:00
VESSILLER
e773aebb6a FIX not load all contacts by default when creating an event 2024-01-23 14:12:07 +01:00
VESSILLER
26a05d3046 FIX update price extrafield on propal card 2024-01-19 10:15:42 +01:00
Laurent Destailleur
e6c3c5993d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-15 17:14:27 +01:00
Laurent Destailleur
0cc66bbed6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-15 14:35:18 +01:00
HENRY Florian
13ddcb9552
fix: filter on date lost on sort (#27467) 2024-01-12 18:04:00 +01:00
Laurent Destailleur
4374aa1a20 FIX Bad visible status of proposal after reopen 2024-01-12 16:31:49 +01:00
Laurent Destailleur
ca05d75644 Fix warning message 2024-01-08 11:11:20 +01:00
Can Arslan
b6e8e518d1
FIX: Ternary operator condition is always true/false 2023-12-21 08:35:54 -07:00
Laurent Destailleur
450cbbb76d FIX can edit reminders on past events 2023-12-21 14:35:40 +01:00
Laurent Destailleur
f9f3d3a6e1 FIX can edit reminders on past events 2023-12-21 14:27:05 +01:00
Laurent Destailleur
4dcd7955ef FIX Error on emailreminder not reported 2023-12-18 17:42:17 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.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
	htdocs/ticket/list.php
2023-12-17 22:06:48 +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
Laurent Destailleur
f755ad51ab Fix log 2023-11-21 12:17:30 +01:00
Laurent Destailleur
37a9eed471 FIX Email reminder template must not be visible when option is off 2023-11-21 11:19:38 +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
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
2023-11-12 23:06:31 +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
atm-lena
0946220e9b
Check price base type (#26503)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-11-09 15:41:39 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
atm-jonathan
f36e8b935c
Fix list agenda (#26394)
* int $nbtotalrecord list agenda

* nbtotal of record should  be number not a string

* ternaire isnumeric $nbtotalofrecords
2023-11-01 15:58:45 +01:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc
FIX check tva_tx before comparing price_min_ttc (#25220)
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
2023-10-16 04:07:10 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Laurent Destailleur
4cb3ecb11e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-10 22:47:20 +02: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
Laurent Destailleur
4afda75a4d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-05 21:01:34 +02:00
Andrés Maldonado
ab1071b70a 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
2023-10-04 18:31:20 +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
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00