Revision 50c2f228
Von Bernd Bleßmann vor etwa 12 Jahren hinzugefügt
| SL/Controller/ClientConfig.pm | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
$self->{payments_changeable} = SL::DB::Default->get->payments_changeable;
|
| 31 | 31 |
|
| 32 |
map { $self->{$_} = SL::DB::Default->get->$_ } qw(is_show_mark_as_paid ir_show_mark_as_paid ar_show_mark_as_paid ap_show_mark_as_paid);
|
|
| 33 |
|
|
| 32 | 34 |
map { $self->{$_} = SL::DB::Default->get->$_ } qw(accounting_method inventory_system profit_determination);
|
| 33 | 35 |
|
| 34 | 36 |
$self->{show_bestbefore} = SL::DB::Default->get->show_bestbefore;
|
| ... | ... | |
| 50 | 52 |
|
| 51 | 53 |
SL::DB::Default->get->update_attributes('payments_changeable' => $::form->{payments_changeable});
|
| 52 | 54 |
|
| 55 |
map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(is_show_mark_as_paid ir_show_mark_as_paid ar_show_mark_as_paid ap_show_mark_as_paid);
|
|
| 56 |
|
|
| 53 | 57 |
map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(accounting_method inventory_system profit_determination);
|
| 54 | 58 |
|
| 55 | 59 |
SL::DB::Default->get->update_attributes('show_bestbefore' => $::form->{show_bestbefore});
|
| SL/DB/MetaSetup/Default.pm | ||
|---|---|---|
| 59 | 59 |
ar_changeable => { type => 'integer', default => 2, not_null => 1 },
|
| 60 | 60 |
ap_changeable => { type => 'integer', default => 2, not_null => 1 },
|
| 61 | 61 |
gl_changeable => { type => 'integer', default => 2, not_null => 1 },
|
| 62 |
is_show_mark_as_paid => { type => 'boolean', default => 'true' },
|
|
| 63 |
ir_show_mark_as_paid => { type => 'boolean', default => 'true' },
|
|
| 64 |
ar_show_mark_as_paid => { type => 'boolean', default => 'true' },
|
|
| 65 |
ap_show_mark_as_paid => { type => 'boolean', default => 'true' },
|
|
| 62 | 66 |
], |
| 63 | 67 |
|
| 64 | 68 |
primary_key_columns => [ 'id' ], |
| SL/InstanceConfiguration.pm | ||
|---|---|---|
| 104 | 104 |
return $self->{data}->{show_bestbefore};
|
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 |
sub get_is_show_mark_as_paid {
|
|
| 108 |
my ($self) = @_; |
|
| 109 |
return $self->{data}->{is_show_mark_as_paid};
|
|
| 110 |
} |
|
| 111 |
|
|
| 112 |
sub get_ir_show_mark_as_paid {
|
|
| 113 |
my ($self) = @_; |
|
| 114 |
return $self->{data}->{ir_show_mark_as_paid};
|
|
| 115 |
} |
|
| 116 |
|
|
| 117 |
sub get_ar_show_mark_as_paid {
|
|
| 118 |
my ($self) = @_; |
|
| 119 |
return $self->{data}->{ar_show_mark_as_paid};
|
|
| 120 |
} |
|
| 121 |
|
|
| 122 |
sub get_ap_show_mark_as_paid {
|
|
| 123 |
my ($self) = @_; |
|
| 124 |
return $self->{data}->{ap_show_mark_as_paid};
|
|
| 125 |
} |
|
| 126 |
|
|
| 107 | 127 |
1; |
| 108 | 128 |
|
| 109 | 129 |
__END__ |
| ... | ... | |
| 194 | 214 |
|
| 195 | 215 |
Returns the default behavior for showing best before date, true or false |
| 196 | 216 |
|
| 217 |
=item C<get_is_show_mark_as_paid> |
|
| 218 |
|
|
| 219 |
=item C<get_ir_show_mark_as_paid> |
|
| 220 |
|
|
| 221 |
=item C<get_ar_show_mark_as_paid> |
|
| 222 |
|
|
| 223 |
=item C<get_ap_show_mark_as_paid> |
|
| 224 |
|
|
| 225 |
Returns the default behavior for showing the mark as paid button for the |
|
| 226 |
corresponding record type (true or false). |
|
| 227 |
|
|
| 197 | 228 |
=back |
| 198 | 229 |
|
| 199 | 230 |
=head1 BUGS |
| bin/mozilla/ap.pl | ||
|---|---|---|
| 855 | 855 |
|
| 856 | 856 |
$::form->header; |
| 857 | 857 |
print $::form->parse_html_template('ap/form_footer', {
|
| 858 |
num_due => $num_due, |
|
| 859 |
num_follow_ups => $num_follow_ups, |
|
| 860 |
show_post_draft => ($transdate > $closedto) && !$::form->{id},
|
|
| 861 |
show_storno => $storno, |
|
| 858 |
num_due => $num_due,
|
|
| 859 |
num_follow_ups => $num_follow_ups,
|
|
| 860 |
show_post_draft => ($transdate > $closedto) && !$::form->{id},
|
|
| 861 |
show_storno => $storno,
|
|
| 862 | 862 |
}); |
| 863 | 863 |
|
| 864 | 864 |
$::lxdebug->leave_sub; |
| bin/mozilla/ar.pl | ||
|---|---|---|
| 533 | 533 |
} |
| 534 | 534 |
# /button for saving history |
| 535 | 535 |
# mark_as_paid button |
| 536 |
if($form->{id} ne "") {
|
|
| 536 |
if(($form->{id} ne "") && $::instance_conf->get_ar_show_mark_as_paid) {
|
|
| 537 | 537 |
print qq|<input type="submit" class="submit" name="action" value="| |
| 538 | 538 |
. $locale->text('mark as paid') . qq|">|;
|
| 539 | 539 |
} |
| locale/de/all | ||
|---|---|---|
| 1711 | 1711 |
'Should payments be and when should they be changeable after posting?' => 'Sollen Zahlungen nach dem Buchen änderbar sein, und wenn ja, wann?', |
| 1712 | 1712 |
'Should purchase invoices be and when should they be deleteable after posting?' => 'Sollen Einkaufsrechnungen nach der Buchung zu löschen sein?', |
| 1713 | 1713 |
'Should sales invoices be and when should they be changeable or deleteable after posting?' => 'Sollen Verkaufrechnung nach der Buchung zu ändern oder zu löschen sein?', |
| 1714 |
'Should the "mark as paid" button showed in ap transactions?' => 'Soll der Knopf "als bezahlt markieren" bei Kreditorenbuchungen angezeigt werden?', |
|
| 1715 |
'Should the "mark as paid" button showed in ar transactions?' => 'Soll der Knopf "als bezahlt markieren" bei Debitorenbuchungen angezeigt werden?', |
|
| 1716 |
'Should the "mark as paid" button showed in purchase invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Einkaufsrechnungen angezeigt werden?', |
|
| 1717 |
'Should the "mark as paid" button showed on sales invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Verkaufsrechnungen angezeigt werden?', |
|
| 1714 | 1718 |
'Show' => 'Zeigen', |
| 1719 |
'Show "mark as paid" in ap transactions' => '"als bezahlt markieren" bei Kreditorenbuchungen anzeigen', |
|
| 1720 |
'Show "mark as paid" in ar transactions' => '"als bezahlt markieren" bei Debitorenbuchungen anzeigen', |
|
| 1721 |
'Show "mark as paid" in purchase invoices' => '"als bezahlt markieren" bei Einkaufsrechnungen anzeigen', |
|
| 1722 |
'Show "mark as paid" in sales invoices' => '"als bezahlt markieren" bei Verkaufsrechnungen anzeigen', |
|
| 1715 | 1723 |
'Show Bestbefore' => 'Mindesthaltbarkeit anzeigen', |
| 1716 | 1724 |
'Show Filter' => 'Filter zeigen', |
| 1717 | 1725 |
'Show Salesman' => 'Verkäufer anzeigen', |
| locale/de_DE/all | ||
|---|---|---|
| 1666 | 1666 |
'Should payments be and when should they be changeable after posting?' => 'Sollen Zahlungen nach dem Buchen änderbar sein, und wenn ja, wann?', |
| 1667 | 1667 |
'Should purchase invoices be and when should they be deleteable after posting?' => 'Sollen Einkaufsrechnungen nach der Buchung zu löschen sein?', |
| 1668 | 1668 |
'Should sales invoices be and when should they be changeable or deleteable after posting?' => 'Sollen Verkaufrechnung nach der Buchung zu ändern oder zu löschen sein?', |
| 1669 |
'Should the "mark as paid" button showed in ap transactions?' => 'Soll der Knopf "als bezahlt markieren" bei Kreditorenbuchungen angezeigt werden?', |
|
| 1670 |
'Should the "mark as paid" button showed in ar transactions?' => 'Soll der Knopf "als bezahlt markieren" bei Debitorenbuchungen angezeigt werden?', |
|
| 1671 |
'Should the "mark as paid" button showed in purchase invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Einkaufsrechnungen angezeigt werden?', |
|
| 1672 |
'Should the "mark as paid" button showed on sales invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Verkaufsrechnungen angezeigt werden?', |
|
| 1669 | 1673 |
'Show' => 'Zeigen', |
| 1674 |
'Show "mark as paid" in ap transactions' => '"als bezahlt markieren" bei Kreditorenbuchungen anzeigen', |
|
| 1675 |
'Show "mark as paid" in ar transactions' => '"als bezahlt markieren" bei Debitorenbuchungen anzeigen', |
|
| 1676 |
'Show "mark as paid" in purchase invoices' => '"als bezahlt markieren" bei Einkaufsrechnungen anzeigen', |
|
| 1677 |
'Show "mark as paid" in sales invoices' => '"als bezahlt markieren" bei Verkaufsrechnungen anzeigen', |
|
| 1670 | 1678 |
'Show Bestbefore' => 'Mindesthaltbarkeit anzeigen', |
| 1671 | 1679 |
'Show Salesman' => 'Verkäufer anzeigen', |
| 1672 | 1680 |
'Show TODO list' => 'Meine Aufgaben', |
| locale/en/all | ||
|---|---|---|
| 1688 | 1688 |
'Should payments be and when should they be changeable after posting?' => '', |
| 1689 | 1689 |
'Should purchase invoices be and when should they be deleteable after posting?' => '', |
| 1690 | 1690 |
'Should sales invoices be and when should they be changeable or deleteable after posting?' => '', |
| 1691 |
'Should the "mark as paid" button showed in ap transactions?' => '', |
|
| 1692 |
'Should the "mark as paid" button showed in ar transactions?' => '', |
|
| 1693 |
'Should the "mark as paid" button showed in purchase invoices?' => '', |
|
| 1694 |
'Should the "mark as paid" button showed on sales invoices?' => '', |
|
| 1691 | 1695 |
'Show' => '', |
| 1696 |
'Show "mark as paid" in ap transactions' => '', |
|
| 1697 |
'Show "mark as paid" in ar transactions' => '', |
|
| 1698 |
'Show "mark as paid" in purchase invoices' => '', |
|
| 1699 |
'Show "mark as paid" in sales invoices' => '', |
|
| 1692 | 1700 |
'Show Bestbefore' => '', |
| 1693 | 1701 |
'Show Filter' => '', |
| 1694 | 1702 |
'Show Salesman' => '', |
| sql/Pg-upgrade2/defaults_show_mark_as_paid_config.sql | ||
|---|---|---|
| 1 |
-- @tag: defaults_show_mark_as_paid_config |
|
| 2 |
-- @description: Einstellung, ob der "als bezahlt markieren"-Knopf angezeigt wird. |
|
| 3 |
-- @depends: release_2_7_0 |
|
| 4 |
-- @charset: utf-8 |
|
| 5 |
|
|
| 6 |
ALTER TABLE defaults ADD COLUMN is_show_mark_as_paid boolean DEFAULT TRUE; |
|
| 7 |
ALTER TABLE defaults ADD COLUMN ir_show_mark_as_paid boolean DEFAULT TRUE; |
|
| 8 |
ALTER TABLE defaults ADD COLUMN ar_show_mark_as_paid boolean DEFAULT TRUE; |
|
| 9 |
ALTER TABLE defaults ADD COLUMN ap_show_mark_as_paid boolean DEFAULT TRUE; |
|
| templates/webpages/ap/form_footer.html | ||
|---|---|---|
| 42 | 42 |
|
| 43 | 43 |
[%- IF id %] |
| 44 | 44 |
<input type="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]"> |
| 45 |
<input type="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 45 |
[% IF INSTANCE_CONF.get_ap_show_mark_as_paid %] |
|
| 46 |
<input type="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 47 |
[% END %] |
|
| 46 | 48 |
[%- END %] |
| 47 | 49 |
|
| 48 | 50 |
</form> |
| templates/webpages/client_config/form.html | ||
|---|---|---|
| 50 | 50 |
<tr> </tr> |
| 51 | 51 |
<tr> </tr> |
| 52 | 52 |
|
| 53 |
<tr> |
|
| 54 |
<td align="right">[% 'Show "mark as paid" in sales invoices' | $T8 %]</td> |
|
| 55 |
<td>[% L.yes_no_tag('is_show_mark_as_paid', SELF.is_show_mark_as_paid) %]</td>
|
|
| 56 |
<td>[% 'Should the "mark as paid" button showed on sales invoices?' | $T8 %]</td> |
|
| 57 |
</tr> |
|
| 58 |
<tr> |
|
| 59 |
<td align="right">[% 'Show "mark as paid" in purchase invoices' | $T8 %]</td> |
|
| 60 |
<td>[% L.yes_no_tag('ir_show_mark_as_paid', SELF.ir_show_mark_as_paid) %]</td>
|
|
| 61 |
<td>[% 'Should the "mark as paid" button showed in purchase invoices?' | $T8 %]</td> |
|
| 62 |
</tr> |
|
| 63 |
<tr> |
|
| 64 |
<td align="right">[% 'Show "mark as paid" in ar transactions' | $T8 %]</td> |
|
| 65 |
<td>[% L.yes_no_tag('ar_show_mark_as_paid', SELF.ar_show_mark_as_paid) %]</td>
|
|
| 66 |
<td>[% 'Should the "mark as paid" button showed in ar transactions?' | $T8 %]</td> |
|
| 67 |
</tr> |
|
| 68 |
<tr> |
|
| 69 |
<td align="right">[% 'Show "mark as paid" in ap transactions' | $T8 %]</td> |
|
| 70 |
<td>[% L.yes_no_tag('ap_show_mark_as_paid', SELF.ap_show_mark_as_paid) %]</td>
|
|
| 71 |
<td>[% 'Should the "mark as paid" button showed in ap transactions?' | $T8 %]</td> |
|
| 72 |
</tr> |
|
| 73 |
|
|
| 74 |
<tr> </tr> |
|
| 75 |
<tr> </tr> |
|
| 76 |
|
|
| 53 | 77 |
<tr> |
| 54 | 78 |
<td align="right">[% 'Accounting method' | $T8 %]</td> |
| 55 | 79 |
<td>[% L.select_tag('accounting_method', SELF.accounting_options, value_key => 'value', title_key => 'title', default => SELF.accounting_method) %]</td>
|
| templates/webpages/ir/form_footer.html | ||
|---|---|---|
| 116 | 116 |
[%#- button for saving history %] |
| 117 | 117 |
<input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]"> |
| 118 | 118 |
|
| 119 |
<input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 119 |
[% IF INSTANCE_CONF.get_ir_show_mark_as_paid %] |
|
| 120 |
<input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 121 |
[% END %] |
|
| 120 | 122 |
[% END %] |
| 121 | 123 |
|
| 122 | 124 |
<input type="hidden" name="rowcount" value="[% rowcount %]"> |
| templates/webpages/is/form_footer.html | ||
|---|---|---|
| 157 | 157 |
[% IF id %] |
| 158 | 158 |
[%#- button for saving history %] |
| 159 | 159 |
<input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]"> |
| 160 |
|
|
| 161 |
<input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 160 |
[% IF INSTANCE_CONF.get_is_show_mark_as_paid %] |
|
| 161 |
<input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]"> |
|
| 162 |
[% END %] |
|
| 162 | 163 |
[% END %] |
| 163 | 164 |
|
| 164 | 165 |
<input type="hidden" name="rowcount" value="[% rowcount %]"> |
Auch abrufbar als: Unified diff
"als bezahlt markieren"-Knopf anzeigen in Mandantenkonfiguration einstellbar.