lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

7700 Commits

Author SHA1 Message Date
Laurent Destailleur
db95339085 Code comment 2021-07-05 20:32:05 +02:00
Laurent Destailleur
a04ed363c7 Look and feel v14 2021-07-05 19:28:50 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
f648185839 Fix phpcs 2021-07-05 17:34:25 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Laurent Destailleur
8b07e99e05 Fix for ' inserted by CKEditor instead of ' 2021-07-05 16:08:47 +02:00
ATM john
752fe22c68 Add simple auto mode 2021-07-04 23:24:38 +02:00
ATM john
a709cc583f Add modal option to btn 2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Laurent Destailleur
bf7f8f7c45 Fix phpcs 2021-06-30 17:28:23 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
a914ffa42c CSS 2021-06-30 15:00:04 +02:00
Florian Mortgat
5d4c40fffa Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8 FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead) 2021-06-30 09:34:49 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet 
NEW: project time spent: conf to prevent recording time after X months
 2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00
Laurent Destailleur
2e2d9002ad Code comment 2021-06-27 14:54:17 +02:00
Laurent Destailleur
4ff2ff779b css 2021-06-26 16:35:33 +02:00
Laurent Destailleur
b3b96ddb7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b Look and feel v14 2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
lmarcouiller
98244a5e44 Fix : error display fr phone number 2021-06-24 14:20:19 +02:00
Florian Mortgat
d0a4ae88b1 NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object 2021-06-24 11:50:34 +02:00
Laurent Destailleur
d57699b7d7 css 2021-06-23 10:22:51 +02:00
Alexandre SPANGARO
f1a5d4009f Merge remote-tracking branch 'upstream/develop' into 14b15 2021-06-22 14:07:52 +02:00
Laurent Destailleur
8887f71c26 Doc 2021-06-22 10:57:16 +02:00
ATM john
4d043b713c WIP - create validation method for common object 2021-06-21 21:54:03 +02:00
Alexandre SPANGARO
23f6e183d3 Forget information in tooltip for direct download 2021-06-21 21:51:41 +02:00
Laurent Destailleur
bb8d5cec1b More complete management of 
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
 2021-06-21 11:36:28 +02:00
Laurent Destailleur
5bfd82e528 Clean code 2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d Introduce option 
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
 2021-06-21 11:13:30 +02:00
Laurent Destailleur
65110411ac Doc 2021-06-20 17:20:12 +02:00
Laurent Destailleur
f486595e13 Fix dolSqlDateFilter 2021-06-20 16:55:22 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
edb4cf4130 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	README.md
	htdocs/filefunc.inc.php
 2021-06-19 20:05:25 +02:00
Frédéric FRANCE
5d79143401
fix php warning 2021-06-16 11:50:52 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0 
Fix create image thumbs on php 8.0
 2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php 2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
9ba0fe07f0 Fix phpcs 2021-06-12 18:47:29 +02:00
ATM john
43ecba2e63 WIP - create validation method for common object 2021-06-12 14:16:40 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts 
add more capabilities for zapier
 2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat 
Adding hooks on product stat in order to allow to expand stat on othe…
 2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php 2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php 2021-06-11 19:32:25 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice 
remove useless check on invoice line content when generating pdf
 2021-06-11 18:13:58 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix 2021-06-10 20:32:45 +02:00
Alexis LAURIER
1a2434818d remove useless check on deposit line content when generating pdf 2021-06-10 18:00:49 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
c4dcad5e6b Fix regression 2021-06-10 11:57:42 +02:00
Laurent Destailleur
ea0db5a574 Fix popup of invoice 2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2 Fix v14 2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
f472ff4fd9 Add phpunit for dol_eval 2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659 NEW Reduce scope of dol_eval function. 2021-06-09 17:44:42 +02:00
Laurent Destailleur
0b7b12685f Clean code 2021-06-09 16:41:43 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
c375668ab6 Clean code 2021-06-09 12:41:53 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
Marc de Lima Lucio
4c6dfd8d5c Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop 2021-06-09 11:03:04 +02:00
MOREAU FRANCK
a141d722ad Adding hooks on product stat in order to allow to expand stat on other modules 
stickler-ci test corrections
 2021-06-09 08:39:06 +02:00
Marc de Lima Lucio
6733d278d8 NEW: project time spent: conf to prevent recording time after X months 2021-06-08 18:13:18 +02:00
MOREAU FRANCK
4b8dfc1abe Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 18:11:59 +02:00
MOREAU FRANCK
2e66509245 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 15:47:20 +02:00
MOREAU FRANCK
207dc1df55 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 12:34:26 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts 2021-06-06 17:09:35 +02:00
Laurent Destailleur
a1bb7129da Debug v14 2021-06-06 15:29:49 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email 2021-06-06 10:32:04 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880 Fix typo 2021-06-05 15:28:41 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
ddbfb5d734 Fix translation of note of product 2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836 Fix bad name of var 2021-06-05 11:07:38 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2 
Fix #17743 newpayement source membersubscription is member
 2021-06-04 13:04:17 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning 2021-06-03 08:33:44 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member 
Fix #17743 newpayement source membersubscription is not valid anymore

@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
 2021-05-27 21:09:49 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF 2021-05-27 00:02:01 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Laurent Destailleur
b9de8561a9 Fix regression 2021-05-25 15:59:36 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Laurent Destailleur
31af74f852 FIX CWE-269 - huntr - Can download files of an agenda event 2021-05-24 20:07:04 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
a3c28edfbb Fix regenerate wrapper when rebuilding cache 2021-05-20 10:34:49 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
78cf2b59c8 Debug feature copy-paste on smarpthone 2021-05-19 11:47:58 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918 css 2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1 
Compatibility phpv8
 2021-05-17 16:29:49 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
stickler-ci
b8a3485c4c Fixing style errors. 2021-05-11 19:33:23 +00:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
kastoras
cd9ea9566b Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE 2021-05-11 22:31:38 +03:00
kastoras
55caff1dd9 Merge remote-tracking branch 'origin/create_share_on_file_upload_with_other_setup' into develop 2021-05-11 22:23:12 +03:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete 
bug fix - deletion of invoice supplier payment
 2021-05-11 19:27:05 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6 
Fix Title supplier proposal
 2021-05-11 18:18:35 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Alexandre SPANGARO
427221c8d3 Merge remote-tracking branch 'upstream/develop' into 14b6 2021-05-11 07:02:04 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00
Alexandre SPANGARO
100b0f297e Fix Title supplier proposal contact card 2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41 Move title to v14 ergonomy 2021-05-10 06:26:58 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
stickler-ci
fc26e5eecf Fixing style errors. 2021-05-07 20:42:53 +00:00
kastoras
1a385052f6 New Create share link on file upload 
Create MAIN_CREATE_SHARE_ON_FILE_UPLOAD, when this set to 1 and a file is uploaded a shared link will be created
 2021-05-07 23:39:14 +03:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead 
complete $template['head'] in module and return 0 to not replace instead return $head and replace
 2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00