$::form->{duedate} = $today->to_kivitendo;
$::form->{rowcount} = @{ $template->items };
$::form->{paidaccounts} = 1;
- $::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded notes);
+ $::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded notes transaction_description);
if ($template->vendor) {
$::form->{vendor_id} = $template->vendor_id;
$::form->{vendor} = $template->vendor->name;
- $::form->{duedate} = $template->vendor->payment->calc_date(reference_date => $today)->to_kivitendo if $template->vendor->payment;
+ $::form->{duedate} = $template->vendor->payment->calc_date(reference_date => $today)->to_kivitendo if $template->vendor->payment;
}
my $row = 0;
} (1..($::form->{rowcount} || 1));
$template->assign_attributes(
- template_type => 'ap_transaction',
- template_name => $new_name,
-
- currency_id => SL::DB::Manager::Currency->find_by(name => $::form->{currency})->id,
- ar_ap_chart_id => $::form->{AP_chart_id} || undef,
- vendor_id => $::form->{vendor_id} || undef,
- department_id => $::form->{department_id} || undef,
- project_id => $::form->{globalproject_id} || undef,
- payment_id => $::form->{payment_id} || undef,
- taxincluded => $::form->{taxincluded} ? 1 : 0,
- direct_debit => $::form->{direct_debit} ? 1 : 0,
- ordnumber => $::form->{ordnumber},
- notes => $::form->{notes},
-
- items => \@items,
+ template_type => 'ap_transaction',
+ template_name => $new_name,
+
+ currency_id => SL::DB::Manager::Currency->find_by(name => $::form->{currency})->id,
+ ar_ap_chart_id => $::form->{AP_chart_id} || undef,
+ vendor_id => $::form->{vendor_id} || undef,
+ department_id => $::form->{department_id} || undef,
+ project_id => $::form->{globalproject_id} || undef,
+ payment_id => $::form->{payment_id} || undef,
+ taxincluded => $::form->{taxincluded} ? 1 : 0,
+ direct_debit => $::form->{direct_debit} ? 1 : 0,
+ ordnumber => $::form->{ordnumber},
+ notes => $::form->{notes},
+ transaction_description => $::form->{transaction_description},
+
+ items => \@items,
);
eval {
$form->{"taxcharts_$i"} = \@taxcharts;
# reverse charge hack for template, display two taxes
- if ($taxchart_to_use->taxkey == 94) {
+ if ($taxchart_to_use->reverse_charge_chart_id) {
my $tmpnetamount;
- ($tmpnetamount, $form->{"tax_reverse_$i"}) = $form->calculate_tax($form->parse_amount(\%myconfig, $form->{"amount_$i"}), 0.19, $form->{taxincluded},2);
+ ($tmpnetamount, $form->{"tax_reverse_$i"}) = $form->calculate_tax($form->parse_amount(\%myconfig, $form->{"amount_$i"}),
+ $taxchart_to_use->rate, $form->{taxincluded}, 2 );
+
$form->{"tax_charge_$i"} = $form->{"tax_reverse_$i"} * -1;
$form->{"tax_reverse_$i"} = $form->format_amount(\%myconfig, $form->{"tax_reverse_$i"}, 2);
$form->{"tax_charge_$i"} = $form->format_amount(\%myconfig, $form->{"tax_charge_$i"}, 2);
$form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
my $zero_amount_posting = 1;
- # no taxincluded for 94
- my $tax = SL::DB::Manager::Tax->get_first( where => [taxkey => 94 ]);
- my $tax_id = ref $tax eq 'SL::DB::Tax' ? $tax->id : undef;
for my $i (1 .. $form->{rowcount}) {
- # no taxincluded for 94
- if ($tax_id && $form->{"taxchart_$i"} =~ m/^$tax_id--/ && $form->{taxincluded}) {
+
+ # no taxincluded for reverse charge
+ my ($used_tax_id) = split(/--/, $form->{"taxchart_$i"});
+ my $tax = SL::DB::Manager::Tax->find_by(id => $used_tax_id);
+ if ($tax->reverse_charge_chart_id && $form->{taxincluded}) {
$form->error($locale->text('Cannot Post AP transaction with tax included!'));
}
+
if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) {
$zero_amount_posting = 0;
}
$form->{title} = $locale->text('Vendor Invoices & AP Transactions');
$::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
+ $::form->{ALL_TAXZONES} = SL::DB::Manager::TaxZone ->get_all_sorted;
+
# constants and subs for template
$form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto
- parts_partnumber parts_description department_id);
+ parts_partnumber parts_description department_id taxzone_id);
my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
'insertdate' => { 'text' => $locale->text('Insert Date'), },
);
- foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {
+ foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
return if $order->type ne 'purchase_order';
my $today = DateTime->today_local;
- $::form->{title} = "Add";
- $::form->{vc} = 'vendor';
- $::form->{vendor_id} = $order->customervendor->id;
- $::form->{vendor} = $order->vendor->name;
- $::form->{convert_from_oe_id} = $order->id;
- $::form->{globalproject_id} = $order->globalproject_id;
- $::form->{ordnumber} = $order->number;
- $::form->{department_id} = $order->department_id;
- $::form->{currency} = $order->currency->name;
- $::form->{taxincluded} = 1; # we use amount below, so tax is included
- $::form->{transdate} = $today->to_kivitendo;
- $::form->{duedate} = $today->to_kivitendo;
- $::form->{duedate} = $order->payment_terms->calc_date(reference_date => $today)->to_kivitendo if $order->payment_terms;
- $::form->{deliverydate} = $order->reqdate->to_kivitendo if $order->reqdate;
+ $::form->{title} = "Add";
+ $::form->{vc} = 'vendor';
+ $::form->{vendor_id} = $order->customervendor->id;
+ $::form->{vendor} = $order->vendor->name;
+ $::form->{convert_from_oe_id} = $order->id;
+ $::form->{globalproject_id} = $order->globalproject_id;
+ $::form->{ordnumber} = $order->number;
+ $::form->{department_id} = $order->department_id;
+ $::form->{transaction_description} = $order->transaction_description;
+ $::form->{currency} = $order->currency->name;
+ $::form->{taxincluded} = 1; # we use amount below, so tax is included
+ $::form->{transdate} = $today->to_kivitendo;
+ $::form->{duedate} = $today->to_kivitendo;
+ $::form->{duedate} = $order->payment_terms->calc_date(reference_date => $today)->to_kivitendo if $order->payment_terms;
+ $::form->{deliverydate} = $order->reqdate->to_kivitendo if $order->reqdate;
create_links();
my $config_po_ap_workflow_chart_id = $::instance_conf->get_workflow_po_ap_chart_id;
projects / kivitendo-erp.git / blobdiff