Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
126,677 Commits 36 Branches 190 Tags
fca403b49bbee1ac7af7f99d34706d44eb8d3afc
Commit Graph

126677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8c7ec0f7a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-05 20:59:02 +02:00
Laurent Destailleur
0af268056e Merge pull request #26116 from am97/fix/17.0/clone 
FIX: modification of complementary attributes in commercial proposals
 2023-10-05 20:56:26 +02:00
Laurent Destailleur
876f45e3fd Merge pull request #26115 from am97/fix/16.0/clone 
FIX: modification of complementary attributes in commercial proposals
 2023-10-05 20:52:02 +02:00
Laurent Destailleur
5b0483bf13 Merge pull request #26113 from defrance/patch-277 
php warning and field not used
 2023-10-05 20:47:40 +02:00
Laurent Destailleur
e0ff53bcaa Merge pull request #26106 from thomas-Ngr/develop_fix_duplicate_ticket_information 
fix ticket card: set origin_email to null
 2023-10-05 20:42:25 +02:00
Laurent Destailleur
8488c05b6a Merge pull request #24872 from MaximilienR-easya/dev_New_linked_file_shared_public_side 
New access to msg linked files via public interface
 2023-10-05 20:41:23 +02:00
Laurent Destailleur
0f448389d1 Update actions_ticket.class.php 2023-10-05 20:40:24 +02:00
Laurent Destailleur
a2b6532c5a Debug v19 2023-10-05 16:32:38 +02:00
Laurent Destailleur
553776a77a Enhance error message when set character set failed 2023-10-05 12:58:44 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +02:00
Laurent Destailleur
6e40408683 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 11:27:41 +02:00
Laurent Destailleur
76a7801975 Fix warning 2023-10-05 11:27:00 +02:00
Laurent Destailleur
1b8c72f30d fix html typo 2023-10-05 11:08:19 +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
3700b047ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:54 +02:00
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Laurent Destailleur
78db102acd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-04 13:03:27 +02:00
Laurent Destailleur
2a96ac6428 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 12:43:03 +02:00
Charlène Benke
bf1437ff8b Update note.php 2023-10-04 12:17:56 +02:00
Charlène Benke
f59a0f5eba warning error and duplicate 2023-10-04 12:17:02 +02:00
Laurent Destailleur
a2ea4d77c3 Merge 2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:32:24 +02:00
Laurent Destailleur
c3585930e5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 10:23:22 +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
997e14a293 Merge pull request #26105 from rycks/15.0_fix_global_object_var_for_multicompany_online_sign 
fix #26104 : remove global object
 2023-10-04 10:01:44 +02:00
Laurent Destailleur
74f486bd60 Merge pull request #26034 from atm-quentin/FIX_rights_paiement_sc 
FIX rights paymentsc paiementcharge
 2023-10-04 09:47:49 +02:00
Laurent Destailleur
ee4d662ca7 Merge pull request #26091 from elkoiko/fix-warnings-contrat-and-contratligne 
FIX warnings for undefined properties in Contrat and ContratLigne
 2023-10-04 09:46:11 +02:00
tnegre
df097d74bd fix ticket card: set origin_email to null 2023-10-04 09:43:54 +02:00
Laurent Destailleur
dd2e68d8ea Merge pull request #26097 from hregis/fix_wrong_entity_field 
FIX field entity is DEFAULT 1 NOT NULL
 2023-10-04 09:42:48 +02:00
Laurent Destailleur
1ad05e2a73 Merge pull request #26098 from aspangaro/19a8 
NEW Project - List - use select2 multiselect for status
 2023-10-04 09:41:29 +02:00
Laurent Destailleur
b145dd4e82 Merge pull request #26101 from Easya-Solutions/14.0_fix-product-list-stock-rounded 
FIX regression on rounding stocks fields on product list
 2023-10-04 09:39:27 +02:00
Laurent Destailleur
884aad581b Merge pull request #26103 from declic3000/patch-2 
FIX : Update api_supplier_orders.class.php
 2023-10-04 09:34:34 +02:00
Eric Seigne
563cdcefb3 fix #26104 : remove global object 2023-10-04 00:10:19 +02:00
Laurent Destailleur
73bdb71507 Fix bom 2023-10-03 19:54:06 +02:00
Laurent Destailleur
5bcd89d66c Debug v19 2023-10-03 19:39:22 +02:00
Guillaume Wauquier
3b6f4f717c FIX : Update api_supplier_orders.class.php 
Constat : L'api ne renvoie pas le même resultat que l'interface dolibarr. la construction de la requete est incorrecte.

Requete obtenu avant correctif:
SELECT t.rowid, sc.fk_soc, sc.fk_user, t.fk_soc
FROM llx_commande_fournisseur as t,
     llx_societe_commerciaux as sc
WHERE t.entity IN (1) AND t.fk_soc = sc.fk_soc AND t.rowid = sc.fk_soc AND sc.fk_user = 4
ORDER BY t.rowid ASC
LIMIT 101

Le t.rowid = sc.fk_soc compare des endives et des parpaings. => suppression de la ligne 143 à 145.

Et ensuite correction des conditionnelles pour construire une requete correcte.
 2023-10-03 19:37:43 +02:00
VESSILLER
49d084721b FIX regression on rounding stocks fields on product list 2023-10-03 09:17:32 +02:00
Alexandre SPANGARO
5f6a4bb785 Merge branch 'develop' into 19a8 2023-10-03 03:27:46 +02:00