From: C. Braun Date: Fri, 13 May 2011 12:49:10 +0000 (+0200) Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~25^2~37 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/dd0ba7b9a6f931ce13ced906d9cc6cb3e7c3ea3a?ds=inline;hp=-c Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- dd0ba7b9a6f931ce13ced906d9cc6cb3e7c3ea3a diff --combined bin/mozilla/oe.pl index 97fc1d237,70e020fcc..2acf9fe8d --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@@ -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}) { diff --combined templates/webpages/oe/form_header.html index ce916e6a2,c07cd5971..a04676141 --- a/templates/webpages/oe/form_header.html +++ b/templates/webpages/oe/form_header.html @@@ -2,7 -2,7 +2,7 @@@ [%- USE HTML %] [%- USE LxERP %] [%- USE L %] - +

@@@ -63,13 -63,7 +63,7 @@@ [% 'Contact Person' | $T8 %] - [%- 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') %] [%- END %] @@@ -77,14 -71,7 +71,7 @@@ [% 'Shipping Address' | $T8 %] - [%- 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();") %] [%- END %] @@@ -112,25 -99,14 +99,14 @@@ [% 'Steuersatz' | $T8 %] - [%- 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') %] [%- IF ALL_DEPARTMENTS %] [% 'Department' | $T8 %] - [%- 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') %] [%- END %] @@@ -195,23 -171,14 +171,14 @@@ [% 'Employee' | $T8 %] - [%- 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)) %] [%- IF is_sales and ALL_SALESMEN.size %] [% 'Salesman' | $T8 %] - [%- 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)) %] [%- END %] @@@ -262,13 -229,7 +229,7 @@@ [% 'Project Number' | $T8 %] - [%- 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();") %] @@@ -282,10 -243,5 +243,10 @@@