From 2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8 Mon Sep 17 00:00:00 2001 From: Thomas Kasulke Date: Tue, 20 Feb 2007 10:47:47 +0000 Subject: [PATCH] =?utf8?q?Historie=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/ct.pl | 85 +++- bin/mozilla/dn.pl | 13 +- bin/mozilla/gl.pl | 27 +- bin/mozilla/ic.pl | 45 ++- bin/mozilla/io.pl | 996 +--------------------------------------------- bin/mozilla/is.pl | 60 ++- bin/mozilla/oe.pl | 38 +- bin/mozilla/pe.pl | 62 ++- bin/mozilla/rp.pl | 8 +- 9 files changed, 309 insertions(+), 1025 deletions(-) diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index a04cf5e5b..767d0e87d 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -557,6 +557,10 @@ sub list_names { sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button + # $locale->text('Edit Customer') # $locale->text('Edit Vendor') @@ -1243,6 +1247,17 @@ $update_button . qq|">\n|; } + # button for saving history + if($form->{id} ne "") { + print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; + } + # /button for saving history + print qq| @@ -1260,6 +1275,13 @@ initializetabcontent("maintab") sub add_transaction { $lxdebug->enter_sub(); +# # saving the history +# if(!exists $form->{addition}) { +# $form->{addition} = "ADD TRANSACTION"; +# $form->save_history($form->dbconnect(\%myconfig)); +# } +# # /saving the history + $form->isblank("name", $locale->text("Name missing!")); if ($vertreter && $form->{db} eq "customer") { $form->isblank("salesman_id", $locale->text("Salesman missing!")); @@ -1271,7 +1293,6 @@ sub add_transaction { $form->{callback} = "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; - $form->redirect; $lxdebug->leave_sub(); @@ -1281,8 +1302,13 @@ sub save_and_ap_transaction { $lxdebug->enter_sub(); $form->{script} = "ap.pl"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1290,8 +1316,13 @@ sub save_and_ar_transaction { $lxdebug->enter_sub(); $form->{script} = "ar.pl"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1300,8 +1331,13 @@ sub save_and_invoice { $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl"; $form->{type} = "invoice"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1310,8 +1346,13 @@ sub save_and_rfq { $form->{script} = "oe.pl"; $form->{type} = "request_quotation"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1320,8 +1361,13 @@ sub save_and_quotation { $form->{script} = "oe.pl"; $form->{type} = "sales_quotation"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1331,8 +1377,13 @@ sub save_and_order { $form->{script} = "oe.pl"; $form->{type} = ($form->{db} eq 'customer') ? "sales_order" : "purchase_order"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &add_transaction; - $lxdebug->leave_sub(); } @@ -1353,6 +1404,12 @@ sub save_and_close { if ($rc == 3) { $form->error($locale->text('customernumber not unique!')); } + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect($locale->text($msg)); $lxdebug->leave_sub(); @@ -1381,7 +1438,12 @@ sub save { $form->error($locale->text('This vendor number is already in use.')); } } - + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &edit; exit; $lxdebug->leave_sub(); @@ -1399,6 +1461,12 @@ sub delete { $msg = ucfirst $form->{db}; $msg .= " deleted!"; + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect($locale->text($msg)); $msg = "Cannot delete $form->{db}"; @@ -1606,7 +1674,6 @@ sub get_contact { } - sub get_shipto { $lxdebug->enter_sub(); diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 11e75322d..d81e9b16e 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -552,6 +552,12 @@ sub save { } DN->save_config(\%myconfig, \%$form); + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "SAVED FOR DUNNING"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect($locale->text('Dunning Process Config saved!')); $lxdebug->leave_sub(); @@ -605,7 +611,12 @@ sub save_dunning { if($form->{DUNNING_PDFS}) { DN->melt_pdfs(\%myconfig, \%$form,$spool); } - + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "DUNNING STARTED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect($locale->text('Dunning Process started for selected invoices!')); $lxdebug->leave_sub(); diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index f17680865..449120611 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -1457,7 +1457,7 @@ sub form_footer { print qq||; - # Löschen und ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich + # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich if (!$form->{locked} && $radieren) { print qq| @@ -1526,9 +1526,15 @@ sub delete { sub yes { $lxdebug->enter_sub(); - - $form->redirect($locale->text('Transaction deleted!')) - if (GL->delete_transaction(\%myconfig, \%$form)); + if (GL->delete_transaction(\%myconfig, \%$form)){ + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->redirect($locale->text('Transaction deleted!')) + } $form->error($locale->text('Cannot delete transaction!')); $lxdebug->leave_sub(); @@ -1714,6 +1720,13 @@ sub post { $form->error($err[$errno]); } undef($form->{callback}); + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "SAVED"; + $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id}; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect("Buchung gespeichert. Buchungsnummer = " . $form->{id}); $lxdebug->leave_sub(); @@ -1733,6 +1746,12 @@ sub storno { $form->{id} = 0; $form->{storno} = 1; + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "STORNO"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &post; $lxdebug->leave_sub(); diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 16205a7b1..0a2178533 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -397,7 +397,6 @@ $jsscript $lxdebug->leave_sub(); } #end search() - sub search_update_prices { $lxdebug->enter_sub(); @@ -2056,7 +2055,9 @@ sub parts_subtotal { sub edit { $lxdebug->enter_sub(); - + # show history button + $form->{javascript} = qq||; + #/show hhistory button IC->get_part(\%myconfig, \%$form); $form->{"original_partnumber"} = $form->{"partnumber"}; @@ -2408,7 +2409,7 @@ sub form_header { | - . $locale->text('Geschäftsvolumen') . qq| + . $locale->text('Geschäftsvolumen') . qq| {gv}> |; @@ -2714,9 +2715,26 @@ sub form_footer { } } + if (!$form->{previousform}) { + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } + } +# button for saving history + if($form->{id} ne "") { + print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; + } +# /button for saving history print qq| + @@ -3032,6 +3050,12 @@ sub save { if ($rc == 3) { $form->error($locale->text('Partnumber not unique!')); } + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $parts_id = $form->{id}; # load previous variables @@ -3148,19 +3172,29 @@ sub save { sub save_as_new { $lxdebug->enter_sub(); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->{id} = 0; if ($form->{"original_partnumber"} && ($form->{"partnumber"} eq $form->{"original_partnumber"})) { $form->{partnumber} = ""; } &save; - $lxdebug->leave_sub(); } sub delete { $lxdebug->enter_sub(); - + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $rc = IC->delete(\%myconfig, \%$form); # redirect @@ -3203,7 +3237,6 @@ sub price_row { $lxdebug->leave_sub(); } - sub parts_language_selection { $lxdebug->enter_sub(); diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index d8b522de2..f93512808 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -134,7 +134,7 @@ sub display_row { my $colspan = $#column_index + 1; $form->{invsubtotal} = 0; - map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); + map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts})); ######################################## # Eintrag fuer Version 2.2.0 geaendert # @@ -519,7 +519,7 @@ sub display_row { ############## ENDE Neueintrag ################## map { $form->{"${_}_base"} += $linetotal } - (split / /, $form->{"taxaccounts_$i"}); + (split(/ /, $form->{"taxaccounts_$i"})); $form->{invsubtotal} += $linetotal; } @@ -1128,12 +1128,12 @@ sub invoicetotal { $amount = $sellprice * (1 - $discount / 100) * $qty; map { $form->{"${_}_base"} += $amount } - (split / /, $form->{"taxaccounts_$i"}); + (split (/ /, $form->{"taxaccounts_$i"})); $form->{oldinvtotal} += $amount; } map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } - split / /, $form->{taxaccounts} + split(/ /, $form->{taxaccounts}) if !$form->{taxincluded}; $form->{oldtotalpaid} = 0; @@ -1359,990 +1359,4 @@ sub e_mail { $attachment_filename =~ s/ /_/g; my %umlaute = ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss" - ); - map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute)); - } else { - $attachment_filename = ""; - } - - if ($form->{"email"}) { - $form->{"fokus"} = "Form.subject"; - } else { - $form->{"fokus"} = "Form.email"; - } - $form->header; - - print qq| - - -
- - - - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - $bcc - - - - - - - -
| . $locale->text('To') . qq|
| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
| . $locale->text('Attachment name') . - qq|
-
- - - - - - - -
| . $locale->text('Message') . qq|
-
-|; - - &print_options; - - map { delete $form->{$_} } - qw(action email cc bcc subject message formname sendmode format header override); - - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| -

- - - -
- -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub send_email { - $lxdebug->enter_sub(); - - $old_form = new Form; - - map { $old_form->{$_} = $form->{$_} } keys %$form; - $old_form->{media} = $form->{oldmedia}; - - &print_form($old_form); - - $lxdebug->leave_sub(); -} - -sub print_options { - $lxdebug->enter_sub(); - $form->{sendmode} = "attachment"; - - $form->{"format"} = - $form->{"format"} ? $form->{"format"} : - $myconfig{"template_format"} ? $myconfig{"template_format"} : - "pdf"; - - $form->{"copies"} = - $form->{"copies"} ? $form->{"copies"} : - $myconfig{"copies"} ? $myconfig{"copies"} : - 3; - - $form->{"media"} = - $form->{"media"} ? $form->{"media"} : - $myconfig{"default_media"} ? $myconfig{"default_media"} : - "screen"; - - $form->{"printer_id"} = - defined($form->{"printer_id"}) ? $form->{"printer_id"} : - $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} : - ""; - - $form->{PD}{ $form->{formname} } = "selected"; - $form->{DF}{ $form->{format} } = "selected"; - $form->{OP}{ $form->{media} } = "selected"; - $form->{SM}{ $form->{sendmode} } = "selected"; - - if ($form->{type} eq 'purchase_order') { - $type = qq| - |; - } - - if ($latex_templates) { - $format .= qq||; - } - - $format .= qq||; - - if ($latex_templates) { - $format .= qq||; - } - - if ($opendocument_templates) { - $format .= qq||; - } - $format .= qq||; - - if (scalar(keys (%{ $form->{languages} })) !=0) { - $language_select = qq| - |; - foreach $item (@{ $form->{printers} }) { - $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : ""; - $printer_select .= qq||; - } - } - - - - print qq| - - - - - -
- - - |; - if (scalar(keys (%{ $form->{languages} })) !=0) { - print qq| - |; - } - print qq| - - |; - if (scalar(keys (%{ $form->{printers} })) !=0) { - print qq| - -|; - } - - if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') { - print qq| - -|; - } - - $form->{groupitems} = "checked" if $form->{groupitems}; - - print qq| - - - -
$type${language_select}$format$media$printer_select| . $locale->text('Copies') . qq| - {copies}>| . $locale->text('Group Items') . qq|{groupitems}>
-
- - -|; - - if ($form->{printed} =~ /$form->{formname}/) { - print qq| - -|; - } - - if ($form->{emailed} =~ /$form->{formname}/) { - print qq| - -|; - } - - if ($form->{queued} =~ /$form->{formname}/) { - print qq| - -|; - } - - print qq| - -
\|| . $locale->text('Printed') . qq|\|\|| . $locale->text('E-mailed') . qq|\|\|| . $locale->text('Queued') . qq|\|
-
-|; - - $lxdebug->leave_sub(); -} - -sub print { - $lxdebug->enter_sub(); - - # if this goes to the printer pass through - if ($form->{media} eq 'printer' || $form->{media} eq 'queue') { - $form->error($locale->text('Select postscript or PDF!')) - if ($form->{format} !~ /(postscript|pdf)/); - - $old_form = new Form; - map { $old_form->{$_} = $form->{$_} } keys %$form; - } - - if (!$form->{id} || (($form->{formname} eq "proforma") && !$form->{proforma} && (($form->{type} =~ /_order$/) || ($form->{type} =~ /_quotation$/)))) { - if ($form->{formname} eq "proforma") { - $form->{proforma} = 1; - } - $form->{print_and_save} = 1; - my $formname = $form->{formname}; - &save(); - $form->{formname} = $formname; - &edit(); - exit; - } - - &print_form($old_form); - - $lxdebug->leave_sub(); -} - -sub print_form { - $lxdebug->enter_sub(); - my ($old_form) = @_; - - $inv = "inv"; - $due = "due"; - $numberfld = "invnumber"; - - $display_form = - ($form->{display_form}) ? $form->{display_form} : "display_form"; - - # $form->{"notes"} will be overridden by the customer's/vendor's "notes" field. So save it here. - $form->{ $form->{"formname"} . "notes" } = $form->{"notes"}; - - if ($form->{formname} eq "invoice") { - $form->{label} = $locale->text('Invoice'); - } - if ($form->{formname} eq "packing_list") { - - # this is from an invoice - $form->{label} = $locale->text('Packing List'); - } - if ($form->{formname} eq 'sales_order') { - $inv = "ord"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Sales Order'); - $numberfld = "sonumber"; - $order = 1; - } - - if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) { - $inv = "inv"; - $due = "due"; - $form->{"${inv}date"} = $form->{invdate}; - $form->{label} = $locale->text('Proforma Invoice'); - $numberfld = "sonumber"; - $order = 0; - } - - if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'proforma') ) { - $inv = "inv"; - $due = "due"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; - $form->{invnumber} = $form->{ordnumber}; - $form->{label} = $locale->text('Proforma Invoice'); - $numberfld = "sonumber"; - $order = 1; - } - - if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') { - - # we use the same packing list as from an invoice - $inv = "ord"; - $due = "req"; - $form->{invdate} = $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Packing List'); - $order = 1; - # set invnumber for template packing_list - $form->{invnumber} = $form->{ordnumber}; - } - if ($form->{formname} eq 'pick_list') { - $inv = "ord"; - $due = "req"; - $form->{"${inv}date"} = - ($form->{transdate}) ? $form->{transdate} : $form->{invdate}; - $form->{label} = $locale->text('Pick List'); - $order = 1 unless $form->{type} eq 'invoice'; - } - if ($form->{formname} eq 'purchase_order') { - $inv = "ord"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Purchase Order'); - $numberfld = "ponumber"; - $order = 1; - } - if ($form->{formname} eq 'bin_list') { - $inv = "ord"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Bin List'); - $order = 1; - } - if ($form->{formname} eq 'sales_quotation') { - $inv = "quo"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Quotation'); - $numberfld = "sqnumber"; - $order = 1; - } - - if (($form->{type} eq 'sales_quotation') && ($form->{formname} eq 'proforma') ) { - $inv = "quo"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; - $form->{label} = $locale->text('Proforma Invoice'); - $numberfld = "sqnumber"; - $order = 1; - } - - if ($form->{formname} eq 'request_quotation') { - $inv = "quo"; - $due = "req"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Quotation'); - $numberfld = "rfqnumber"; - $order = 1; - } - - $form->isblank("email", $locale->text('E-mail address missing!')) - if ($form->{media} eq 'email'); - $form->isblank("${inv}date", - $locale->text($form->{label}) - . ": " - . $locale->text(' Date missing!')); - - # $locale->text('Invoice Number missing!') - # $locale->text('Invoice Date missing!') - # $locale->text('Packing List Number missing!') - # $locale->text('Packing List Date missing!') - # $locale->text('Order Number missing!') - # $locale->text('Order Date missing!') - # $locale->text('Quotation Number missing!') - # $locale->text('Quotation Date missing!') - - # assign number - if (!$form->{"${inv}number"} && !$form->{preview}) { - $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld); - if ($form->{media} ne 'email') { - - # get pricegroups for parts - IS->get_pricegroups_for_parts(\%myconfig, \%$form); - - # build up html code for prices_$i - set_pricegroup($form->{rowcount}); - - $form->{rowcount}--; - - &{"$display_form"}; - exit; - } - } - - &validate_items; - - # Save the email address given in the form because it should override the setting saved for the customer/vendor. - my ($saved_email, $saved_cc, $saved_bcc) = - ($form->{"email"}, $form->{"cc"}, $form->{"bcc"}); - - $language_saved = $form->{language_id}; - $payment_id_saved = $form->{payment_id}; - - &{"$form->{vc}_details"}(); - - $form->{language_id} = $language_saved; - $form->{payment_id} = $payment_id_saved; - - $form->{"email"} = $saved_email if ($saved_email); - $form->{"cc"} = $saved_cc if ($saved_cc); - $form->{"bcc"} = $saved_bcc if ($saved_bcc); - - my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates); - if ($form->{"language_id"}) { - ($language_tc, $output_numberformat, $output_dateformat, $output_longdates) = - AM->get_language_details(\%myconfig, $form, $form->{language_id}); - } else { - $output_dateformat = $myconfig{"dateformat"}; - $output_numberformat = $myconfig{"numberformat"}; - $output_longdates = 1; - } - - ($form->{employee}) = split /--/, $form->{employee}; - - # create the form variables - if ($order) { - OE->order_details(\%myconfig, \%$form); - } else { - IS->invoice_details(\%myconfig, \%$form, $locale); - } - - if ($form->{shipto_id}) { - $form->get_shipto(\%myconfig); - } - - @a = qw(name street zipcode city country); - - $shipto = 1; - - # if there is no shipto fill it in from billto - foreach $item (@a) { - if ($form->{"shipto$item"}) { - $shipto = 0; - last; - } - } - - if ($shipto) { - if ( $form->{formname} eq 'purchase_order' - || $form->{formname} eq 'request_quotation') { - $form->{shiptoname} = $myconfig{company}; - $form->{shiptostreet} = $myconfig{address}; - } else { - map { $form->{"shipto$_"} = $form->{$_} } @a; - } - } - - $form->{notes} =~ s/^\s+//g; - - $form->{templates} = "$myconfig{templates}"; - - $form->{language} = $form->get_template_language(\%myconfig); - $form->{printer_code} = $form->get_printer_code(\%myconfig); - - if ($form->{language} ne "") { - map({ $form->{"unit"}->[$_] = - AM->translate_units($form, $form->{"language"}, - $form->{"unit"}->[$_], $form->{"qty"}->[$_]); } - (0..scalar(@{$form->{"unit"}}) - 1)); - $form->{language} = "_" . $form->{language}; - } - - # Format dates. - format_dates($output_dateformat, $output_longdates, - qw(invdate orddate quodate pldate duedate reqdate transdate - shippingdate deliverydate validitydate paymentdate - datepaid transdate_oe deliverydate_oe - employee_startdate employee_enddate - ), - grep({ /^datepaid_\d+$/ || - /^transdate_oe_\d+$/ || - /^deliverydate_oe_\d+$/ || - /^reqdate_\d+$/ || - /^deliverydate_\d+$/ || - /^transdate_\d+$/ - } keys(%{$form}))); - - reformat_numbers($output_numberformat, 2, - qw(invtotal ordtotal quototal subtotal linetotal - listprice sellprice netprice discount - tax taxbase), - grep({ /^linetotal_\d+$/ || - /^listprice_\d+$/ || - /^sellprice_\d+$/ || - /^netprice_\d+$/ || - /^taxbase_\d+$/ || - /^discount_\d+$/ || - /^tax_\d+$/ - } keys(%{$form}))); - - reformat_numbers($output_numberformat, undef, - qw(qty), - grep({ /^qty_\d+$/ - } keys(%{$form}))); - - if ($form->{printer_code} ne "") { - $form->{printer_code} = "_" . $form->{printer_code}; - } - - $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html"; - if ($form->{format} eq 'postscript') { - $form->{postscript} = 1; - $form->{IN} =~ s/html$/tex/; - } elsif ($form->{"format"} =~ /pdf/) { - $form->{pdf} = 1; - if ($form->{"format"} =~ /opendocument/) { - $form->{IN} =~ s/html$/odt/; - } else { - $form->{IN} =~ s/html$/tex/; - } - } elsif ($form->{"format"} =~ /opendocument/) { - $form->{"opendocument"} = 1; - $form->{"IN"} =~ s/html$/odt/; - } - - if ($form->{media} eq 'printer') { - $form->{OUT} = "| $form->{printer_command} &>/dev/null"; - $form->{printed} .= " $form->{formname}"; - $form->{printed} =~ s/^ //; - } - $printed = $form->{printed}; - - if ($form->{media} eq 'email') { - $form->{subject} = qq|$form->{label} $form->{"${inv}number"}| - unless $form->{subject}; - - $form->{OUT} = "$sendmail"; - - $form->{emailed} .= " $form->{formname}"; - $form->{emailed} =~ s/^ //; - } - $emailed = $form->{emailed}; - - if ($form->{media} eq 'queue') { - %queued = split / /, $form->{queued}; - - if ($filename = $queued{ $form->{formname} }) { - $form->{queued} =~ s/$form->{formname} $filename//; - unlink "$spool/$filename"; - $filename =~ s/\..*$//g; - } else { - $filename = time; - $filename .= $$; - } - - $filename .= ($form->{postscript}) ? '.ps' : '.pdf'; - $form->{OUT} = ">$spool/$filename"; - - # add type - $form->{queued} .= " $form->{formname} $filename"; - - $form->{queued} =~ s/^ //; - } - $queued = $form->{queued}; - - $form->parse_template(\%myconfig, $userspath); - - $form->{callback} = ""; - - if ($form->{media} eq 'email') { - $form->{message} = $locale->text('sent') unless $form->{message}; - } - $message = $form->{message}; - - # if we got back here restore the previous form - if ($form->{media} =~ /(printer|email|queue)/) { - - $form->update_status(\%myconfig) - if ($form->{media} eq 'queue' && $form->{id}); - - if ($old_form) { - - $old_form->{"${inv}number"} = $form->{"${inv}number"}; - - # restore and display form - map { $form->{$_} = $old_form->{$_} } keys %$old_form; - - $form->{queued} = $queued; - $form->{printed} = $printed; - $form->{emailed} = $emailed; - $form->{message} = $message; - - $form->{rowcount}--; - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(exchangerate creditlimit creditremaining); - - for $i (1 .. $form->{paidaccounts}) { - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(paid exchangerate); - } - - &{"$display_form"}; - exit; - } - - $msg = - ($form->{media} eq 'printer') - ? $locale->text('sent to printer') - : $locale->text('emailed to') . " $form->{email}"; - $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|); - } - if ($form->{printing}) { - &{"$display_form"}; - exit; - } - - $lxdebug->leave_sub(); -} - -sub customer_details { - $lxdebug->enter_sub(); - IS->customer_details(\%myconfig, \%$form, @_); - $lxdebug->leave_sub(); -} - -sub vendor_details { - $lxdebug->enter_sub(); - - IR->vendor_details(\%myconfig, \%$form, @_); - - $lxdebug->leave_sub(); -} - -sub post_as_new { - $lxdebug->enter_sub(); - - $form->{postasnew} = 1; - map { delete $form->{$_} } qw(printed emailed queued); - - &post; - - $lxdebug->leave_sub(); -} - -sub ship_to { - $lxdebug->enter_sub(); - if ($form->{second_run}) { - $form->{print_and_post} = 0; - } - - $title = $form->{title}; - $form->{title} = $locale->text('Ship to'); - - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(exchangerate creditlimit creditremaining); - - my @shipto_vars = - qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry - shiptocontact shiptophone shiptofax shiptoemail - shiptodepartment_1 shiptodepartment_2); - - my @addr_vars = - (qw(name department_1 department_2 street zipcode city country - contact email phone fax)); - - # get details for name - &{"$form->{vc}_details"}(@addr_vars); - - $number = - ($form->{vc} eq 'customer') - ? $locale->text('Customer Number') - : $locale->text('Vendor Number'); - - # get pricegroups for parts - IS->get_pricegroups_for_parts(\%myconfig, \%$form); - - # build up html code for prices_$i - set_pricegroup($form->{rowcount}); - - $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form"; - - $form->{rowcount}--; - - $form->header; - - print qq| - - -
{script}> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| - . $locale->text('Billing Address') . qq|| - . $locale->text('Shipping Address') . qq|
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
-
- - -|; - - # delete shipto - map({ delete $form->{$_} } (@shipto_vars, qw(header))); - $form->{title} = $title; - - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| - -
- -
- -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub new_license { - $lxdebug->enter_sub(); - - my $row = shift; - - # change callback - $form->{old_callback} = $form->escape($form->{callback}, 1); - $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); - $form->{old_callback} = $form->escape($form->{old_callback}, 1); - - # delete action - delete $form->{action}; - $customer = $form->{customer}; - map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description); - - # save all other form variables in a previousform variable - $form->{row} = $row; - foreach $key (keys %$form) { - - # escape ampersands - $form->{$key} =~ s/&/%26/g; - $previousform .= qq|$key=$form->{$key}&|; - } - chop $previousform; - $previousform = $form->escape($previousform, 1); - - $form->{script} = "licenses.pl"; - - map { $form->{$_} = $form->{"old_$_"} } qw(partnumber description); - map { $form->{$_} = $form->escape($form->{$_}, 1) } - qw(partnumber description); - $form->{callback} = - qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; - $form->redirect; - - $lxdebug->leave_sub(); -} - -sub relink_accounts { - $lxdebug->enter_sub(); - - $form->{"taxaccounts"} =~ s/\s*$//; - $form->{"taxaccounts"} =~ s/^\s*//; - foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) { - map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber)); - } - $form->{"taxaccounts"} = ""; - - for (my $i = 1; $i <= $form->{"rowcount"}; $i++) { - if ($form->{"id_$i"}) { - IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1); - } - } - - $lxdebug->leave_sub(); -} - - -sub set_duedate { - $lxdebug->enter_sub(); - - $form->get_duedate(\%myconfig); - - my $q = new CGI; - $result = "$form->{duedate}"; - print $q->header(); - print $result; - $lxdebug->leave_sub(); - -} - + " \ No newline at end of file diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index f4556cf2c..f21045728 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -77,7 +77,10 @@ sub add { sub edit { $lxdebug->enter_sub(); - + # show history button + $form->{javascript} = qq||; + #/show hhistory button + if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") { $form->error("Access Denied"); @@ -574,7 +577,9 @@ sub form_header { $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate"); - + # show history button js + $form->{javascript} .= qq||; + #/show history button js $form->header; print qq| @@ -1147,6 +1152,18 @@ if ($form->{type} eq "credit_note") { } } + # button for saving history + if($form->{id} ne "") { + print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; + } + # /button for saving history + + print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . qq| @@ -1331,6 +1348,7 @@ sub update { } $lxdebug->leave_sub(); } + sub post_payment { $lxdebug->enter_sub(); for $i (1 .. $form->{paidaccounts}) { @@ -1425,10 +1443,30 @@ sub post { if (!(IS->post_invoice(\%myconfig, \%$form))) { $form->error($locale->text('Cannot post invoice!')); } + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "PRINTED AND POSTED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + } else { - $form->redirect( - $form->{label} . " $form->{invnumber} " . $locale->text('posted!')) - if (IS->post_invoice(\%myconfig, \%$form)); + if (IS->post_invoice(\%myconfig, \%$form)){ + # saving the history + if(!exists $form->{addition}) { + if($form->{storno}) { + $form->{addition} = "STORNO"; + } + else { + $form->{addition} = "POSTED"; + } + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + + $form->redirect( + $form->{label} . " $form->{invnumber} " . $locale->text('posted!')); + } $form->error($locale->text('Cannot post invoice!')); } @@ -1584,9 +1622,15 @@ sub credit_note { sub yes { $lxdebug->enter_sub(); - - $form->redirect($locale->text('Invoice deleted!')) - if (IS->delete_invoice(\%myconfig, \%$form, $spool)); + if (IS->delete_invoice(\%myconfig, \%$form, $spool)) { + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->redirect($locale->text('Invoice deleted!')); + } $form->error($locale->text('Cannot delete invoice!')); $lxdebug->leave_sub(); diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3baa8799f..ee8eddf17 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -110,6 +110,9 @@ sub add { sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button $form->{simple_save} = 0; @@ -1111,7 +1114,17 @@ sub form_footer { {path}> {login}> {password}> - +|; +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history + +qq| @@ -1921,6 +1934,12 @@ sub save_and_close { } relink_accounts(); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect( $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!')) @@ -1995,6 +2014,12 @@ sub save { unless $form->{$ordnumber}; relink_accounts(); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history OE->save(\%myconfig, \%$form); $form->{simple_save} = 1; @@ -2059,8 +2084,15 @@ sub yes { $msg = $locale->text('Quotation deleted!'); $err = $locale->text('Cannot delete quotation!'); } - - $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool)); + if (OE->delete(\%myconfig, \%$form, $spool)){ + $form->redirect($msg); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + } $form->error($err); $lxdebug->leave_sub(); diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index d95a7ee1d..07ba3026d 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -58,7 +58,9 @@ sub add { sub edit { $lxdebug->enter_sub(); - + # show history button + $form->{javascript} = qq||; + #/show hhistory button $form->{title} = "Edit"; if ($form->{type} eq 'project') { @@ -425,6 +427,21 @@ sub form_project_footer { . $locale->text('Delete') . qq|">|; } +<<<<<<< .mine + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history +======= +>>>>>>> .r1940 print qq| @@ -455,6 +472,12 @@ sub save { PE->save_pricegroup(\%myconfig, \%$form); $form->redirect($locale->text('Pricegroup saved!')); } + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $lxdebug->leave_sub(); } @@ -473,7 +496,12 @@ sub delete { if ($form->{type} eq 'pricegroup') { $form->redirect($locale->text('Pricegroup deleted!')); } - + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $lxdebug->leave_sub(); } @@ -653,6 +681,21 @@ sub form_partsgroup_footer { . $locale->text('Delete') . qq|">|; } +<<<<<<< .mine + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history +======= +>>>>>>> .r1940 print qq| @@ -847,6 +890,21 @@ sub form_pricegroup_footer { . $locale->text('Delete') . qq|">|; } +<<<<<<< .mine + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history +======= +>>>>>>> .r1940 print qq| diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 5cdeaa510..966df6e02 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -2126,7 +2126,13 @@ sub print_form { } } } - + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "PRINTED"; + $form->{what_done} = $form->{type}; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $lxdebug->leave_sub(); } -- 2.20.1