Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
124,136 Commits 35 Branches 179 Tags 1.7 GiB
5df2850dca
Commit Graph

8496 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
174d88fe96 Fix look and feel v18 2023-09-21 10:36:17 +02:00
Laurent Destailleur
8d254e341b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-16 14:11:26 +02:00
Laurent Destailleur
0d2d68dfc7 FIX #25934 #25929 2023-09-16 13:23:11 +02:00
Laurent Destailleur
5a7226f2ec Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-15 01:03:33 +02:00
Laurent Destailleur
ad1047c7c3 FIX #25919 2023-09-14 20:55:33 +02:00
Mélina JOUM
db299ee66a Fix translation 2023-09-14 12:07:28 +02:00
Laurent Destailleur
bf3c0e9d4a FIX Avoid duplicate popup when popup setup to work as ajax 2023-09-12 10:52:15 +02:00
Regis Houssin
b6e84b1c74 FIX use urlencode for origin and originid 2023-09-06 10:02:12 +02:00
Regis Houssin
927cc91da4 FIX avoid wrong backtopage url 2023-09-06 06:44:10 +02:00
Laurent Destailleur
6e7ca61b1f CSS 2023-08-29 21:45:20 +02:00
Laurent Destailleur
4eb95f67bf FIX Duplicate tooltip on ref of an agenda event 2023-08-29 12:07:38 +02:00
Laurent Destailleur
888e8d7588 FIX bad balance of TR tag in multicurrency price view 2023-08-23 21:56:02 +02:00
Laurent Destailleur
51f0beae0c Fix tooltip on action agenda 2023-08-17 18:41:17 +02:00
Laurent Destailleur
f2608e9c8c Fix css 2023-08-15 01:06:12 +02:00
Laurent Destailleur
cc69022ba5 Fix css 2023-08-15 01:01:46 +02:00