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
118,803 Commits 35 Branches 179 Tags 1.7 GiB
daccab5a07
Commit Graph

8182 Commits

Author SHA1 Message Date
atm-lena
4d32d93ee2 Clean Travis 2023-12-18 17:28:41 +01:00
atm-lena
9051e411d0 FIX Multilangs : PDF lines description 2023-12-18 12:00:41 +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
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
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
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
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
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
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
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
fa62595ed1
Merge pull request #25537 from atm-thibaultf/FIX_reload_linked_objects_on_propal_closeas 
FIX_reload_linked_objects_on_propal_closeas
 2023-08-09 13:32:54 +02:00
atm-sami
76f0a57e91
FIX propal list : warning if product module is not enabled (#25583) 2023-08-08 20:23:53 +02:00
atm-thibaultf
67e938bdfa FIX_reload_linked_objects_on_propal_closeas 2023-08-02 11:52:03 +02:00
Laurent Destailleur
e01f05cf96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-02 21:16:50 +02:00
Laurent Destailleur
8d91ffcd22 Fix separator 2023-07-02 21:15:29 +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
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
f5ee615c9f FIX default value for condition of payment on proposal 2023-06-15 13:19:52 +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
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
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
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +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
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
a3a9d1ac9f Fix SQL error 2023-05-10 18:56:17 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
Laurent Destailleur
3af71d5ded Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-08 14:44:01 +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