Revision 7bff84cb
Von Thomas Heck vor mehr als 12 Jahren hinzugefügt
| SL/CT.pm | ||
|---|---|---|
| 319 | 319 |
qq|user_password = ?, | . |
| 320 | 320 |
qq|c_vendor_id = ?, | . |
| 321 | 321 |
qq|klass = ?, | . |
| 322 |
qq|curr = ? | . |
|
| 322 |
qq|curr = ?, | . |
|
| 323 |
qq|taxincluded_checked = ? | . |
|
| 323 | 324 |
qq|WHERE id = ?|; |
| 324 | 325 |
my @values = ( |
| 325 | 326 |
$form->{customernumber},
|
| ... | ... | |
| 362 | 363 |
$form->{c_vendor_id},
|
| 363 | 364 |
conv_i($form->{klass}),
|
| 364 | 365 |
substr($form->{currency}, 0, 3),
|
| 366 |
$form->{taxincluded_checked},
|
|
| 365 | 367 |
$form->{id}
|
| 366 | 368 |
); |
| 367 | 369 |
do_query( $form, $dbh, $query, @values ); |
| ... | ... | |
| 483 | 485 |
qq| username = ?, | . |
| 484 | 486 |
qq| user_password = ?, | . |
| 485 | 487 |
qq| v_customer_id = ?, | . |
| 486 |
qq| curr = ? | . |
|
| 488 |
qq| curr = ?, | . |
|
| 489 |
qq| taxincluded_checked = ? | . |
|
| 487 | 490 |
qq|WHERE id = ?|; |
| 488 | 491 |
my @values = ( |
| 489 | 492 |
$form->{vendornumber},
|
| ... | ... | |
| 524 | 527 |
$form->{user_password},
|
| 525 | 528 |
$form->{v_customer_id},
|
| 526 | 529 |
substr($form->{currency}, 0, 3),
|
| 530 |
$form->{taxincluded_checked},
|
|
| 527 | 531 |
$form->{id}
|
| 528 | 532 |
); |
| 529 | 533 |
do_query($form, $dbh, $query, @values); |
| SL/DB/MetaSetup/Customer.pm | ||
|---|---|---|
| 10 | 10 |
table => 'customer', |
| 11 | 11 |
|
| 12 | 12 |
columns => [ |
| 13 |
id => { type => 'integer', not_null => 1, sequence => 'id' },
|
|
| 14 |
name => { type => 'text', not_null => 1 },
|
|
| 15 |
department_1 => { type => 'varchar', length => 75 },
|
|
| 16 |
department_2 => { type => 'varchar', length => 75 },
|
|
| 17 |
street => { type => 'varchar', length => 75 },
|
|
| 18 |
zipcode => { type => 'varchar', length => 10 },
|
|
| 19 |
city => { type => 'varchar', length => 75 },
|
|
| 20 |
country => { type => 'varchar', length => 75 },
|
|
| 21 |
contact => { type => 'text' },
|
|
| 22 |
phone => { type => 'text' },
|
|
| 23 |
fax => { type => 'varchar', length => 30 },
|
|
| 24 |
homepage => { type => 'text' },
|
|
| 25 |
email => { type => 'text' },
|
|
| 26 |
notes => { type => 'text' },
|
|
| 27 |
discount => { type => 'float', precision => 4 },
|
|
| 28 |
taxincluded => { type => 'boolean' },
|
|
| 29 |
creditlimit => { type => 'numeric', default => '0', precision => 5, scale => 15 },
|
|
| 30 |
terms => { type => 'integer', default => '0' },
|
|
| 31 |
customernumber => { type => 'text' },
|
|
| 32 |
cc => { type => 'text' },
|
|
| 33 |
bcc => { type => 'text' },
|
|
| 34 |
business_id => { type => 'integer' },
|
|
| 35 |
taxnumber => { type => 'text' },
|
|
| 36 |
account_number => { type => 'text' },
|
|
| 37 |
bank_code => { type => 'text' },
|
|
| 38 |
bank => { type => 'text' },
|
|
| 39 |
language => { type => 'varchar', length => 5 },
|
|
| 40 |
itime => { type => 'timestamp', default => 'now()' },
|
|
| 41 |
mtime => { type => 'timestamp' },
|
|
| 42 |
obsolete => { type => 'boolean', default => 'false' },
|
|
| 43 |
username => { type => 'varchar', length => 50 },
|
|
| 44 |
user_password => { type => 'text' },
|
|
| 45 |
salesman_id => { type => 'integer' },
|
|
| 46 |
c_vendor_id => { type => 'text' },
|
|
| 47 |
klass => { type => 'integer', default => '0' },
|
|
| 48 |
language_id => { type => 'integer' },
|
|
| 49 |
payment_id => { type => 'integer' },
|
|
| 50 |
taxzone_id => { type => 'integer', default => '0', not_null => 1 },
|
|
| 51 |
greeting => { type => 'text' },
|
|
| 52 |
ustid => { type => 'text' },
|
|
| 53 |
iban => { type => 'varchar', length => 100 },
|
|
| 54 |
bic => { type => 'varchar', length => 100 },
|
|
| 55 |
direct_debit => { type => 'boolean', default => 'false' },
|
|
| 56 |
curr => { type => 'character', length => 3 },
|
|
| 13 |
id => { type => 'integer', not_null => 1, sequence => 'id' },
|
|
| 14 |
name => { type => 'text', not_null => 1 },
|
|
| 15 |
department_1 => { type => 'varchar', length => 75 },
|
|
| 16 |
department_2 => { type => 'varchar', length => 75 },
|
|
| 17 |
street => { type => 'varchar', length => 75 },
|
|
| 18 |
zipcode => { type => 'varchar', length => 10 },
|
|
| 19 |
city => { type => 'varchar', length => 75 },
|
|
| 20 |
country => { type => 'varchar', length => 75 },
|
|
| 21 |
contact => { type => 'text' },
|
|
| 22 |
phone => { type => 'text' },
|
|
| 23 |
fax => { type => 'varchar', length => 30 },
|
|
| 24 |
homepage => { type => 'text' },
|
|
| 25 |
email => { type => 'text' },
|
|
| 26 |
notes => { type => 'text' },
|
|
| 27 |
discount => { type => 'float', precision => 4 },
|
|
| 28 |
taxincluded => { type => 'boolean' },
|
|
| 29 |
creditlimit => { type => 'numeric', default => '0', precision => 5, scale => 15 },
|
|
| 30 |
terms => { type => 'integer', default => '0' },
|
|
| 31 |
customernumber => { type => 'text' },
|
|
| 32 |
cc => { type => 'text' },
|
|
| 33 |
bcc => { type => 'text' },
|
|
| 34 |
business_id => { type => 'integer' },
|
|
| 35 |
taxnumber => { type => 'text' },
|
|
| 36 |
account_number => { type => 'text' },
|
|
| 37 |
bank_code => { type => 'text' },
|
|
| 38 |
bank => { type => 'text' },
|
|
| 39 |
language => { type => 'varchar', length => 5 },
|
|
| 40 |
itime => { type => 'timestamp', default => 'now()' },
|
|
| 41 |
mtime => { type => 'timestamp' },
|
|
| 42 |
obsolete => { type => 'boolean', default => 'false' },
|
|
| 43 |
username => { type => 'varchar', length => 50 },
|
|
| 44 |
user_password => { type => 'text' },
|
|
| 45 |
salesman_id => { type => 'integer' },
|
|
| 46 |
c_vendor_id => { type => 'text' },
|
|
| 47 |
klass => { type => 'integer', default => '0' },
|
|
| 48 |
language_id => { type => 'integer' },
|
|
| 49 |
payment_id => { type => 'integer' },
|
|
| 50 |
taxzone_id => { type => 'integer', default => '0', not_null => 1 },
|
|
| 51 |
greeting => { type => 'text' },
|
|
| 52 |
ustid => { type => 'text' },
|
|
| 53 |
iban => { type => 'varchar', length => 100 },
|
|
| 54 |
bic => { type => 'varchar', length => 100 },
|
|
| 55 |
direct_debit => { type => 'boolean', default => 'false' },
|
|
| 56 |
curr => { type => 'character', length => 3 },
|
|
| 57 |
taxincluded_checked => { type => 'varchar', length => 1 },
|
|
| 57 | 58 |
], |
| 58 | 59 |
|
| 59 | 60 |
primary_key_columns => [ 'id' ], |
| SL/IS.pm | ||
|---|---|---|
| 1676 | 1676 |
c.email, c.cc, c.bcc, c.language_id, c.payment_id, |
| 1677 | 1677 |
c.street, c.zipcode, c.city, c.country, |
| 1678 | 1678 |
c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, c.curr, |
| 1679 |
c.taxincluded_checked, |
|
| 1679 | 1680 |
$duedate + COALESCE(pt.terms_netto, 0) AS duedate, |
| 1680 | 1681 |
b.discount AS tradediscount, b.description AS business |
| 1681 | 1682 |
FROM customer c |
| SL/User.pm | ||
|---|---|---|
| 754 | 754 |
taxnumber co_ustid duns menustyle template_format default_media |
| 755 | 755 |
default_printer_id copies show_form_details favorites |
| 756 | 756 |
pdonumber sdonumber hide_cvar_search_options mandatory_departments |
| 757 |
sepa_creditor_id); |
|
| 757 |
sepa_creditor_id taxincluded_checked);
|
|
| 758 | 758 |
|
| 759 | 759 |
$main::lxdebug->leave_sub(); |
| 760 | 760 |
|
| bin/mozilla/is.pl | ||
|---|---|---|
| 405 | 405 |
my ($tax, $subtotal); |
| 406 | 406 |
$form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
|
| 407 | 407 |
|
| 408 |
IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
|
|
| 409 |
|
|
| 410 |
if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
|
|
| 411 |
if ( $form->{taxincluded_checked} eq 'y' ) {
|
|
| 412 |
$form->{taxincluded} = 1;
|
|
| 413 |
} elsif ( $form->{taxincluded_checked} eq 'n' ) {
|
|
| 414 |
$form->{taxincluded} = 0;
|
|
| 415 |
} else {
|
|
| 416 |
$form->{taxincluded} = $myconfig{taxincluded_checked};
|
|
| 417 |
} |
|
| 418 |
} |
|
| 419 |
|
|
| 408 | 420 |
foreach my $item (@{ $form->{taxaccounts_array} }) {
|
| 409 | 421 |
if ($form->{"${item}_base"}) {
|
| 410 | 422 |
if ($form->{taxincluded}) {
|
| bin/mozilla/oe.pl | ||
|---|---|---|
| 475 | 475 |
$TMPL_VAR{notes} = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
|
| 476 | 476 |
$TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
|
| 477 | 477 |
|
| 478 |
IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
|
|
| 479 |
|
|
| 480 |
if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
|
|
| 481 |
if ( $form->{taxincluded_checked} eq 'y' ) {
|
|
| 482 |
$form->{taxincluded} = 1;
|
|
| 483 |
} elsif ( $form->{taxincluded_checked} eq 'n' ) {
|
|
| 484 |
$form->{taxincluded} = 0;
|
|
| 485 |
} else {
|
|
| 486 |
$form->{taxincluded} = $myconfig{taxincluded_checked};
|
|
| 487 |
} |
|
| 488 |
} |
|
| 489 |
|
|
| 478 | 490 |
if (!$form->{taxincluded}) {
|
| 479 | 491 |
|
| 480 | 492 |
foreach my $item (split / /, $form->{taxaccounts}) {
|
| locale/de/all | ||
|---|---|---|
| 2398 | 2398 |
'tax_rate' => 'Prozent', |
| 2399 | 2399 |
'tax_taxdescription' => 'Steuername', |
| 2400 | 2400 |
'tax_taxkey' => 'Steuerschlüssel', |
| 2401 |
'taxincluded checked' => '"Steuer im Preis inbegriffen" vorwählen', |
|
| 2401 | 2402 |
'taxnumber' => 'Automatikkonto', |
| 2402 | 2403 |
'terminated' => 'gekündigt', |
| 2403 | 2404 |
'to (date)' => 'bis', |
| ... | ... | |
| 2408 | 2409 |
'trial_balance' => 'susa', |
| 2409 | 2410 |
'up' => 'hoch', |
| 2410 | 2411 |
'use program settings' => 'benutze Programmeinstellungen', |
| 2412 |
'use user config' => 'Verwende Benutzereinstellung', |
|
| 2411 | 2413 |
'used' => 'Verbraucht', |
| 2412 | 2414 |
'valid from' => 'Gültig ab', |
| 2413 | 2415 |
'vendor' => 'Lieferant', |
| sql/Pg-upgrade2/customer_add_taxincluded_checked.sql | ||
|---|---|---|
| 1 |
-- @tag: customer_add_taxincluded_checked |
|
| 2 |
-- @description: Feld "Steuer im Preis inbegriffen" vormarkierbar machen |
|
| 3 |
-- @encoding: utf-8 |
|
| 4 |
-- @depends: release_2_7_0 |
|
| 5 |
|
|
| 6 |
ALTER TABLE customer ADD COLUMN taxincluded_checked varchar(1) DEFAULT '' NOT NULL; |
|
| templates/webpages/am/config.html | ||
|---|---|---|
| 69 | 69 |
<th align="right">[% 'SEPA creditor ID' | $T8 %]</th> |
| 70 | 70 |
<td><input name="sepa_creditor_id" size="30" maxlength="35" value="[% HTML.escape(myconfig_sepa_creditor_id) %]"></td> |
| 71 | 71 |
</tr> |
| 72 |
|
|
| 73 |
<tr> |
|
| 74 |
<th align="right"q>[% 'taxincluded checked' | $T8 %]</th> |
|
| 75 |
<td> |
|
| 76 |
[% L.yes_no_tag('taxincluded_checked', myconfig_taxincluded_checked) %]
|
|
| 77 |
</td> |
|
| 78 |
</tr> |
|
| 79 |
|
|
| 72 | 80 |
</table> |
| 73 | 81 |
|
| 74 | 82 |
<br style="clear: left" /> |
| templates/webpages/ct/form_header.html | ||
|---|---|---|
| 282 | 282 |
<td>[% L.select_tag('salesman_id', ALL_SALESMEN, default = salesman_id, with_empty = 1, title_key = 'safe_name') %]</td>
|
| 283 | 283 |
[%- END %] |
| 284 | 284 |
</tr> |
| 285 |
|
|
| 286 |
<tr> |
|
| 287 |
<td>[% 'taxincluded checked' | $T8 %]</td> |
|
| 288 |
<td>[% L.select_tag('taxincluded_checked', [[undef, LxERP.t8('use user config')], ['y', LxERP.t8('Yes')], ['n', LxERP.t8('No')]], default = taxincluded_checked) %]</td>
|
|
| 289 |
</tr> |
|
| 285 | 290 |
</table> |
| 286 | 291 |
|
| 287 | 292 |
<table> |
| templates/webpages/is/form_footer.html | ||
|---|---|---|
| 60 | 60 |
</td> |
| 61 | 61 |
<td align="right"> |
| 62 | 62 |
[%- IF taxaccounts %] |
| 63 |
<input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]> |
|
| 63 |
<input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]"> |
|
| 64 |
<input name="taxincluded" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
|
|
| 64 | 65 |
<b>[% 'Tax Included' | $T8 %]</b> |
| 65 | 66 |
<br> |
| 66 | 67 |
<br> |
| templates/webpages/oe/form_footer.html | ||
|---|---|---|
| 70 | 70 |
</td> |
| 71 | 71 |
[%- END %] |
| 72 | 72 |
<td align="right"> |
| 73 |
|
|
| 73 | 74 |
[%- IF taxaccounts %] |
| 74 |
<input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br> |
|
| 75 |
<input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]"> |
|
| 76 |
<input name="taxincluded" class="checkbox" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
|
|
| 75 | 77 |
[%- END %] |
| 76 | 78 |
<table> |
| 77 | 79 |
[%- IF NOT taxincluded %] |
Auch abrufbar als: Unified diff
Möglichkeit zum Setzen von "Steuer im Preis inbegriffen" als Default
fixt #1985