Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Improved delivery-invoice-workflow.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-01-18 17:42:51 +01:00
parent 936e6ef69a
commit ff6b460cfc
28 changed files with 253 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/suppliers/index.haml
View file

@ -28,7 +28,15 @@
.right_column{:style => "width:47%"}
.box_title
%h2 Artikelkategorien
.column_content#categories
#category_form.box.edit_form{:style => "display:none;margin-bottom:1em;"}
#category_list= render :partial => 'article_categories/list'
%h2 Letzte Lieferungen
.column_content
%table{:style => "width:50em"}
%tr
%th Datum
%th Betrag
%th Lieferant
- for delivery in @deliveries
%tr
%td= link_to delivery.delivered_on, [delivery.supplier, delivery]
%td= link_to_invoice(delivery)
%td=h delivery.supplier.name

123
app/views/suppliers/show.haml
View file

@ -1,54 +1,71 @@
%h1
Lieferantin
=h @supplier.name
- if shared_supplier = @supplier.shared_supplier
%p
%strong Der Lieferant ist mit der externen ArtikleDatenbank verknüpft.
- title "Lieferantin #{h(@supplier.name)}"
%table{:style => "width:40em"}
%tr
%td Name:
%td{:style => "font-weight:bold"}=h @supplier.name
%tr
%td Adresse:
%td{:style => "font-weight:bold"}=h @supplier.address
%tr
%td Telefon:
%td{:style => "font-weight:bold"}=h @supplier.phone
%tr
%td Telefon2:
%td{:style => "font-weight:bold"}=h @supplier.phone2
%tr
%td FAX:
%td{:style => "font-weight:bold"}=h @supplier.fax
%tr
%td Hompage:
%td{:style => "font-weight:bold"}=h @supplier.url
%tr
%td Kontakt-Person:
%td{:style => "font-weight:bold"}=h @supplier.contact_person
%tr
%td Kundennummer:
%td{:style => "font-weight:bold"}=h @supplier.customer_number
%tr
%td Liefertage:
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
%tr
%td BestellHowTo:
%td{:style => "font-weight:bold"}=h @supplier.order_howto
%tr
%td Notiz:
%td{:style => "font-weight:bold"}=h @supplier.note
%tr
%td Liefertage:
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
%tr
%td Mindestbestellmenge:
%td{:style => "font-weight:bold"}=h @supplier.min_order_quantity
%br/
- if @current_user.role_suppliers?
= link_to 'Bearbeiten', edit_supplier_path(@supplier)
|
= link_to 'Löschen', @supplier, :confirm => 'Bist Du sicher?', :method => :delete
|
= link_to 'zurück', suppliers_path
.left_column{:style => "width:45%"}
.box_title
%h2=h @supplier.name
.column_content
- if shared_supplier = @supplier.shared_supplier
%p
%strong Der Lieferant ist mit der externen ArtikleDatenbank verknüpft.
%table{:style => "width:40em"}
%tr
%td Adresse:
%td{:style => "font-weight:bold"}=h @supplier.address
%tr
%td Telefon:
%td{:style => "font-weight:bold"}=h @supplier.phone
%tr
%td Telefon2:
%td{:style => "font-weight:bold"}=h @supplier.phone2
%tr
%td FAX:
%td{:style => "font-weight:bold"}=h @supplier.fax
%tr
%td Hompage:
%td{:style => "font-weight:bold"}=h @supplier.url
%tr
%td Kontakt-Person:
%td{:style => "font-weight:bold"}=h @supplier.contact_person
%tr
%td Kundennummer:
%td{:style => "font-weight:bold"}=h @supplier.customer_number
%tr
%td Liefertage:
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
%tr
%td BestellHowTo:
%td{:style => "font-weight:bold"}=h @supplier.order_howto
%tr
%td Notiz:
%td{:style => "font-weight:bold"}=h @supplier.note
%tr
%td Liefertage:
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
%tr
%td Mindestbestellmenge:
%td{:style => "font-weight:bold"}=h @supplier.min_order_quantity
%br/
- if @current_user.role_suppliers?
= link_to 'Bearbeiten', edit_supplier_path(@supplier)
|
= link_to 'Löschen', @supplier, :confirm => 'Bist Du sicher?', :method => :delete
|
= link_to 'zurück', suppliers_path
.right_column{:style => "width:45%"}
.box_title
%h2 Letzte Lieferungen
.column_content
%table
%tr
%th Datum
%th Betrag
- for delivery in @deliveries
%tr
%td= link_to delivery.delivered_on, [@supplier, delivery]
%td= link_to_invoice(delivery)
%p
= link_to "Neue Lieferung anlegen", new_supplier_delivery_path(@supplier)
|
= link_to "Zeige alle Lieferungen", supplier_deliveries_path(@supplier)