DeliveryOrder: Template Anpassungen

diff --git a/templates/webpages/delivery_order/tabs/_item_input.html b/templates/webpages/delivery_order/tabs/_item_input.html
index 255d4f8..ab62bd9 100644 (file)
--- a/templates/webpages/delivery_order/tabs/_item_input.html
+++ b/templates/webpages/delivery_order/tabs/_item_input.html
@@ -9,15 +9,13 @@
         <th class="listheading" nowrap >[%- 'Part'         | $T8 %] </th>
         <th class="listheading" nowrap >[%- 'Description'  | $T8 %] </th>
         <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
-        <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
-        <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
         <th></th>
       </tr>
     </thead>
     <tbody>
       <tr valign="top" class="listrow">
         <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
-          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ] ] %]
+          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ]] %]
           [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
             [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
           [%- END %]
@@ -26,7 +24,7 @@
         </td>
         <td>[% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]</td>
         <td>
-          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_KEY = SELF.type_data.properties('is_customer') ? 'with_customer_partnumber' : 'with_makemodel' -%]
           [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
           [% P.part.picker('add_item.parts_id', SELF.created_part, style='width: 300px', class="add_item_input",
                             fat_set_item=1,
@@ -39,9 +37,6 @@
           [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %]
           [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
         </td>
-        [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
-        <td>[% L.input_tag('add_item.sellprice_as_number', price, size = 10, class="add_item_input numeric") %]</td>
-        <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric") %]</td>
         <td>[% L.button_tag('kivi.DeliveryOrder.add_item()', LxERP.t8('Add part')) %]</td>
       </tr>
     </tbody>

diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index c93d18c..be552e7 100644 (file)
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -77,13 +77,6 @@
         [%- L.hidden_tag("formula[+]", ITEM.part.formel) -%]
       [%- END -%]
     </td>
-    <td>
-      [%- L.select_tag("order.orderitems[].price_factor_id",
-                       SELF.all_price_factors,
-                       default = ITEM.price_factor_id,
-                       title_key = 'description',
-                       with_empty = 1) %]
-    </td>
     <td nowrap>
       [%- L.select_tag("order.orderitems[].unit",
                       ITEM.part.available_units,
@@ -92,49 +85,6 @@
                       value_key = 'name',
                       class = 'unitselect') %]
     </td>
-    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
-    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
-      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
-    [% END %]
-    [% IF (SELF.type == "purchase_order" || SELF.type == "request_quotation") %]
-      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
-    [% END %]
-    <td>
-      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES) %]
-      <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
-        [%- L.input_tag("order.orderitems[].sellprice_as_number",
-                        ITEM.sellprice_as_number,
-                        size = 10,
-                        disabled=(EDIT_PRICE? '' : 1),
-                        class="reformat_number numeric") %]
-      </div>
-      <div name="not_editable_price" [%- IF EDIT_PRICE %]style="display:none"[%- END %]>
-        [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric") %]
-        [%- L.hidden_tag("order.orderitems[].sellprice_as_number",
-                         ITEM.sellprice_as_number,
-                         disabled=(EDIT_PRICE? 1 : '')) %]
-      </div>
-    </td>
-    <td>
-      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES) %]
-      <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
-        [%- L.input_tag("order.orderitems[].discount_as_percent",
-                        ITEM.discount_as_percent,
-                        size = 5,
-                        disabled=(EDIT_DISCOUNT? '' : 1),
-                        class="reformat_number numeric") %]
-      </div>
-      <div name="not_editable_discount" [%- IF EDIT_DISCOUNT %]style="display:none"[%- END %]>
-        [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %]
-        [%- L.hidden_tag("order.orderitems[].discount_as_percent",
-                         ITEM.discount_as_percent,
-                         disabled=(EDIT_DISCOUNT? 1 : '')) %]
-      </div>
-    </td>
-    <td align="right">
-      [%- L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal") %]
-    </td>
-
   </tr>
 
   <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>

diff --git a/templates/webpages/delivery_order/tabs/_second_row.html b/templates/webpages/delivery_order/tabs/_second_row.html
index 8b4d83a..6b140ac 100644 (file)
--- a/templates/webpages/delivery_order/tabs/_second_row.html
+++ b/templates/webpages/delivery_order/tabs/_second_row.html
@@ -16,31 +16,10 @@
       <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
       [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
     [%- END %]
-    <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
-    [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;
-    [%- IF (TYPE == "sales_order" || TYPE == "sales_quotation") %]
-      <b>[%- 'Ertrag' | $T8 %]</b>&nbsp;
-        <span name="linemargin">
-          <span[%- IF ITEM.marge_total < 0 -%] class="plus0"[%- END -%]>
-            [%- LxERP.format_amount(ITEM.marge_total, 2, 0) %]&nbsp;&nbsp;
-            [%- LxERP.format_amount(ITEM.marge_percent, 2, 0) %]%
-          </span>
-       </span>&nbsp;
-      <b>[%- 'LP' | $T8 %]</b>&nbsp;
-      [%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]&nbsp;
-      <b>[%- 'EK' | $T8 %]</b>&nbsp;
-        [%- L.input_tag("order.orderitems[].lastcost_as_number",
-                        ITEM.lastcost_as_number,
-                        size = 5,
-                        class="recalc reformat_number numeric") %]&nbsp;
-    [%- END %]
     <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
       <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
         [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
       </span>&nbsp;
-    <b>[%- 'Optional' | $T8 %]</b>&nbsp;
-      [%- L.yes_no_tag("order.orderitems[].optional", ITEM.optional
-                        class="recalc") %]&nbsp;
   </td></tr>
 
   <tr>

diff --git a/templates/webpages/delivery_order/tabs/basic_data.html b/templates/webpages/delivery_order/tabs/basic_data.html
index 1f53f89..15cc83a 100644 (file)
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -53,26 +53,6 @@
 
           [%- PROCESS delivery_order/tabs/_business_info_row.html SELF=SELF %]
 
-          <tr>
-            <th align="right">[% 'Steuersatz' | $T8 %]</th>
-            <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %]</td>
-          </tr>
-
-          [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
-          <tr id="currency_settings">
-            <th align="right">[% 'Currency' | $T8 %]</th>
-            <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
-          </tr>
-          <tr id="exchangerate_settings" [%- IF SELF.order.currency_id==INSTANCE_CONF.get_currency_id %]style='display:none'[%- END %]>
-            <th align="right">[% 'Exchangerate' | $T8 %]</th>
-            <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
-              [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, size="15", class="reformat_number_as_null_number numeric") %]
-              [% INSTANCE_CONF.default_currency %]
-              [% L.hidden_tag('old_currency_id', currency_id) %]
-              [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
-            </td>
-          </tr>
-
 [%- IF SELF.all_languages.size %]
           <tr>
             <th align="right">[% 'Language' | $T8 %]</th>
@@ -120,10 +100,25 @@
           <tr>
             <td colspan="2" align="center">
               [%- IF SELF.order.id %]
-                <label for="order.delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label>
-                [% L.yes_no_tag('order.delivered', SELF.order.delivered) %]
-                <label for="order.closed">[% 'Closed' | $T8 %]</label>
-                [% L.yes_no_tag('order.closed', SELF.order.closed) %]
+                [%- IF SELF.order.delivered %]
+                  [%- IF is_customer %]
+                  [% 'transferred out' | $T8 %]
+                  [%- ELSE %]
+                  [% 'transferred in' | $T8 %]
+                  [%- END %]
+                [%- ELSE %]
+                  [%- IF is_customer %]
+                  [% 'not transferred out yet' | $T8 %]
+                  [%- ELSE %]
+                  [% 'not transferred in yet' | $T8 %]
+                  [%- END %]
+                [%- END %]
+               ;
+                [%- IF SEF.order.closed %]
+                  [% 'Closed' | $T8 %]
+                [%- ELSE %]
+                  [% 'Open' | $T8 %]
+                [%- END %]
               [%- END %]
             </td>
           </tr>
@@ -146,79 +141,35 @@
           </tr>
           [% END %]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
-            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
+            <th width="70%" align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.donumber', SELF.order.donumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
           </tr>
-          [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
-            [%- SET quo_nr_txt = 'Quotation Number' -%]
-          [%- ELSE -%]
-            [%- SET quo_nr_txt = 'RFQ Number' -%]
-          [%- END -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% quo_nr_txt | $T8 %]</th>
-            [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-              <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]</td>
-            [%- ELSE -%]
-              <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
-            [%- END -%]
+            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% IF SELF.type_data.properties('is_customer') %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
           </tr>
-          [%- END -%]
-
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-            [%- SET transdate_txt = 'Order Date' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
-            [%- SET transdate_txt = 'Quotation Date' -%]
-          [%- ELSE -%]
-            [%- SET transdate_txt = 'RFQ Date' -%]
-          [%- END -%]
-          <tr>
-            <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>
-            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>
-          </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Tax point' | $T8 %]</th>
-            <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class="recalc") %]</td>
+            <th width="70%" align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
+            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-            [%- SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
-            [%- SET reqdate_txt = 'Valid until'; SET reqdate_class = '' -%]
-          [%- ELSE -%]
-            [%- SET reqdate_txt = 'Required by'; SET reqdate_class = 'recalc' -%]
-          [%- END -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
             <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class=reqdate_class) %]</td>
           </tr>
 
-          [%- IF SELF.type == "sales_quotation" -%]
-          <tr>
-            <th width="70%" align="right" nowrap>[% 'Order probability' | $T8 %]</th>
-            <td>[%- L.select_tag('order.order_probability', SELF.order_probabilities, title='title', default=SELF.order.order_probability) %]%</td>
-          </tr>
-          <tr>
-            <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>
-            <td>[%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_as_date) %]</td>
-          </tr>
-          [%- END %]
-
           <tr>
             <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
             <td>[% SELF.order.itime_as_date %]</td>
           </tr>
-
         </table>
 
       </td>
@@ -270,11 +221,7 @@
                 <th id="shipped_qty_header_id"  class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
-                <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
-                <th id="sellprice_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("sellprice")'> [%- 'Price'       | $T8 %]</a></th>
-                <th id="discount_header_id"    class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("discount")'>  [%- 'Discount'    | $T8 %]</a></th>
-                <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
               </tr>
             </thead>