]> wagnertech.de Git - kivitendo-erp.git/commitdiff
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorC. Braun <information@lx-office-hosting.de>
Fri, 13 May 2011 12:49:10 +0000 (14:49 +0200)
committerC. Braun <information@lx-office-hosting.de>
Fri, 13 May 2011 12:49:10 +0000 (14:49 +0200)
1  2 
bin/mozilla/oe.pl
templates/webpages/oe/form_header.html

diff --combined bin/mozilla/oe.pl
index 97fc1d2379fed230842ba8920ea8696601eb00ac,70e020fcc54c933a30c0a36dd289ad89c09a0821..2acf9fe8dce32cb50d35a662664412d1f0714df3
@@@ -238,14 -238,14 +238,14 @@@ sub order_links 
  
    $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"};
  
-   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
+   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id));
    $form->{shipto} = 1 if $form->{id};
  
    # get customer / vendor
    IR->get_vendor(\%myconfig, \%$form)   if $form->{type} =~ /(purchase_order|request_quotation)/;
    IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
  
-   $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+   $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id));
    $form->restore_vars(qw(taxincluded)) if $form->{id};
    $form->restore_vars(qw(salesman_id)) if $editing;
    $form->{forex}       = $form->{exchangerate};
@@@ -393,8 -393,9 +393,8 @@@ sub form_header 
            : ($creditwarning)                                   ? "alert('$credittext')"
            :                                                      "";
  
 -  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
 -  $onload .= qq|;setupPoints('|.   $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
 -  $TMPL_VAR{onload} = $onload;
 +  $TMPL_VAR{dateformat}          = $myconfig{dateformat};
 +  $TMPL_VAR{numberformat}        = $myconfig{numberformat};
  
    if ($form->{type} eq 'sales_order') {
      if (!$form->{periodic_invoices_config}) {
index ce916e6a20fb436f787c2975c79a4bacafaf8018,c07cd59716abf3c35db6af6ae48dd1b70be69670..a0467614107b36801fb3921a59e623424b0a33d1
@@@ -2,7 -2,7 +2,7 @@@
  [%- USE HTML %]
  [%- USE LxERP %]
  [%- USE L %]
 -<body onLoad="[% onload %]">
 +<body>
  
    <form method="post" name="oe" action="[% script %]">
  
                    <tr>
                      <th align="right">[% 'Contact Person' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'cp_id',
-                            style      = 'width: 250px',
-                            DATA       = ALL_CONTACTS,
-                            id_key     = 'cp_id',
-                            label_sub  = 'contact_labels',
-                            show_empty = 1 -%]
+                       [% L.select_tag('cp_id', L.options_for_select(ALL_CONTACTS, default=cp_id, value='cp_id', title_sub=\contact_labels, with_empty=1), style='width: 250px') %]
                      </td>
                    </tr>
  [%- END %]
                    <tr>
                      <th align="right">[% 'Shipping Address' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'shipto_id',
-                            style      = 'width: 250px',
-                            DATA       = ALL_SHIPTO,
-                            id_key     = 'shipto_id',
-                            label_sub  = 'shipto_labels',
-                            show_empty = 1,
-                            onChange   = "document.getElementById('update_button').click();" -%]
+                       [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title_sub=\shipto_labels, with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
                      </td>
                    </tr>
  [%- END %]
                    <tr>
                      <th align="right">[% 'Steuersatz' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'taxzone_id',
-                            style      = 'width: 250px',
-                            DATA       = ALL_TAXZONES,
-                            id_key     = 'id',
-                            label_key  = 'description' -%]
+                       [% L.select_tag('taxzone_id', L.options_for_select(ALL_TAXZONES, default=taxzone_id, title='description'), style='width: 250px') %]
                      </td>
                    </tr>
  [%- IF ALL_DEPARTMENTS %]
                    <tr>
                      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
                      <td colspan="3">
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'department_id',
-                            style      = 'width: 250px',
-                            DATA       = ALL_DEPARTMENTS,
-                            id_key     = 'id',
-                            label_sub  = 'department_labels',
-                            show_empty = 1 -%]
+                       [% L.select_tag('department_id', L.options_for_select(ALL_DEPARTMENTS, default=department_id, title_sub=\department_labels, with_empty=1), style='width:250px') %]
                      </td>
                    </tr>
  [%- END %]
                    <tr>
                      <th align="right">[% 'Employee' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'employee_id',
-                            DATA       = ALL_EMPLOYEES,
-                            id_key     = 'id',
-                            label_sub  = 'sales_employee_labels' -%]
+                       [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, default=employee_id, title_sub=\sales_employee_labels)) %]
                      </td>
                    </tr>
  [%- IF is_sales and ALL_SALESMEN.size %]
                    <tr>
                      <th align="right">[% 'Salesman' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'salesman_id',
-                            default    = salesman_id ? salesman_id : employee_id,
-                            DATA       = ALL_SALESMEN,
-                            id_key     = 'id',
-                            label_sub  = 'sales_employee_labels' -%]
+                       [% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title_sub=\sales_employee_labels)) %]
                      </td>
                    </tr>
  [%- END %]
                    <tr>
                      <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
                      <td>
-                       [%- INCLUDE 'generic/multibox.html'
-                            name       = 'globalproject_id',
-                            DATA       = ALL_PROJECTS,
-                            id_key     = 'id',
-                            label_key  = 'projectnumber',
-                            show_empty = 1,
-                            onChange   = "document.getElementById('update_button').click();" -%]
+                       [%- L.select_tag('globalproject_id', L.options_for_select(ALL_PROJECTS, title='projectnumber', default=globalproject_id, with_empty='1'), onChange="document.getElementById('update_button').click();") %]
                      </td>
                    </tr>
                  </table>
       <!--
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
         Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
 +
 +       $('document').ready(function(){
 +         setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
 +         setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
 +       });
       //-->
      </script>