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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
01c2a831
Commit
01c2a831
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
parents
de8ced60
aee5f6dd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/adherents/class/adherent_type.class.php
+15
-11
15 additions, 11 deletions
htdocs/adherents/class/adherent_type.class.php
htdocs/adherents/type.php
+4
-1
4 additions, 1 deletion
htdocs/adherents/type.php
htdocs/compta/facture.php
+11
-4
11 additions, 4 deletions
htdocs/compta/facture.php
with
30 additions
and
16 deletions
htdocs/adherents/class/adherent_type.class.php
+
15
−
11
View file @
01c2a831
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
@@ -35,10 +36,14 @@ class AdherentType extends CommonObject
...
@@ -35,10 +36,14 @@ class AdherentType extends CommonObject
public
$table_element
=
'adherent_type'
;
public
$table_element
=
'adherent_type'
;
public
$element
=
'adherent_type'
;
public
$element
=
'adherent_type'
;
var
$id
;
var
$ref
;
var
$libelle
;
var
$libelle
;
var
$cotisation
;
// Soumis a la cotisation
var
$cotisation
;
// Soumis a la cotisation
var
$note
;
var
$vote
;
// droit de vote
var
$vote
;
// droit de vote
var
$mail_valid
;
//mail envoye lors de la validation
var
$mail_valid
;
//mail envoye lors de la validation
var
$statut
;
/**
/**
...
@@ -110,7 +115,7 @@ class AdherentType extends CommonObject
...
@@ -110,7 +115,7 @@ class AdherentType extends CommonObject
$sql
.
=
"note = '"
.
$this
->
db
->
escape
(
$this
->
note
)
.
"',"
;
$sql
.
=
"note = '"
.
$this
->
db
->
escape
(
$this
->
note
)
.
"',"
;
$sql
.
=
"vote = '"
.
$this
->
vote
.
"',"
;
$sql
.
=
"vote = '"
.
$this
->
vote
.
"',"
;
$sql
.
=
"mail_valid = '"
.
$this
->
db
->
escape
(
$this
->
mail_valid
)
.
"'"
;
$sql
.
=
"mail_valid = '"
.
$this
->
db
->
escape
(
$this
->
mail_valid
)
.
"'"
;
$sql
.
=
" WHERE rowid =
$this->id
"
;
$sql
.
=
" WHERE rowid =
"
.
$this
->
id
;
$result
=
$this
->
db
->
query
(
$sql
);
$result
=
$this
->
db
->
query
(
$sql
);
if
(
$result
)
if
(
$result
)
...
@@ -223,7 +228,7 @@ class AdherentType extends CommonObject
...
@@ -223,7 +228,7 @@ class AdherentType extends CommonObject
{
{
global
$conf
,
$langs
;
global
$conf
,
$langs
;
$
projet
s
=
array
();
$
adherenttype
s
=
array
();
$sql
=
"SELECT rowid, libelle"
;
$sql
=
"SELECT rowid, libelle"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"adherent_type"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"adherent_type"
;
...
@@ -241,7 +246,7 @@ class AdherentType extends CommonObject
...
@@ -241,7 +246,7 @@ class AdherentType extends CommonObject
{
{
$obj
=
$this
->
db
->
fetch_object
(
$resql
);
$obj
=
$this
->
db
->
fetch_object
(
$resql
);
$
projet
s
[
$obj
->
rowid
]
=
$langs
->
trans
(
$obj
->
libelle
);
$
adherenttype
s
[
$obj
->
rowid
]
=
$langs
->
trans
(
$obj
->
libelle
);
$i
++
;
$i
++
;
}
}
}
}
...
@@ -250,8 +255,7 @@ class AdherentType extends CommonObject
...
@@ -250,8 +255,7 @@ class AdherentType extends CommonObject
{
{
print
$this
->
db
->
error
();
print
$this
->
db
->
error
();
}
}
return
$adherenttypes
;
return
$projets
;
}
}
...
@@ -308,7 +312,7 @@ class AdherentType extends CommonObject
...
@@ -308,7 +312,7 @@ class AdherentType extends CommonObject
function
getMailOnSubscription
()
function
getMailOnSubscription
()
{
{
global
$conf
;
global
$conf
;
// mail_subscription not defined so never used
if
(
!
empty
(
$this
->
mail_subscription
)
&&
trim
(
dol_htmlentitiesbr_decode
(
$this
->
mail_subscription
)))
// Property not yet defined
if
(
!
empty
(
$this
->
mail_subscription
)
&&
trim
(
dol_htmlentitiesbr_decode
(
$this
->
mail_subscription
)))
// Property not yet defined
{
{
return
$this
->
mail_subscription
;
return
$this
->
mail_subscription
;
...
@@ -327,7 +331,7 @@ class AdherentType extends CommonObject
...
@@ -327,7 +331,7 @@ class AdherentType extends CommonObject
function
getMailOnResiliate
()
function
getMailOnResiliate
()
{
{
global
$conf
;
global
$conf
;
// NOTE mail_resiliate not defined so never used
if
(
!
empty
(
$this
->
mail_resiliate
)
&&
trim
(
dol_htmlentitiesbr_decode
(
$this
->
mail_resiliate
)))
// Property not yet defined
if
(
!
empty
(
$this
->
mail_resiliate
)
&&
trim
(
dol_htmlentitiesbr_decode
(
$this
->
mail_resiliate
)))
// Property not yet defined
{
{
return
$this
->
mail_resiliate
;
return
$this
->
mail_resiliate
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/adherents/type.php
+
4
−
1
View file @
01c2a831
...
@@ -200,7 +200,10 @@ if (! $rowid && $action != 'create' && $action != 'edit')
...
@@ -200,7 +200,10 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print
'<td>'
.
dol_escape_htmltag
(
$objp
->
libelle
)
.
'</td>'
;
print
'<td>'
.
dol_escape_htmltag
(
$objp
->
libelle
)
.
'</td>'
;
print
'<td align="center">'
.
yn
(
$objp
->
cotisation
)
.
'</td>'
;
print
'<td align="center">'
.
yn
(
$objp
->
cotisation
)
.
'</td>'
;
print
'<td align="center">'
.
yn
(
$objp
->
vote
)
.
'</td>'
;
print
'<td align="center">'
.
yn
(
$objp
->
vote
)
.
'</td>'
;
if
(
$user
->
rights
->
adherent
->
configurer
)
print
'<td align="right"><a href="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?action=edit&rowid='
.
$objp
->
rowid
.
'">'
.
img_edit
()
.
'</a></td>'
;
print
'<td align="right"><a href="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?action=edit&rowid='
.
$objp
->
rowid
.
'">'
.
img_edit
()
.
'</a></td>'
;
else
print
'<td align="right"> </td>'
;
print
"</tr>"
;
print
"</tr>"
;
$i
++
;
$i
++
;
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/facture.php
+
11
−
4
View file @
01c2a831
...
@@ -3953,6 +3953,7 @@ else if ($id > 0 || ! empty($ref))
...
@@ -3953,6 +3953,7 @@ else if ($id > 0 || ! empty($ref))
}
}
// Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
// Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
if
(
$object
->
statut
==
1
&&
$object
->
paye
==
0
&&
$resteapayer
>
0
&&
$user
->
rights
->
facture
->
paiement
)
if
(
$object
->
statut
==
1
&&
$object
->
paye
==
0
&&
$resteapayer
>
0
&&
$user
->
rights
->
facture
->
paiement
)
{
{
if
(
$totalpaye
>
0
||
$totalcreditnotes
>
0
)
if
(
$totalpaye
>
0
||
$totalcreditnotes
>
0
)
...
@@ -3962,13 +3963,19 @@ else if ($id > 0 || ! empty($ref))
...
@@ -3962,13 +3963,19 @@ else if ($id > 0 || ! empty($ref))
}
}
else
else
{
{
if
(
$objectidnext
)
{
if
(
empty
(
$conf
->
global
->
INVOICE_CAN_NEVER_BE_CANCELED
))
{
if
(
$objectidnext
)
{
print
'<div class="inline-block divButAction"><span class="butActionRefused" title="'
.
$langs
->
trans
(
"DisabledBecauseReplacedInvoice"
)
.
'">'
.
$langs
->
trans
(
'ClassifyCanceled'
)
.
'</span></div>'
;
print
'<div class="inline-block divButAction"><span class="butActionRefused" title="'
.
$langs
->
trans
(
"DisabledBecauseReplacedInvoice"
)
.
'">'
.
$langs
->
trans
(
'ClassifyCanceled'
)
.
'</span></div>'
;
}
else
{
}
else
{
print
'<div class="inline-block divButAction"><a class="butAction" href="'
.
$_SERVER
[
'PHP_SELF'
]
.
'?facid='
.
$object
->
id
.
'&action=canceled">'
.
$langs
->
trans
(
'ClassifyCanceled'
)
.
'</a></div>'
;
print
'<div class="inline-block divButAction"><a class="butAction" href="'
.
$_SERVER
[
'PHP_SELF'
]
.
'?facid='
.
$object
->
id
.
'&action=canceled">'
.
$langs
->
trans
(
'ClassifyCanceled'
)
.
'</a></div>'
;
}
}
}
}
}
}
}
// Clone
// Clone
if
((
$object
->
type
==
Facture
::
TYPE_STANDARD
||
$object
->
type
==
Facture
::
TYPE_DEPOSIT
||
$object
->
type
==
Facture
::
TYPE_PROFORMA
)
&&
$user
->
rights
->
facture
->
creer
)
if
((
$object
->
type
==
Facture
::
TYPE_STANDARD
||
$object
->
type
==
Facture
::
TYPE_DEPOSIT
||
$object
->
type
==
Facture
::
TYPE_PROFORMA
)
&&
$user
->
rights
->
facture
->
creer
)
...
...
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