X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=f39ff1368d6150f486b3272dc81220654fd88266;hb=4f63ea874f629459e1a73643595ab5e23e38e7f0;hp=a6cdff236145f7a911057de3e04df205009e3abf;hpb=3c1ceacd69653915e0b44f1700b198d96681f546;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index a6cdff236..f39ff1368 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -69,10 +69,6 @@ sub add {
$form{jsscript} = "date";
- if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
- {
- $form->error("Access Denied");
- }
&invoice_links;
&prepare_invoice;
&display_form;
@@ -89,10 +85,6 @@ sub edit {
$form->{javascript} = qq||;
#/show hhistory button
- if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
- {
- $form->error("Access Denied");
- }
$edit = 1;
if ($form->{print_and_post}) {
$form->{action} = "print";
@@ -248,8 +240,6 @@ sub prepare_invoice {
if ($form->{id}) {
- map { $form->{$_} =~ s/\"/"/g }
- qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
# # get pricegroups for parts
# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@ -276,8 +266,6 @@ sub prepare_invoice {
$form->{"qty_$i"} =
$form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit partnotes);
$form->{rowcount} = $i;
}
@@ -383,7 +371,7 @@ sub form_header {
: (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
'-onChange' => 'document.getElementById(\'update_button\').click();',
'-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
-
+
|;
%labels = ();
@@ -540,7 +528,7 @@ sub form_header {
$jsscript = "";
if ($form->{type} eq "credit_note") {
$button1 = qq|
-
+
|;
@@ -551,7 +539,7 @@ sub form_header {
"trigger1");
} else {
$button1 = qq|
-
+
|;
@@ -614,7 +602,8 @@ sub form_header {
creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
max_dunning_level dunning_amount
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax
- shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus),
+ shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
+ convert_from_do_ids convert_from_oe_ids),
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
print qq|$form->{saved_message}
| if $form->{saved_message};
@@ -636,10 +625,10 @@ sub form_header {
$employees
$salesman
|;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
if ($form->{type} eq "credit_note") {
print qq|
| . $locale->text('Credit Note Number') . qq|
-
+ |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq|
| . $locale->text('Credit Note Date') . qq|
@@ -714,7 +710,9 @@ print qq|
} else {
print qq|
| . $locale->text('Invoice Number') . qq|
-
+ |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq|
| . $locale->text('Invoice Date') . qq|
@@ -724,6 +722,12 @@ print qq|
| . $locale->text('Due Date') . qq|
$button2
+
+ | . $locale->text('Delivery Order Number') . qq|
+ |.
+ $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
+ qq|
+
| . $locale->text('Delivery Date') . qq|
$button3
@@ -731,7 +735,9 @@ print qq|
}
print qq|
| . $locale->text('Order Number') . qq|
-
+ |.
+ $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
+ qq|
| . $locale->text('Order Date') . qq|
@@ -740,7 +746,9 @@ print qq|
| . $locale->text('Quotation Number') . qq|
-
+ |.
+ $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
+ qq|
| . $locale->text('Quotation Date') . qq|
@@ -749,7 +757,9 @@ print qq|
| . $locale->text('Customer Order Number') . qq|
-
+ |.
+ $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
+ qq|
| . $locale->text('Project Number') . qq|
@@ -1192,7 +1202,6 @@ if ($form->{type} eq "credit_note") {
$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-. $cgi->hidden('-name' => 'close_do_ids', '-default' => [$form->{close_do_ids}])
. qq|