Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 101b9705

Von Moritz Bunkus vor etwa 8 Jahren hinzugefügt

  • ID 101b9705bda052abb1237c92d3920f6ddbf12d04
  • Vorgänger 9a9025f6
  • Nachfolger 962ae5f9

Belegvorlagen: Zeilen ohne Betrag beibehalten

Unterschiede anzeigen:

bin/mozilla/ap.pl
$::form->{AP_chart_id} = $template->ar_ap_chart_id;
$::form->{transdate} = $today->to_kivitendo;
$::form->{duedate} = $today->to_kivitendo;
$::form->{rowcount} = @{ $template->items } + 1;
$::form->{rowcount} = @{ $template->items };
$::form->{paidaccounts} = 1;
$::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded notes);
......
flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
update();
update(
keep_rows_without_amount => 1,
dont_add_new_row => 1,
);
}
sub save_record_template {
......
$js->dialog->close('#record_template_dialog');
my @items = grep {
$_->{chart_id} && (($_->{tax_id} // '') ne '') && ($_->{amount1} != 0)
$_->{chart_id} && (($_->{tax_id} // '') ne '')
} map {
+{ chart_id => $::form->{"AP_amount_chart_id_${_}"},
amount1 => $::form->parse_amount(\%::myconfig, $::form->{"amount_${_}"}),
......
}
sub update {
my %params = @_;
$main::lxdebug->enter_sub();
my $form = $main::form;
......
my (@a, $j, $totaltax);
for my $i (1 .. $form->{rowcount}) {
$form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
if ($form->{"amount_$i"}) {
if ($form->{"amount_$i"} || $params{keep_rows_without_amount}) {
push @a, {};
$j = $#a;
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
......
IR->get_vendor(\%::myconfig, $form);
}
$form->{rowcount} = $count + 1;
$form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1);
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
......
$form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $totalpaid;
&display_form;
display_form();
$main::lxdebug->leave_sub();
}
bin/mozilla/ar.pl
$::form->{AR_chart_id} = $template->ar_ap_chart_id;
$::form->{transdate} = $today->to_kivitendo;
$::form->{duedate} = $today->to_kivitendo;
$::form->{rowcount} = @{ $template->items } + 1;
$::form->{rowcount} = @{ $template->items };
$::form->{paidaccounts} = 1;
$::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded employee_id notes);
......
flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
update();
update(
keep_rows_without_amount => 1,
dont_add_new_row => 1,
);
}
sub save_record_template {
......
$js->dialog->close('#record_template_dialog');
my @items = grep {
$_->{chart_id} && (($_->{tax_id} // '') ne '') && ($_->{amount1} != 0)
$_->{chart_id} && (($_->{tax_id} // '') ne '')
} map {
+{ chart_id => $::form->{"AR_amount_chart_id_${_}"},
amount1 => $::form->parse_amount(\%::myconfig, $::form->{"amount_${_}"}),
......
}
sub update {
my %params = @_;
$main::lxdebug->enter_sub();
$main::auth->assert('ar_transactions');
......
for my $i (1 .. $form->{rowcount}) {
$form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
if ($form->{"amount_$i"}) {
if ($form->{"amount_$i"} || $params{keep_rows_without_amount}) {
push @a, {};
my $j = $#a;
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
......
}
$form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
$form->{rowcount} = $count + 1;
$form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1);
map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
$form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
......
$form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $form->{totalpaid};
&display_form;
display_form();
$main::lxdebug->leave_sub();
}
bin/mozilla/gl.pl
$::form->{title} = "Add";
$::form->{transdate} = $today->to_kivitendo;
$::form->{duedate} = $today->to_kivitendo;
$::form->{rowcount} = @{ $template->items } + 1;
$::form->{rowcount} = @{ $template->items };
$::form->{paidaccounts} = 1;
$::form->{$_} = $template->$_ for qw(department_id taxincluded ob_transaction cb_transaction reference description);
$::form->{$_} = $dummy_form->{$_} for qw(closedto revtrans previous_id previous_gldate);
......
flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
update();
update(
keep_rows_without_amount => 1,
dont_add_new_row => 1,
);
}
sub save_record_template {
......
$js->dialog->close('#record_template_dialog');
my @items = grep {
$_->{chart_id} && (($_->{tax_id} // '') ne '') && (($_->{amount1} != 0) || ($_->{amount2} != 0))
$_->{chart_id} && (($_->{tax_id} // '') ne '')
} map {
+{ chart_id => $::form->{"accno_id_${_}"},
amount1 => $::form->parse_amount(\%::myconfig, $::form->{"debit_${_}"}),
......
}
sub update {
my %params = @_;
$main::lxdebug->enter_sub();
$main::auth->assert('gl_transactions');
......
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
$form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) for qw(debit credit tax);
unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
for (qw(debit credit tax)) {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"});
}
next if !$form->{"debit_$i"} && !$form->{"credit_$i"} && !$params{keep_rows_without_amount};
push @a, {};
$debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
if ($debitcredit) {
$debitcount++;
} else {
$creditcount++;
}
push @a, {};
$debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
if (($debitcount >= 2) && ($creditcount == 2)) {
$form->{"credit_$i"} = 0;
$form->{"tax_$i"} = 0;
$creditcount--;
$form->{creditlock} = 1;
}
if (($creditcount >= 2) && ($debitcount == 2)) {
$form->{"debit_$i"} = 0;
$form->{"tax_$i"} = 0;
$debitcount--;
$form->{debitlock} = 1;
}
if (($creditcount == 1) && ($debitcount == 2)) {
$form->{creditlock} = 1;
}
if (($creditcount == 2) && ($debitcount == 1)) {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
}
if (!$debitcredit && $debittax) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
}
$amount =
($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
if (!$iswithouttax) {
if ($debitcredit) {
$debitcount++;
$debittax = 1;
} else {
$creditcount++;
}
if (($debitcount >= 2) && ($creditcount == 2)) {
$form->{"credit_$i"} = 0;
$form->{"tax_$i"} = 0;
$creditcount--;
$form->{creditlock} = 1;
}
if (($creditcount >= 2) && ($debitcount == 2)) {
$form->{"debit_$i"} = 0;
$form->{"tax_$i"} = 0;
$debitcount--;
$form->{debitlock} = 1;
}
if (($creditcount == 1) && ($debitcount == 2)) {
$form->{creditlock} = 1;
}
if (($creditcount == 2) && ($debitcount == 1)) {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
}
if (!$debitcredit && $debittax) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
}
$amount =
($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
$form->{"taxchart_$i"} = "$notax_id--0.00";
$form->{"tax_$i"} = 0;
$credittax = 1;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
$credittax = 1;
}
};
my ($tmpnetamount,$tmpdiff);
($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
};
my ($tmpnetamount,$tmpdiff);
($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
$count++;
}
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
$count++;
}
for my $i (1 .. $count) {
......
for (@flds) { delete $form->{"${_}_$i"} }
}
$form->{rowcount} = $count + 1;
$form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1);
&display_form;
display_form();
$main::lxdebug->leave_sub();
}
sql/Pg-upgrade2/convert_drafts_to_record_templates.pl
# $tax_id may be 0 as there's an entry in tax with id = 0.
# $chart_id must not be 0 as there's no entry in chart with id = 0.
# No $amount means empty row.
next unless $amount && $chart_id && (($tax_id // '') ne '');
next unless $chart_id && (($tax_id // '') ne '');
@values = (
# record_template_id,
......
# $tax_id may be 0 as there's an entry in tax with id = 0.
# $chart_id must not be 0 as there's no entry in chart with id = 0.
# No $amount means empty row.
next unless $amount && $chart_id && (($tax_id // '') ne '');
next unless $chart_id && (($tax_id // '') ne '');
@values = (
# record_template_id,
......
# $tax_id may be 0 as there's an entry in tax with id = 0.
# $chart_id must not be 0 as there's no entry in chart with id = 0.
# No $debit and no $credit means empty row.
next unless ($debit || $credit) && $chart_id && (($tax_id // '') ne '');
next unless $chart_id && (($tax_id // '') ne '');
@values = (
# record_template_id,
......
$self->clean_drafts;
$self->finish_statements;
# die "boom!";
return 1;
}

Auch abrufbar als: Unified diff