X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Foe.pl;h=0e469d8d3f8dee1c56aff4eaef9bbf630516925d;hb=b2d4ba3d2737fd6935875bee2e2b87a114785a94;hp=d68c04fd53e45ed9f76dc7d9f17750464d7bb83f;hpb=a19b92d1f0efeb313b18517452693b35e147063b;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d68c04fd5..0e469d8d3 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -50,8 +50,7 @@ require "bin/mozilla/reportgenerator.pl";
use strict;
-my $print_post;
-my %TMPL_VAR;
+our %TMPL_VAR;
1;
@@ -283,6 +282,7 @@ sub prepare_order {
$form->{"reqdate_$i"} ||= $form->{"deliverydate_$i"};
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * ($format_discounts ? 100 : 1));
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
}
@@ -300,8 +300,9 @@ sub form_header {
check_oe_access();
- # Container for template variables. Unfortunately this has to be visible in form_footer too, so not my.
- our %TMPL_VAR = ();
+ # Container for template variables. Unfortunately this has to be
+ # visible in form_footer too, so package local level and not my here.
+ %TMPL_VAR = ();
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
@@ -452,10 +453,10 @@ sub form_footer {
$form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
$TMPL_VAR{tax} .= qq|
-
- $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
- $form->{"${item}_total"} |
-
|;
+
+ $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
+ $form->{"${item}_total"} |
+
|;
}
}
@@ -470,14 +471,14 @@ sub form_footer {
$form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
$TMPL_VAR{tax} .= qq|
-
- Enthaltene $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
- $form->{"${item}_total"} |
-
-
- Nettobetrag |
- $form->{"${item}_netto"} |
-
|;
+
+ Enthaltene $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
+ $form->{"${item}_total"} |
+
+
+ Nettobetrag |
+ $form->{"${item}_netto"} |
+
|;
}
}
}
@@ -518,12 +519,8 @@ sub update {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
$form->{update} = 1;
- my $payment_id = $form->{payment_id} if $form->{payment_id};
-
&check_name($form->{vc});
- $form->{payment_id} = $payment_id if $form->{payment_id} eq "";
-
my $buysell = 'buy';
$buysell = 'sell' if ($form->{vc} eq 'vendor');
$form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
@@ -552,18 +549,20 @@ sub update {
my $rows = scalar @{ $form->{item_list} };
# hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen
- # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
+ # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
# select discount as vendor_discount from vendor ||
# select discount as customer_discount from customer
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100);
+ $form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"});
+
if ($rows) {
- $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+ $form->{"qty_$i"} = 1 unless ($form->parse_amount(\%myconfig, $form->{"qty_$i"}));
if ($rows > 1) {
&select_item;
- exit;
+ ::end_of_request();
} else {
@@ -602,6 +601,7 @@ sub update {
$form->{creditremaining} -= $amount;
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
# get pricegroups for parts
@@ -689,7 +689,10 @@ sub search {
$form->header();
- print $form->parse_html_template('oe/search', { %myconfig });
+ print $form->parse_html_template('oe/search', {
+ %myconfig,
+ is_order => $form->{type} =~ /_order/,
+ });
$main::lxdebug->leave_sub();
}
@@ -745,7 +748,8 @@ sub orders {
"shipvia", "globalprojectnumber",
"transaction_description", "open",
"delivered", "marge_total", "marge_percent",
- "country", "ustid",
+ "vcnumber", "ustid",
+ "country",
);
# only show checkboxes if gotten here via sales_order form.
@@ -789,7 +793,7 @@ sub orders {
my %column_defs = (
'ids' => { 'text' => '', },
'transdate' => { 'text' => $locale->text('Date'), },
- 'reqdate' => { 'text' => $locale->text('Required by'), },
+ 'reqdate' => { 'text' => $form->{type} =~ /_order/ ? $locale->text('Required by') : $locale->text('Valid until') },
'id' => { 'text' => $locale->text('ID'), },
'ordnumber' => { 'text' => $locale->text('Order'), },
'quonumber' => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
@@ -807,6 +811,7 @@ sub orders {
'delivered' => { 'text' => $locale->text('Delivered'), },
'marge_total' => { 'text' => $locale->text('Ertrag'), },
'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), },
+ 'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
'country' => { 'text' => $locale->text('Country'), },
'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
);
@@ -859,6 +864,7 @@ sub orders {
'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
);
$report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
# add sort and escape callback, this one we use for the add sub
$form->{callback} = $href .= "&sort=$form->{sort}";
@@ -1004,7 +1010,7 @@ sub save_and_close {
$form->{payment_id} = $payment_id;
}
&update;
- exit;
+ ::end_of_request();
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1057,8 +1063,8 @@ sub save_and_close {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "SAVED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "SAVED";
+ $form->save_history;
}
# /saving the history
@@ -1099,6 +1105,7 @@ sub save {
$form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
if ($form->{currency} ne $form->{defaultcurrency});
+ remove_emptied_rows();
&validate_items;
my $payment_id;
@@ -1112,7 +1119,7 @@ sub save {
$form->{payment_id} = $payment_id;
}
&update;
- exit;
+ ::end_of_request();
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1164,8 +1171,8 @@ sub save {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "SAVED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "SAVED";
+ $form->save_history;
}
# /saving the history
@@ -1173,7 +1180,7 @@ sub save {
if(!$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
edit();
- exit;
+ ::end_of_request();
}
$main::lxdebug->leave_sub();
}
@@ -1252,12 +1259,12 @@ sub delete_order_quotation {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
# /saving the history
$form->info($msg);
- exit();
+ ::end_of_request();
}
$form->error($err);
@@ -1303,7 +1310,7 @@ sub invoice {
if (&check_name($form->{vc})) {
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
&update;
- exit;
+ ::end_of_request();
}
$form->{cp_id} *= 1;
@@ -1326,7 +1333,7 @@ sub invoice {
if (!$exchangerate) {
&backorder_exchangerate($orddate, $buysell);
- exit;
+ ::end_of_request();
}
}
@@ -1412,6 +1419,10 @@ sub invoice {
}
+ # show pricegroup in newly loaded invoice when creating invoice from quotation/order
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ set_pricegroup($_) for 1 .. $form->{rowcount};
+
&display_form;
$main::lxdebug->leave_sub();
@@ -1458,16 +1469,16 @@ sub backorder_exchangerate {
|
@@ -1674,7 +1685,7 @@ sub check_for_direct_delivery {
$main::lxdebug->leave_sub();
- exit 0;
+ ::end_of_request();
}
sub purchase_order {
@@ -1686,7 +1697,9 @@ sub purchase_order {
check_oe_access();
$main::auth->assert('purchase_order_edit');
+ $form->{sales_order_to_purchase_order} = 0;
if ($form->{type} eq 'sales_order') {
+ $form->{sales_order_to_purchase_order} = 1;
check_for_direct_delivery();
}
@@ -1704,6 +1717,8 @@ sub purchase_order {
&poso;
+ delete $form->{sales_order_to_purchase_order};
+
$main::lxdebug->leave_sub();
}
@@ -1752,8 +1767,14 @@ sub poso {
$form->{old_salesman_id} = $form->{salesman_id};
# reset
- map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered
- ordnumber);
+ map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber);
+
+ # if purchase_order was generated from sales_order, use lastcost_$i as sellprice_$i
+ if ( $form->{sales_order_to_purchase_order} ) {
+ for my $i (1 .. $form->{rowcount}) {
+ $form->{"sellprice_${i}"} = $form->format_amount(\%myconfig,$form->{"lastcost_${i}"});
+ };
+ };
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);
@@ -1765,19 +1786,16 @@ sub poso {
map { $form->{$_} = $saved_vars{$_} } keys %saved_vars;
- &prepare_order;
-
# prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5)
- # and therefore multiplies the values by 100 in the case of reading from db or making an order from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+ # and therefore multiplies the values by 100 in the case of reading from db or making an order
+ # from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+ # ergänzung 03.10.2010 muss vor prepare_order passieren (s.a. Svens Kommentar zu Bug 1017)
+ # das parse_amount wird oben schon ausgeführt, deswegen an dieser stelle raus (wichtig: kommawerte bei discount testen)
for my $i (1 .. $form->{rowcount}) {
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 0.01);
+ $form->{"discount_$i"} /=100;
};
- # format amounts
- for my $i (1 .. $form->{rowcount} - 1) {
- map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit);
- }
-
+ &prepare_order;
&update;
$main::lxdebug->leave_sub();
@@ -1819,10 +1837,10 @@ sub delivery_order {
delete @{$form}{qw(id subject message cc bcc printed emailed queued creditlimit creditremaining discount tradediscount oldinvtotal closed delivered)};
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 lastcost basefactor discount);
}
- my %old_values = map { $_ => $form->{$_} } qw(customer_id oldcustomer customer vendor_id oldvendor vendor);
+ my %old_values = map { $_ => $form->{$_} } qw(customer_id oldcustomer customer vendor_id oldvendor vendor shipto_id);
order_links();
@@ -1844,8 +1862,6 @@ sub e_mail {
$form->{print_and_save} = 1;
- $print_post = 1;
-
my $saved_form = save_form();
save();
@@ -1885,9 +1901,7 @@ sub display_form {
}
$form->{"taxaccounts"} = "";
- for my $i (1 .. $form->{"rowcount"}) {
- IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1) if $form->{"id_$i"};
- }
+ IC->retrieve_accounts(\%myconfig, $form, map { $_ => $form->{"id_$_"} } 1 .. $form->{rowcount});
$form->{rowcount}++;
$form->{"project_id_$form->{rowcount}"} = $form->{globalproject_id};
@@ -1926,3 +1940,17 @@ sub report_for_todo_list {
return $content;
}
+sub dispatcher {
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order purchase_order quotation
+ request_for_quotation sales_order sales_order save save_and_close save_as_new ship_to update)) {
+ if ($form->{"action_${action}"}) {
+ call_sub($action);
+ return;
+ }
+ }
+
+ $form->error($locale->text('No action defined.'));
+}