lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
115,142 Commits 43 Branches 150 Tags 886 MiB
75d784a6eb
Commit Graph

2277 Commits

Author SHA1 Message Date
Laurent Destailleur
c7aa3b81f2
Merge pull request #21721 from frederic34/patch-4 
doc
 2022-08-12 00:00:22 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +02:00
Frédéric FRANCE
95878e13a7
doc 2022-08-11 16:51:41 +02:00
Laurent Destailleur
983a530251 Log 2022-08-11 14:36:50 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
This Charlène
60e12db1da
php v8 warning 2022-08-08 15:12:40 +02:00
Laurent Destailleur
37932c3fdc Debug v16. Fix non escaping for commobject field text 2022-08-02 21:14:05 +02:00
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
Laurent Destailleur
559ec051ab Fix scrutinizer 2022-06-12 11:43:29 +02:00
BB2A Anthony Berton
d8e6ce1ae8 FIX - php V8 warning class commonobject extrafields 2022-06-03 16:06:25 +02:00
Laurent Destailleur
b2e6f9fc68
Update commonobject.class.php 2022-06-03 11:12:55 +02:00
Sylvain Legrand
2fe29627e6 Fix error on change payment term 2022-06-03 08:59:19 +02:00
Laurent Destailleur
cbd12288d3
Merge pull request #21067 from bb2a/php-V8-warning-class-commonobject 
php V8 warning class commonobject
 2022-06-01 21:28:22 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
BB2A Anthony Berton
d7eebeb913 php V8 warning class commonobject 2022-05-31 11:41:38 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Laurent Destailleur
b95440b83f Fix picto phone 2022-05-31 09:57:49 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Laurent Destailleur
812298f740
Merge pull request #20945 from atm-maxime/fix_default_value_boolean 
Fix default value boolean
 2022-05-21 17:28:39 +02:00
Nicolas
d8a68d280e FIX missing morecss for multiselectarray 2022-05-21 17:06:36 +02:00
Maxime Kohlhaas
9b2a543170 Fix phpcs too long line 2022-05-21 15:49:27 +02:00
Maxime Kohlhaas
4932f86a2d Fix default value for boolean extrafield 2022-05-21 15:41:34 +02:00
Laurent Destailleur
b14c04a8f0 Fix regression 2022-05-21 15:02:14 +02:00
Norbert Penel
31c39226d6
Update commonobject.class.php 2022-05-20 21:57:02 +02:00
Norbert Penel
e77bf4a320
dangerous overwritting 2022-05-20 21:53:42 +02:00
Laurent Destailleur
168d1d4334
Merge pull request #20890 from Hystepik/develop#1 
Fix : php 8.0 warnings
 2022-05-20 19:41:20 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
3afeb16227 Debug v16 2022-05-18 13:37:49 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Laurent Destailleur
e7ab9a3545 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-11 10:06:01 +02:00
kevin
76b0deefb3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_Trigger_SetProject 2022-05-10 15:41:06 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
kevin
19cedae1c1 Add trigger on commonObject setProject 2022-05-06 16:14:38 +02:00
lvessiller
e01f912f41 Resolve conflicts 2022-05-04 11:11:05 +02:00
Laurent Destailleur
0a7d7d503b Make syntax for field_, titlefieldcreate, valuefieldcreate standard. 2022-05-04 00:52:49 +02:00
Laurent Destailleur
6ebe41324f Fix php8 compatibility 2022-05-03 16:29:57 +02:00
Laurent Destailleur
c87c695d43 Debug v16 2022-05-03 14:15:42 +02:00
lvessiller
734cdffa59 FIX resolve conflicts 2022-05-02 10:03:23 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Quentin-Seekness
726b899d30
FIX: Delete an extrafield where type is double 
Found the bug on a propal's extrafield, it was impossible to delete a decimal extrafield.  In updateExtraField() the $value stayed "" where it needed to be null.
The same issue can be found in insertExtraFields().
 2022-04-29 10:45:08 +02:00
lvessiller
a215dd8043 FIX stickler-ci 2022-04-14 11:27:11 +02:00
lvessiller
ab61c4d735 NEW show category tree in sellist and chkbxlst for common object 2022-04-14 11:08:05 +02:00
lvessiller
1cb56adb2e NEW products categories in inventory card 2022-04-13 15:44:27 +02:00