X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=6001c87bcb4cf0bf60434ef0e67baa98386f8703;hb=1beca8de27492157b3534d1b0fd432ce0286828a;hp=f7f337561fcb672398165aabb6711ff808d1ba8a;hpb=87e65e6c1cc64bfb2d73b6914ed2ef136861dd42;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f7f337561..6001c87bc 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -47,6 +47,9 @@ use List::MoreUtils qw(any none);
use List::Util qw(min max reduce sum);
use Data::Dumper;
+use SL::DB::Customer;
+use SL::DB::TaxZone;
+
require "bin/mozilla/io.pl";
require "bin/mozilla/arap.pl";
require "bin/mozilla/reportgenerator.pl";
@@ -227,8 +230,7 @@ sub order_links {
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
- $form->{webdav} = $::lx_office_conf{features}->{webdav};
- $form->{jsscript} = 1;
+ $form->{webdav} = $::instance_conf->get_webdav;
my $editing = $form->{id};
@@ -243,14 +245,14 @@ sub order_links {
$form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"};
- $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id currency));
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency));
$form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
# get customer / vendor
IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/;
IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
- $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id));
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id delivery_term_id));
$form->restore_vars(qw(currency)) if $form->{id};
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
@@ -316,9 +318,6 @@ sub form_header {
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
-
# openclosed checkboxes
my @tmp;
push @tmp, sprintf qq||,
@@ -434,8 +433,6 @@ sub form_header {
$form->{javascript} .= qq||;
$form->{javascript} .= qq||;
- $::request->layout->use_stylesheet('presenter/record/record_list.css');
-
$form->header;
$TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
@@ -446,7 +443,7 @@ sub form_header {
shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus),
@custom_hiddens,
- map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ]; # deleted: discount
+ map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount
%TMPL_VAR = (
%TMPL_VAR,
@@ -481,12 +478,9 @@ sub form_footer {
$TMPL_VAR{notes} = qq||;
$TMPL_VAR{intnotes} = qq||;
- my $paymet_id = $::form->{payment_id};
- IS->get_customer(\%myconfig, $::form) if $form->{type} =~ /sales_(order|quotation)/;
- $::form->{payment_id} = $paymet_id;
-
- if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
- $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
+ if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+ my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+ $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
}
if (!$form->{taxincluded}) {
@@ -529,9 +523,11 @@ sub form_footer {
$form->{oldinvtotal} = $form->{invtotal};
+ $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+
print $form->parse_html_template("oe/form_footer", {
%TMPL_VAR,
- webdav => $::lx_office_conf{features}->{webdav},
+ webdav => $::instance_conf->get_webdav,
print_options => print_options(inline => 1),
label_edit => $locale->text("Edit the $form->{type}"),
label_workflow => $locale->text("Workflow $form->{type}"),
@@ -604,7 +600,11 @@ sub update {
$form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"});
if ($rows) {
- $form->{"qty_$i"} = 1 unless ($form->parse_amount(\%myconfig, $form->{"qty_$i"}));
+
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
if ($rows > 1) {
@@ -724,11 +724,12 @@ sub search {
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
$form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
"departments" => "ALL_DEPARTMENTS",
- "$form->{vc}s" => "ALL_VC");
+ "$form->{vc}s" => "ALL_VC",
+ "taxzones" => "ALL_TAXZONES",
+ "business_types" => "ALL_BUSINESS_TYPES",);
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
# constants and subs for template
- $form->{jsscript} = 1;
$form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
$form->header();
@@ -795,7 +796,8 @@ sub orders {
"delivered", "periodic_invoices",
"marge_total", "marge_percent",
"vcnumber", "ustid",
- "country",
+ "country", "shippingpoint",
+ "taxzone",
);
# only show checkboxes if gotten here via sales_order form.
@@ -833,9 +835,13 @@ sub orders {
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
transaction_description transdatefrom transdateto type vc employee_id salesman_id
- reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive);
+ reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
+ business_id shippingpoint taxzone_id);
- my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+ my @keys_for_url = grep { $form->{$_} } @hidden_variables;
+ push @keys_for_url, 'taxzone_id' if $form->{taxzone_id} ne ''; # taxzone_id could be 0
+
+ my $href = build_std_url('action=orders', @keys_for_url);
my %column_defs = (
'ids' => { 'text' => '', },
@@ -863,9 +869,11 @@ sub orders {
'country' => { 'text' => $locale->text('Country'), },
'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
'periodic_invoices' => { 'text' => $locale->text('Per. Inv.'), },
+ 'shippingpoint' => { 'text' => $locale->text('Shipping Point'), },
+ 'taxzone' => { 'text' => $locale->text('Steuersatz'), },
);
- foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) {
+ foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -890,6 +898,7 @@ sub orders {
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber};
push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes};
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
+ push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint};
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
@@ -904,7 +913,15 @@ sub orders {
push @options, $locale->text('Closed') if $form->{closed};
push @options, $locale->text('Delivery Order created') if $form->{delivered};
push @options, $locale->text('Not delivered') if $form->{notdelivered};
- push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_actibe};
+ push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_active};
+
+ if ($form->{business_id}) {
+ my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');
+ push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description;
+ }
+ if ($form->{taxzone_id} ne '') { # taxzone_id could be 0
+ push @options, $locale->text('Steuersatz') . " : " . SL::DB::TaxZone->new(id => $form->{taxzone_id})->load->description;
+ }
$report->set_options('top_info_text' => join("\n", @options),
'raw_top_info_text' => $form->parse_html_template('oe/orders_top'),
@@ -1212,6 +1229,7 @@ sub save {
}
+ # value of $ordnumber is ordnumber or quonumber
$form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
unless $form->{$ordnumber};
@@ -1221,7 +1239,12 @@ sub save {
# saving the history
if(!exists $form->{addition}) {
- $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ if ( $form->{formname} eq 'sales_quotation' or $form->{formname} eq 'request_quotation' ) {
+ $form->{snumbers} = qq|quonumber_| . $form->{quonumber};
+ } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ };
+ $form->{what_done} = $form->{formname};
$form->{addition} = "SAVED";
$form->save_history;
}
@@ -1237,31 +1260,6 @@ sub save {
}
sub delete {
- $::lxdebug->enter_sub;
-
- check_oe_access();
-
- $::form->header;
-
- # delete action variable
- delete $::form->{$_} for qw(action header);
-
- my @hiddens;
- for my $key (keys %$::form) {
- next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key};
- push @hiddens, { key => $key, value => $::form->{$key} };
- }
-
- print $::form->parse_html_template('oe/delete', {
- hiddens => \@hiddens,
- is_order => scalar($::form->{type} =~ /_order$/),
- });
-
-
- $::lxdebug->leave_sub;
-}
-
-sub delete_order_quotation {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -1814,13 +1812,13 @@ sub poso {
# also reset discounts
if ( $form->{sales_order_to_purchase_order} ) {
for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_${i}"} = $form->format_amount(\%myconfig,$form->{"lastcost_${i}"});
+ $form->{"sellprice_${i}"} = $form->{"lastcost_${i}"};
$form->{"discount_${i}"} = 0;
};
};
for my $i (1 .. $form->{rowcount}) {
- map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount);
+ map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount lastcost);
}
my %saved_vars = map { $_ => $form->{$_} } grep { $form->{$_} } qw(currency);
@@ -2070,7 +2068,9 @@ sub _oe_remove_delivered_or_billed_rows {
next if $ord_quot->is_sales != $record->is_sales;
foreach my $item (@{ $record->items }) {
- $handled_base_qtys{ $item->parts_id } += $item->qty * $item->unit_obj->base_factor;
+ my $key = $item->parts_id;
+ $key .= ':' . $item->serialnumber if $item->serialnumber;
+ $handled_base_qtys{$key} += $item->qty * $item->unit_obj->base_factor;
}
}