Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
111,473 Commits 36 Branches 190 Tags
29e64bee8b13c384ce77dbcc1bf3929ba0884c20
Commit Graph

2220 Commits

Author SHA1 Message Date
Laurent Destailleur
eda2b0dd71 Debug v16. Fix non escaping for commobject field text 2022-08-02 21:12:09 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
9286f84b47 Fix php8 2022-07-31 21:06:08 +02:00
Laurent Destailleur
ab2afd772b Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Laurent Destailleur
5e4ed0dea0 Update commonobject.class.php 2022-07-29 15:28:33 +02:00
Laurent Destailleur
c181b0bff4 Update commonobject.class.php 2022-07-29 15:27:20 +02:00
Laurent Destailleur
6d2219e00c Update commonobject.class.php 2022-07-29 15:26:34 +02:00
Laurent Destailleur
a4b7f38346 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_actions.php
	htdocs/core/boxes/box_contracts.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_services_expired.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
 2022-07-29 11:22:01 +02:00
Laurent Destailleur
482f80d14a Close #21612 2022-07-28 19:00:17 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13:13 +02:00
Yoan Mollard
d8fa7d84cc Allow "smallint" values to store 0 in MySQL db without conversion to NULL 
It was an issue with ConferenceOrBoothAttendee instances
 2022-07-26 14:40:17 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
46d3647877 Merge 2022-07-26 12:18:56 +02:00
Laurent Destailleur
ab4eb1a9af Debug v16 2022-07-26 12:16:33 +02:00
Laurent Destailleur
6d3059d2a8 Add type ip 2022-07-24 22:20:41 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
f024dcdb1a Doc 2022-07-24 22:13:36 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
lvessiller
e5877cb2e3 FIX product filter in inventory list (Issue #21504) 2022-07-15 09:33:27 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
3fbaea6a93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-10 18:25:22 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Francis Appels
6362cdfe2e FIX regression by php8 fix on setVarsFromFetchObj 2022-07-10 13:00:34 +02:00
Laurent Destailleur
33a65dd9b8 Merge pull request #21246 from Easya-Solutions/new-inventory-list-show-product-ref-with-label 
NEW show product label on inventory
 2022-07-07 22:08:06 +02:00
Laurent Destailleur
55ba95643b Merge pull request #21351 from Quatadah/dolicloud-qnasdami-product-allow-external-download 
NEW #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD
 2022-07-06 15:52:19 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
Laurent Destailleur
839c535774 Clean code 2022-07-03 19:18:24 +02:00
Laurent Destailleur
6f22c52280 Merge pull request #20927 from homer8173/patch-35 
dangerous overwritting
 2022-07-03 13:19:03 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Laurent Destailleur
13567fef15 Update commonobject.class.php 2022-07-03 12:37:32 +02:00
Laurent Destailleur
9328e89c15 Update commonobject.class.php 2022-07-03 12:35:44 +02:00
Laurent Destailleur
f0848d9f9f Debug v16 2022-06-30 15:58:59 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Anthony Berton
bc375ad007 Merge branch 'develop' into FIX---php-V8-expedition-card 2022-06-27 11:19:22 +02:00
Laurent Destailleur
f09638972c Debug v16 2022-06-27 10:45:04 +02:00
Laurent Destailleur
4e46c3f7a2 Clean code 2022-06-27 10:17:14 +02:00
BB2A Anthony Berton
6a80d81d4a FIX 2022-06-27 09:11:33 +02:00
lvessiller
7b7ecf44ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field 2022-06-24 17:30:14 +02:00
Quatadah Nasdami
ce7db0004b two changes to feature request 2022-06-22 14:41:46 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
lvessiller
61a9521e3c NEW Changelog and reorder getNomUrl parameters 2022-06-17 17:32:22 +02:00
Faustin
354b4a7417 BUG FIX Deprecated attribute fk_projet wasn't declared on class CommonObject 2022-06-17 06:03:48 +02:00
lvessiller
813a87eb3c FIX resolve conflicts 2022-06-16 17:32:53 +02:00
lvessiller
d5269cd97b FIX resolve conflicts 2022-06-16 17:08:00 +02:00
Laurent Destailleur
f0f24291d4 Debug v16 2022-06-14 10:40:10 +02:00
Laurent Destailleur
985c581c01 php8 2022-06-13 18:09:06 +02:00
lvessiller
dddd4186a8 NEW show product label on inventory 2022-06-13 15:37:43 +02:00