lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
84,092 Commits 43 Branches 150 Tags 886 MiB
ea7c2aa46b
Commit Graph

7743 Commits

Author SHA1 Message Date
Laurent Destailleur
5c48f6f405 Lang of web site is optional 2020-02-20 01:08:53 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501 GETPOST(..., 'alpha') remove " if found instead of returning '' 2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850 FIX #13124 2020-02-19 03:07:12 +01:00
Laurent Destailleur
016c7ad875 FIX #13135 2020-02-19 01:17:16 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
 2020-02-17 12:21:07 +01:00
Laurent Destailleur
20797920d7 Fix phpcs 2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
dc3a15945d Add method getKanbanView() 2020-02-16 12:05:00 +01:00
Laurent Destailleur
6c9fb06292 Perf 2020-02-15 10:56:44 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3 Fix var not initialized 2020-02-13 12:33:34 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 09:44:08 +00:00
Laurent Destailleur
4981da235c Fix phpcs 2020-02-12 22:00:44 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4 
Show extrafields only when enabled
 2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14 
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
 2020-02-12 18:46:08 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
05f0242198 NEW The info_admin() can show text after click on other text 2020-02-11 10:38:09 +01:00
Anthony Berton
6b6355f373
Update html.form.class.php 2020-02-11 09:57:52 +01:00
Laurent Destailleur
5823e2f5ef add warning 2020-02-10 20:57:55 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop 
Add time tags to Receipt Printers module
 2020-02-10 15:37:37 +01:00
simicar29
8bce409db0
Show extrafields only when enabled 
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
 2020-02-10 13:14:42 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb Responsive 2020-02-10 00:47:44 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
andreubisquerra
37e815183e
Add time tags 2020-02-09 14:06:02 +01:00
Laurent Destailleur
665876ffa4
Merge pull request #13061 from andreubisquerra/develop 
Add and finish receipt printer tags
 2020-02-08 16:19:44 +01:00
pnueda
c083458adf Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1 
Update html.formfile.class.php
 2020-02-08 16:18:17 +01:00
Laurent Destailleur
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity 
on its parent.
 2020-02-08 14:40:30 +01:00
andreubisquerra
1e5940fbf0
Fix travis errors 2020-02-07 19:25:28 +01:00
andreubisquerra
ae06151146
Add and finish receipt printer tags 2020-02-07 18:34:58 +01:00
pnueda
8eb9c10788
Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-07 18:01:14 +01:00
Laurent Destailleur
84c1228ad4 FIX Disable ticket status change if ticket close 
FIX Use ref into label of ticket message
 2020-02-07 12:15:15 +01:00
Laurent Destailleur
53e1b80742 FIX Disable ticket status change if ticket close 
FIX Use ref into label of ticket message
 2020-02-07 11:52:55 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
 2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder 
NEW Hidden option MAIN_TEMP_DIR
 2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php 2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php 2020-02-05 20:42:03 +01:00
stickler-ci
1ecef695f8 Fixing style errors. 2020-02-05 19:40:22 +00:00
Laurent Destailleur
3e73e97f24
Update conf.class.php 2020-02-05 20:39:38 +01:00
Laurent Destailleur
98ac0428a5
Update conf.class.php 2020-02-05 20:37:49 +01:00
Laurent Destailleur
fdfc45bbe9 Fix wrapping 2020-02-05 15:04:11 +01:00
andreubisquerra
220f02805d Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)

Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2020-02-05 14:12:29 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop 
Update image path after move image directory
 2020-02-05 14:10:12 +01:00
andreubisquerra
e6dc384ee9
Add bold tags 2020-02-03 19:33:23 +01:00
Laurent Destailleur
97d726733c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 2020-02-03 06:36:43 +01:00
Laurent Destailleur
d8ed62ea33 Fix line_max for BOM 2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Laurent Destailleur
1dab308e4a FIX #12932 2020-02-03 03:55:37 +01:00
andreubisquerra
a4c1c00728
Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
 2020-02-02 21:02:43 +01:00
Laurent Destailleur
2dd1e34c2d Fix phpcs 2020-01-31 19:01:31 +01:00
Laurent Destailleur
ad6758c4da Fix bad var 2020-01-31 18:03:45 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
Laurent Destailleur
51c6540a56 WIP Advanced search 2020-01-30 23:28:50 +01:00
Laurent Destailleur
c0bf89929f Code comment 2020-01-30 19:14:59 +01:00
Laurent Destailleur
b47e1bd8e8 Fix protection when creating extrafield of type separator 2020-01-30 18:47:41 +01:00
Laurent Destailleur
7b92aaa115 Fix templateResult into templateSelection 2020-01-30 18:45:50 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
4b0ca24ca3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:51 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-29 23:06:21 +01:00
Laurent Destailleur
e13f1509b3
Merge pull request #12965 from frederic34/patch-6 
Update extrafields.class.php
 2020-01-29 22:57:01 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
Frédéric FRANCE
dcc8b4b65e
Update extrafields.class.php 2020-01-29 15:35:46 +01:00
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
 2020-01-29 11:44:04 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
Tobias Sekan
8b3eb35cd1
[NEW] Hidden option MAIN_TEMP_DIR 2020-01-29 10:55:56 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name 2020-01-28 08:55:49 +01:00
Laurent Destailleur
4a5dca4a3d Fix test 2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1 
New : Add native spellcheck to CKEditor
 2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php 2020-01-26 23:31:19 +01:00
Laurent Destailleur
8ff19a2a0f WIP search component 2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f Can choose text to show when there is no data 2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59 Fix phpcs 2020-01-25 14:40:16 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:38:14 +01:00