projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beim Anlegen von Buchungsgruppen die in den Benutzereinstellungen ausgewählten Standa...
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
e810854
..
d678344
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-284,12
+284,9
@@
sub order_links {
sub prepare_order {
$lxdebug->enter_sub();
sub prepare_order {
$lxdebug->enter_sub();
- $form->{format} = "pdf" unless ($form->{print_and_save} && $form->{format});
$form->{media} = "screen";
$form->{formname} = $form->{type} unless $form->{formname};
$form->{media} = "screen";
$form->{formname} = $form->{type} unless $form->{formname};
- map { $form->{$_} =~ s/\"/"/g }
- qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
my $i = 0;
foreach $ref (@{ $form->{form_details} }) {
$form->{rowcount} = ++$i;
my $i = 0;
foreach $ref (@{ $form->{form_details} }) {
$form->{rowcount} = ++$i;
@@
-334,6
+331,11
@@
sub form_header {
$checkedopen = ($form->{closed}) ? "" : "checked";
$checkedclosed = ($form->{closed}) ? "checked" : "";
$checkedopen = ($form->{closed}) ? "" : "checked";
$checkedclosed = ($form->{closed}) ? "checked" : "";
+ map { $form->{$_} =~ s/\"/"/g }
+ qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname
+ shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
+ shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
+
# use JavaScript Calendar or not
$form->{jsscript} = $form->{jscalendar};
$jsscript = "";
# use JavaScript Calendar or not
$form->{jsscript} = $form->{jscalendar};
$jsscript = "";
@@
-536,26
+538,21
@@
sub form_header {
foreach $item (@{ $form->{TAXZONE} }) {
if ($item->{id} == $form->{taxzone_id}) {
$form->{selecttaxzone} .=
foreach $item (@{ $form->{TAXZONE} }) {
if ($item->{id} == $form->{taxzone_id}) {
$form->{selecttaxzone} .=
- "<option value=$item->{id} selected>$item->{description}</option>";
+ "<option value=$item->{id} selected>" . H($item->{description}) .
+ "</option>";
} else {
$form->{selecttaxzone} .=
} else {
$form->{selecttaxzone} .=
- "<option value=$item->{id}>
$item->{description}
</option>";
+ "<option value=$item->{id}>
" . H($item->{description}) . "
</option>";
}
}
} else {
$form->{selecttaxzone} =~ s/ selected//g;
if ($form->{taxzone_id} ne "") {
}
}
} else {
$form->{selecttaxzone} =~ s/ selected//g;
if ($form->{taxzone_id} ne "") {
- $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}
/value=$form->{taxzone_id} selected
/;
+ $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}
>/value=$form->{taxzone_id} selected>
/;
}
}
}
}
- if ($form->{rowcount} >0) {
- $form->{selecttaxzone} =~ /<option value=\d+ selected>.*?<\/option>/;
- $form->{selecttaxzone} = $&;
- }
-
-
$taxzone = qq|
<tr>
<th align=right>| . $locale->text('Steuersatz') . qq|</th>
$taxzone = qq|
<tr>
<th align=right>| . $locale->text('Steuersatz') . qq|</th>
@@
-830,6
+827,8
@@
$jsscript
<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
<input type=hidden name=shiptophone value="$form->{shiptophone}">
<input type=hidden name=shiptofax value="$form->{shiptofax}">
<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
<input type=hidden name=shiptophone value="$form->{shiptophone}">
<input type=hidden name=shiptofax value="$form->{shiptofax}">
+<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
+<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
<!-- email variables -->
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
<!-- email variables -->
@@
-1088,7
+1087,7
@@
sub form_footer {
<input class=submit type=submit name=action value="|
. $locale->text('Sales Order') . qq|">
<input class=submit type=submit name=action value="|
<input class=submit type=submit name=action value="|
. $locale->text('Sales Order') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Quotation') . qq|">
+ . $locale->text('
Request for
Quotation') . qq|">
|;
} else {
|;
} else {
@@
-1168,8
+1167,6
@@
sub update {
} else {
} else {
- $form->{"selected_unit_$i"} = $form->{"unit_$i"};
-
if ( $form->{type} eq 'purchase_order'
|| $form->{type} eq 'request_quotation') {
IR->retrieve_item(\%myconfig, \%$form);
if ( $form->{type} eq 'purchase_order'
|| $form->{type} eq 'request_quotation') {
IR->retrieve_item(\%myconfig, \%$form);
@@
-1621,7
+1618,9
@@
sub orders {
. qq|</a></th>|;
$column_header{quonumber} =
qq|<th><a class=listheading href=$href&sort=quonumber>|
. qq|</a></th>|;
$column_header{quonumber} =
qq|<th><a class=listheading href=$href&sort=quonumber>|
- . $locale->text('Quotation')
+ . ($form->{"type"} eq "request_quotation" ?
+ $locale->text('RFQ') :
+ $locale->text('Quotation'))
. qq|</a></th>|;
$column_header{name} =
qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
. qq|</a></th>|;
$column_header{name} =
qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
@@
-1964,10
+1963,12
@@
sub save_and_close {
}
# get new number in sequence if no number is given or if saveasnew was requested
}
# get new number in sequence if no number is given or if saveasnew was requested
- if (!$form->{$ordumber} || $form->{saveasnew}) {
+ if (!$form->{$ord
n
umber} || $form->{saveasnew}) {
$form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld);
}
$form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld);
}
+ relink_accounts();
+
$form->redirect(
$form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
if (OE->save(\%myconfig, \%$form));
$form->redirect(
$form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
if (OE->save(\%myconfig, \%$form));
@@
-2040,6
+2041,7
@@
sub save {
$form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
unless $form->{$ordnumber};
$form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
unless $form->{$ordnumber};
+ relink_accounts();
OE->save(\%myconfig, \%$form);
$form->{simple_save} = 1;
OE->save(\%myconfig, \%$form);
$form->{simple_save} = 1;
@@
-2141,6
+2143,13
@@
sub invoice {
$form->{cp_id} *= 1;
$form->{cp_id} *= 1;
+ for $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+ $form->{"${_}_${i}"})
+ if ($form->{"${_}_${i}"}) }
+ qw(ship qty sellprice listprice basefactor));
+ }
+
if ( $form->{type} =~ /_order/
&& $form->{currency} ne $form->{defaultcurrency}) {
if ( $form->{type} =~ /_order/
&& $form->{currency} ne $form->{defaultcurrency}) {
@@
-2165,7
+2174,7
@@
sub invoice {
# if not it's most likely a collective order, which can't be saved back
# so they just have to be closed
if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
# if not it's most likely a collective order, which can't be saved back
# so they just have to be closed
if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
- OE->
save
(\%myconfig, \%$form);
+ OE->
close_order
(\%myconfig, \%$form);
} else {
OE->close_orders(\%myconfig, \%$form);
}
} else {
OE->close_orders(\%myconfig, \%$form);
}
@@
-2389,6
+2398,8
@@
sub create_backorder {
} qw(sellprice discount);
}
} qw(sellprice discount);
}
+ relink_accounts();
+
OE->save(\%myconfig, \%$form);
# rebuild rows for invoice
OE->save(\%myconfig, \%$form);
# rebuild rows for invoice
@@
-2429,8
+2440,7
@@
sub purchase_order {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
- $form->{closed} = 1;
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, \%$form);
}
$form->{cp_id} *= 1;
}
$form->{cp_id} *= 1;
@@
-2449,8
+2459,7
@@
sub sales_order {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
- $form->{closed} = 1;
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, $form);
}
$form->{cp_id} *= 1;
}
$form->{cp_id} *= 1;
@@
-2476,6
+2485,13
@@
sub poso {
map { delete $form->{$_} }
qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
map { delete $form->{$_} }
qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
+ for $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+ $form->{"${_}_${i}"})
+ if ($form->{"${_}_${i}"}) }
+ qw(ship qty sellprice listprice basefactor));
+ }
+
&order_links;
&prepare_order;
&order_links;
&prepare_order;
@@
-2683,6
+2699,8
@@
sub display_ship_receive {
<input type=hidden name=shiptophone value="$form->{shiptophone}">
<input type=hidden name=shiptofax value="$form->{shiptofax}">
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
<input type=hidden name=shiptophone value="$form->{shiptophone}">
<input type=hidden name=shiptofax value="$form->{shiptofax}">
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
+<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
+<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
<!-- email variables -->
<input type=hidden name=message value="$form->{message}">
<!-- email variables -->
<input type=hidden name=message value="$form->{message}">