Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 03:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

9579 Commits

Author SHA1 Message Date
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
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
8a2e0aa7cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-10-15 14:56:20 +02:00
Pascal Hubrecht
bd1ae42ece New | Add AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST hidden conf to change sort method of actions (#25375) 
* Position defined in dictionnary must be main sort criterion

The position defined in the dictionary must be the main sort criterion.

* Use AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST hidden conf to sort by position
 2023-10-12 17:18:50 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
cc552a498c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-11 12:04:37 +02:00
Regis Houssin
cdf4292415 FIX remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used (#26143) 
* FIX (WIP) remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used

* FIX optimize code

* FIX replace with $this->db->prefix()

* FIX works on uniformize MULTICOMPANY_TRANSVERSE_MODE

* FIX syntax error
 2023-10-11 11:38:56 +02:00
Laurent Destailleur
e488243dd8 Standardize code 2023-10-11 11:34:42 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +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
dev2a
765d60efdf Fix: Apply rector rule user permission on comm folder (#26163) 2023-10-10 09:14:30 +02:00
Laurent Destailleur
e19e1da5de CSS 2023-10-09 17:12: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
f5534586c1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 21:09:21 +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
Laurent Destailleur
c3ae353a2a Work on session add 2023-10-04 21:12:50 +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
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +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
Laurent Destailleur
e20b43d8b5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-29 00:21:55 +02:00
Laurent Destailleur
f2bfdb318e phpcs 2023-09-29 00:19:32 +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
b9336c024a Merge pull request #25566 from hansemschnokeloch/rest-extra 
Add filter to restrict the data returned
 2023-09-27 00:56:51 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
pascal
19a528bed4 mv fetch_project to card.php 2023-09-25 20:48:43 +02:00
Pascal Hubrecht
7c8403d82f Merge branch 'Dolibarr:develop' into develop-1 2023-09-25 20:37:58 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
174d88fe96 Fix look and feel v18 2023-09-21 10:36:17 +02:00
Laurent Destailleur
613346bb97 Merge pull request #25960 from Hystepik/fix-boocal-bugs 
fix some bugs in bookcal module
 2023-09-19 23:25:45 +02:00
Laurent Destailleur
9c1e3fc6a0 Look and feel v19 - message view use the action type icon 2023-09-18 18:41:52 +02:00
Laurent Destailleur
ba7c03fbf7 Fix tzuser on link to create an event 2023-09-18 16:31:37 +02:00
Hystepik
2347d5cb9a fix some bugs in bookcal module 2023-09-18 13:12:11 +02:00
Laurent Destailleur
d02c615f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-16 15:14:22 +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
bb0c53996f FIX #25929 #25934 2023-09-16 13:20:04 +02:00
Laurent Destailleur
44068850ae Code comment 2023-09-16 13:13:58 +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