Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
8b20c5ed
Commit
8b20c5ed
authored
7 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
FIX Remove warning when using log into syslog
parent
a6a14275
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/accountancy/journal/bankjournal.php
+8
-3
8 additions, 3 deletions
htdocs/accountancy/journal/bankjournal.php
htdocs/core/modules/syslog/mod_syslog_syslog.php
+4
-4
4 additions, 4 deletions
htdocs/core/modules/syslog/mod_syslog_syslog.php
with
12 additions
and
7 deletions
htdocs/accountancy/journal/bankjournal.php
+
8
−
3
View file @
8b20c5ed
...
...
@@ -172,13 +172,16 @@ if ($result) {
{
$obj
=
$db
->
fetch_object
(
$result
);
$lineisapurchase
=
(
$obj
->
label
==
'(SupplierInvoicePayment)'
||
$obj
->
label
==
'(SupplierInvoicePaymentBack)'
);
$lineisasell
=
(
$obj
->
label
==
'(CustomerInvoicePayment)'
||
$obj
->
label
==
'(CustomerInvoicePaymentBack)'
);
// Set accountancy code (for bank and thirdparty)
$compta_bank
=
$obj
->
account_number
;
$compta_soc
=
'NotDefined'
;
if
(
$
obj
->
label
==
'(SupplierInvoicePayment)'
||
$obj
->
label
==
'(SupplierInvoicePaymentBack)'
)
if
(
$
lineisapurchase
)
$compta_soc
=
(
!
empty
(
$obj
->
code_compta_fournisseur
)
?
$obj
->
code_compta_fournisseur
:
$account_supplier
);
if
(
$
obj
->
label
==
'(CustomerInvoicePayment)'
||
$obj
->
label
==
'(CustomerInvoicePaymentBack)'
)
if
(
$
lineisasell
)
$compta_soc
=
(
!
empty
(
$obj
->
code_compta
)
?
$obj
->
code_compta
:
$account_customer
);
$tabcompany
[
$obj
->
rowid
]
=
array
(
...
...
@@ -604,6 +607,8 @@ if (! $error && $action == 'writebookkeeping') {
}
}
// Export
if
(
$action
==
'exportcsv'
)
{
// ISO and not UTF8 !
$sep
=
$conf
->
global
->
ACCOUNTING_EXPORT_SEPARATORCSV
;
...
...
@@ -936,7 +941,7 @@ $db->close();
* Return source for doc_ref of a bank transaction
*
* @param string $val Array of val
* @param string $typerecord Type of record
* @param string $typerecord Type of record
('payment', 'payment_supplier', 'payment_expensereport', 'payment_vat', ...)
* @return string|unknown
*/
function
getSourceDocRef
(
$val
,
$typerecord
)
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/syslog/mod_syslog_syslog.php
+
4
−
4
View file @
8b20c5ed
...
...
@@ -49,7 +49,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
public
function
isActive
()
{
global
$conf
;
// This function does not exists on some ISP (Ex: Free in France)
if
(
!
function_exists
(
'openlog'
))
return
0
;
...
...
@@ -81,15 +81,15 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
*/
public
function
checkConfiguration
()
{
global
$langs
;
global
$conf
,
$langs
;
$errors
=
array
();
$facility
=
SYSLOG_FACILITY
;
$facility
=
constant
(
$conf
->
global
->
SYSLOG_FACILITY
)
;
if
(
$facility
)
{
// Only LOG_USER supported on Windows
if
(
!
empty
(
$_SERVER
[
"WINDIR"
]))
$facility
=
'LOG_USER'
;
if
(
!
empty
(
$_SERVER
[
"WINDIR"
]))
$facility
=
constant
(
'LOG_USER'
)
;
dol_syslog
(
"admin/syslog: facility "
.
$facility
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment