Merge branch 'master' into equipment-repair

ekylibre · Sep 10, 2016 · a011abc · a011abc
2 parents f0d03ee + fa533c4
commit a011abc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/backend/parcels/_incoming_item_fields.html.haml b/app/views/backend/parcels/_incoming_item_fields.html.haml
@@ -1,13 +1,13 @@
 - item ||= f.object
 - variant = Maybe(item.variant)
 
-= f.input :purchase_item_id, as: :hidden
 %tbody.nested-fields.delivery-item.incoming-parcel-item
   %tr
     %td.act
       - if f.object.destroyable?
         = link_to_remove_association(content_tag(:i) + h(:destroy.tl), f, 'data-no-turbolink' => true, class: 'destroy remove remove-item')
     %td
+      = f.input :purchase_item_id, as: :hidden
       = f.referenced_association(:variant, wrapper: :nested, source: { scope: :deliverables }, input_html: {data: {product_of_delivery_item: {url: backend_product_nature_variant_path("RECORD_ID", format: :json)}}})
       -# .errors= item.errors.inspect
     %td

diff --git a/app/views/backend/parcels/_outgoing_item_fields.html.haml b/app/views/backend/parcels/_outgoing_item_fields.html.haml
@@ -2,13 +2,13 @@
 - source_product = Maybe(item.source_product)
 - variant = source_product.variant
 
-= f.input :sale_item_id, as: :hidden
 %tbody.nested-fields.delivery-item.outgoing-parcel-item
   %tr
     %td.act
       - if f.object.destroyable?
         = link_to_remove_association(content_tag(:i) + h(:destroy.tl), f, 'data-no-turbolink' => true, class: 'destroy remove remove-item')
     %td
+      = f.input :sale_item_id, as: :hidden
       - scopes = { deliverables: true, alive: true }
       - if item.source_product.blank?
         - variant_id = variant.id.or_else(nil)