Volltext-Suche: Tabelle für Texte aus Dateien im DMS. DB und Rose

[kivitendo-erp.git] / templates / webpages / common / _ship_to_dialog.html

diff --git a/templates/webpages/common/_ship_to_dialog.html b/templates/webpages/common/_ship_to_dialog.html
index be4bcee..cb21c4f 100644 (file)
--- a/templates/webpages/common/_ship_to_dialog.html
+++ b/templates/webpages/common/_ship_to_dialog.html
@@ -12,7 +12,6 @@
         shiptocountry:      "[% JavaScript.escape(vc_obj.country) %]",
         shiptogln:          "[% JavaScript.escape(vc_obj.gln) %]",
         shiptocontact:      "[% JavaScript.escape(vc_obj.contact) %]",
-        shiptocp_gender:    "[% JavaScript.escape(vc_obj.cp_gender) %]",
         shiptophone:        "[% JavaScript.escape(vc_obj.phone) %]",
         shiptofax:          "[% JavaScript.escape(vc_obj.fax) %]",
         shiptoemail:        "[% JavaScript.escape(vc_obj.email) %]"
@@ -32,7 +31,6 @@
         shiptocountry:      "[% JavaScript.escape(shipto.shiptocountry) %]",
         shiptogln:          "[% JavaScript.escape(shipto.shiptogln) %]",
         shiptocontact:      "[% JavaScript.escape(shipto.shiptocontact) %]",
-        shiptocp_gender:    "[% JavaScript.escape(shipto.shiptocp_gender) %]",
         shiptophone:        "[% JavaScript.escape(shipto.shiptophone) %]",
         shiptofax:          "[% JavaScript.escape(shipto.shiptofax) %]",
         shiptoemail:        "[% JavaScript.escape(shipto.shiptoemail) %]"
@@ -59,6 +57,18 @@
  [% L.button_tag("kivi.SalesPurchase.copy_shipto_address()", LxERP.t8("Copy")) %]
 </p>
 
+[% IF cs_obj ;
+  fields = ['shiptoname', 'shiptodepartment_1', 'shiptodepartment_2',
+            'shiptostreet', 'shiptozipcode', 'shiptocity', 'shiptocountry',
+            'shiptogln', 'shiptocontact', 'shiptocp_gender', 'shiptophone',
+            'shiptofax', 'shiptoemail'] ;
+  FOREACH field = fields ;
+      $field = cs_obj.$field ;
+  END ;
+END ;
+'' %]
+
+
 <table>
  <tr class="listheading">
   <th></th>
@@ -147,7 +157,7 @@
 </table>
 
 <p>
- [% L.button_tag("kivi.SalesPurchase.submit_custom_shipto()", LxERP.t8("Apply")) %]
+ [% L.button_tag("kivi.SalesPurchase.submit_custom_shipto('" _ id_selector _ "')", LxERP.t8("Apply")) %]
  [% L.button_tag("kivi.SalesPurchase.reset_shipto_fields()", LxERP.t8("Reset")) %]
  [% L.button_tag("kivi.SalesPurchase.clear_shipto_fields()", LxERP.t8("Clear fields")) %]
  [% L.button_tag("\$('#shipto_dialog').dialog('close');", LxERP.t8("Abort")) %]