Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/sql/Pg-upgrade2/remove_obsolete_trigger.sql b/sql/Pg-upgrade2/remove_obsolete_trigger.sql
new file mode 100644 (file)
index 0000000..db80238
--- /dev/null
+++ b/sql/Pg-upgrade2/remove_obsolete_trigger.sql
@@ -0,0 +1,10 @@
+-- @tag: remove_obsolete_trigger
+-- @description: Entfernt veraltete Trigger check_inventory
+-- @depends: release_3_2_0
+-- @encoding: utf-8
+
+-- drop triggers
+DROP TRIGGER IF EXISTS check_inventory           ON oe;
+
+-- drop functions
+DROP FUNCTION IF EXISTS check_inventory();

diff --git a/templates/print/RB/letter.tex b/templates/print/RB/letter.tex
index 1645464..67a2642 100644 (file)
--- a/templates/print/RB/letter.tex
+++ b/templates/print/RB/letter.tex
@@ -45,13 +45,13 @@
 
 \begin{minipage}{14cm}
 
-  <%rcv_name%>
+  <%name%>
 
-  <%rcv_contact_formal%>
+  <%contact_formal%>
 
-  <%rcv_countrycode%> <%rcv_zipcode%> <%rcv_city%>
+  <%countrycode%> <%zipcode%> <%city%>
 
-  <%rcv_country%>
+  <%country%>
 
 \end{minipage}
 \hfill
@@ -62,6 +62,11 @@
 
 \begin{minipage}{14cm}
 
+\textbf{<%reference%>}
+
+\vspace{1cm}
+
+
 \textbf{<%subject%>}
 
 \vspace{1cm}

diff --git a/templates/print/Standard/letter.tex b/templates/print/Standard/letter.tex
index 1645464..67a2642 100644 (file)
--- a/templates/print/Standard/letter.tex
+++ b/templates/print/Standard/letter.tex
@@ -45,13 +45,13 @@
 
 \begin{minipage}{14cm}
 
-  <%rcv_name%>
+  <%name%>
 
-  <%rcv_contact_formal%>
+  <%contact_formal%>
 
-  <%rcv_countrycode%> <%rcv_zipcode%> <%rcv_city%>
+  <%countrycode%> <%zipcode%> <%city%>
 
-  <%rcv_country%>
+  <%country%>
 
 \end{minipage}
 \hfill
@@ -62,6 +62,11 @@
 
 \begin{minipage}{14cm}
 
+\textbf{<%reference%>}
+
+\vspace{1cm}
+
+
 \textbf{<%subject%>}
 
 \vspace{1cm}

diff --git a/templates/webpages/letter/edit.html b/templates/webpages/letter/edit.html
index fa6a8a0..39aa737 100644 (file)
--- a/templates/webpages/letter/edit.html
+++ b/templates/webpages/letter/edit.html
@@ -41,10 +41,11 @@
              force_textbox = limit_exceeded_all_customer
              onChange      = "document.getElementById('update_button').click();" -%]
 [%- IF letter.customer_id %]
-        <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="edit_vc_window([% letter.customer_id | html %], 'customer')">
+        <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('customer')">
 [%- END %]
         <input type='hidden' name='letter.oldcustomer' value='[% letter.oldcustomer | html %]'>
         <input type='hidden' name='letter.customer_id' value='[% letter.customer_id | html %]'>
+        <input type='hidden' name='customer_id' value='[% customer_id | html %]'>
 [%- UNLESS myconfig_vclimit < ALL_CUSTOMERS.size %]
         <input type="hidden" name="letter.select[% vc %]" value="1">
 [%- END %]
@@ -195,6 +196,6 @@
        Calendar.setup({ inputField : "date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "date_button" });
      //-->
     </script>
-
+    <script type="text/javascript" src="js/show_vc_details.js"></script>
 </body>