From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 20 Jul 2010 08:42:39 +0000 (+0200)
Subject: Umstellung Funktionsaufrufe auf Dispatcher-Mechanismus
X-Git-Tag: release-2.6.2beta1~296
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=cb6d74e65f317419b956fab45952d886afcaeee3;p=kivitendo-erp.git

Umstellung Funktionsaufrufe auf Dispatcher-Mechanismus

Conflicts:

	templates/webpages/ap/ap_transactions_bottom.html
	templates/webpages/ar/ar_transactions_bottom.html
	templates/webpages/bankaccounts/bank_account_list_bottom.html
	templates/webpages/ct/list_names_bottom.html
	templates/webpages/dunning/show_dunning_bottom.html
	templates/webpages/gl/generate_report_bottom.html
	templates/webpages/ic/generate_report_bottom.html
---

diff --git a/templates/webpages/ap/ap_transactions_bottom.html b/templates/webpages/ap/ap_transactions_bottom.html
index abc51a197..20bcf372c 100644
--- a/templates/webpages/ap/ap_transactions_bottom.html
+++ b/templates/webpages/ap/ap_transactions_bottom.html
@@ -1,12 +1,11 @@
-[%- USE T8 %]
-[% USE HTML %] <form method="post" action="ap.pl">
+[% USE T8 %][% USE HTML %] <form method="post" action="dispatcher.pl?M=ap">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
   [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
-  <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
+  <input class="submit" type="submit" name="A_ap_transaction" value="[%- 'AP Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="A_vendor_invoice" value="[%- 'Vendor Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/ar/ar_transactions_bottom.html b/templates/webpages/ar/ar_transactions_bottom.html
index 57bacca38..f05c8a274 100644
--- a/templates/webpages/ar/ar_transactions_bottom.html
+++ b/templates/webpages/ar/ar_transactions_bottom.html
@@ -1,12 +1,11 @@
-[%- USE T8 %]
-[% USE HTML %] <form method="post" action="ar.pl">
+[% USE T8 %][% USE HTML %] <form method="post" action="dispatcher.pl?M=ar">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
   [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
-  <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
+  <input class="submit" type="submit" name="A_ar_transaction" value="[%- 'AR Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="A_sales_invoice" value="[%- 'Sales Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom.html b/templates/webpages/bankaccounts/bank_account_list_bottom.html
index eeab8cc35..8542aab74 100644
--- a/templates/webpages/bankaccounts/bank_account_list_bottom.html
+++ b/templates/webpages/bankaccounts/bank_account_list_bottom.html
@@ -1,12 +1,10 @@
-[%- USE T8 %]
-[% USE HTML %]
- <form action="bankaccounts.pl" method="post">
+[% USE T8 %][% USE HTML %]
+ <form action="dispatcher.pl?M=bankaccounts" method="post">
   <p>
-   [% 'New bank account' | $T8 %]<br>
-   <input type="submit" value="[% 'Add' | $T8 %]">
+   [%- 'New bank account' | $T8 %]<br>
+   <input type="submit" name="A_bank_account_add" value="[%- 'Add' | $T8 %]">
   </p>
 
-  <input type="hidden" name="action" value="bank_account_add">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
  </form>
 
diff --git a/templates/webpages/ct/list_names_bottom.html b/templates/webpages/ct/list_names_bottom.html
index 0fd53897e..7faabc311 100644
--- a/templates/webpages/ct/list_names_bottom.html
+++ b/templates/webpages/ct/list_names_bottom.html
@@ -1,11 +1,10 @@
-[%- USE T8 %]
-[% USE HTML %]<form method="post" action="ct.pl">
+[% USE T8 %][% USE HTML %]<form method="post" action="dispatcher.pl?M=ct">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
  <input name="db" type="hidden" value="[% HTML.escape(db) %]">
 
  [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]<br>
 
- <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
+ <input class="submit" type="submit" name="A_add" value="[%- 'Add' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/dunning/show_dunning_bottom.html b/templates/webpages/dunning/show_dunning_bottom.html
index 8230082bc..0f452a46d 100644
--- a/templates/webpages/dunning/show_dunning_bottom.html
+++ b/templates/webpages/dunning/show_dunning_bottom.html
@@ -6,7 +6,8 @@
   <p>
    [% 'Dunnings' | $T8 %]<br>
    <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="[% 'Print' | $T8 %]">
+   <input type="hidden" name="action" value="print">
+   <input type="submit" class="submit" value="[%- 'Print' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/gl/generate_report_bottom.html b/templates/webpages/gl/generate_report_bottom.html
index eb093a004..98d5c718c 100644
--- a/templates/webpages/gl/generate_report_bottom.html
+++ b/templates/webpages/gl/generate_report_bottom.html
@@ -1,12 +1,11 @@
-[%- USE T8 %]
-[% USE HTML %]<form method="post" action="gl.pl">
+[% USE T8 %][% USE HTML %]<form method="post" action="dispatcher.pl?M=gl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
 
- <input class="submit" type="submit" name="action" value="[% 'GL Transaction' | $T8 %]">
- <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
- <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
- <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
- <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
+ <input class="submit" type="submit" name="A_gl_transaction" value="[%- 'GL Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="A_ar_transaction" value="[%- 'AR Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="A_ap_transaction" value="[%- 'AP Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="A_sales_invoice" value="[%- 'Sales Invoice' | $T8 %]">
+ <input class="submit" type="submit" name="A_vendor_invoice" value="[%- 'Vendor Invoice' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ic/generate_report_bottom.html b/templates/webpages/ic/generate_report_bottom.html
index 17d42afc4..499cdcb8f 100644
--- a/templates/webpages/ic/generate_report_bottom.html
+++ b/templates/webpages/ic/generate_report_bottom.html
@@ -4,6 +4,7 @@
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
 
  <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
+ <input type="hidden" name="action" value="add">
 
  [% SWITCH searchitems %]
    [% CASE 'part' %][% 'New part' | $T8 %]
@@ -11,6 +12,6 @@
    [% CASE 'assembly' %][% 'New assembly' | $T8 %]
  [% END %]
  <br>
- <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
+ <input class="submit" type="submit" value="[%- 'Add' | $T8 %]">
 
 </form>