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

Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-01-29 21:28:22 +01:00
parent 9eb2125f15
commit 190a777278
53 changed files with 568 additions and 603 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/views/finance/balancing/_articleResult.haml
View file

@ -1,21 +0,0 @@
%td= @article.name
%td= link_to_function image_tag("arrow_down_red.png", :size => "16x16", :border => 0), "Element.toggle('group_order_article_results_#{@article.id}')"
%td= @article.order_number
%td= @article.units_to_order
%td= @article.unit_quantity.to_s + ' * ' + @article.unit.to_s
%td= number_to_currency(@article.price)
%td= number_to_currency(@article.fc_price)
%td= @article.tax
%td= @article.deposit
%td
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Artikel ändern'), |
:url => {:action => 'editArticleResult', :id => @article}, |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td
= link_to_remote image_tag('b_drop.png', :size => "16x16", :border => 0, :alt => 'Artikel löschen'), |
:url => {:action => 'destroyArticleResult', :id => @article}, |
:confirm => 'Bist du sicher?', |
:method => 'post', |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |

29
app/views/finance/balancing/_articleResultForm.haml
View file

@ -1,29 +0,0 @@
= error_messages_for 'article'
%p
%b Notiz:
= @form.text_field 'note', :size => 30
%table
%tr
%th Name
%th Nr.
%th
%abbr{:title=>"Anzahl gelieferter Gebinde"} Menge
%th GebGr
%th Einheit
%th netto
%th MwSt.
%th Pfand
%tr
%td= @form.text_field 'name', :size => 20
%td= @form.text_field 'order_number', :size => 3
%td= @form.text_field 'units_to_order', :size => 5
%td= @form.text_field 'unit_quantity', :size => 3
%td= @form.text_field 'unit', :size => 5
%td= @form.text_field 'price', :size => 3
%td= @form.text_field 'tax', :size => 3
%td= @form.text_field 'deposit', :size => 3
= @form.hidden_field "order_id"
%br/
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

5
app/views/finance/balancing/_articleResults.haml
View file

@ -1,5 +0,0 @@
%tr{:class => cycle('even', 'odd', :name => 'articles')}[@article]
= render :partial => 'articleResult'
%tr{:id => "group_order_article_results_#{@article.id}", :class => "results", :style => "display:none"}
= render :partial => 'groupOrderArticleResults'

17
app/views/finance/balancing/_articlesOverview.haml
View file

@ -1,17 +0,0 @@
%p
%b
Gelieferte Artikel:
= @order.order_article_results.size
- for article in @order.order_article_results
%table{:style=> "margin-bottom:1em; width:40em;"}[article]
%thead
%tr
%th{:colspan => "3"}= article.name + " (" + article.unit + " | " + article.unit_quantity.to_s + " | " + article.fc_price.to_s + ")"
%tbody
- for result in article.group_order_article_results
%tr{ :class => cycle('even', 'odd', :name => 'group')}
%td{:style=>"width:70%"}= result.group_order_result.group_name
%td= result.quantity
%td= article.fc_price * result.quantity
- reset_cycle("group")

20
app/views/finance/balancing/_editGroupResult.haml
View file

@ -1,20 +0,0 @@
%h2 Mengenänderung
%p
= @result.group_order_result.group_name
hat von
= @result.order_article_result.name
bekommen:
- remote_form_for 'group_order_article_result', @result, :url => {:action => 'updateGroupResult', :id => @result }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= error_messages_for 'group_order_article_result'
%p
%b Menge:
(Einheit:
= @result.order_article_result.unit
)
= form.text_field "quantity", :size => "6"
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

10
app/views/finance/balancing/_editNote.haml
View file

@ -1,10 +0,0 @@
%h2 Notiz bearbeiten
- remote_form_for 'order', @order, :url => {:action => 'updateOrderNote', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
%br/
= form.text_area "note", :size => "60x20"
%p
= submit_tag "Speichern"
|
= link_to_remote 'Abbrechen', :update => 'results', :url => { :action => 'edit', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"

27
app/views/finance/balancing/_editSummary.haml
View file

@ -1,27 +0,0 @@
%h2 Bestelldaten ändern
- remote_form_for 'order', @order, :url => {:action => 'updateOrderSummary', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= error_messages_for 'order'
%table{:style => "width:10em"}
%tr
%td Rechnungsnummer:
%td= form.text_field "invoice_number", :size => 10
%tr
%td Rechnungsdatum:
%td= form.text_field "invoice_date", :size => 10
%tr
%td
%abbr{:title => "(incl. Pfand/Gutschriften)"} Rechnungsbeitrag
%td= form.text_field 'invoice_amount', :size => 10
%tr
%td
%abbr{:title => "z.B Kistepfand"} extra Pfand
%td= form.text_field 'deposit', :size => 10
%tr
%td Pfandgutschrift
%td= form.text_field 'deposit_credit', :size => 10
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

21
app/views/finance/balancing/_edit_group_order_article.html.haml Normal file
View file

@ -0,0 +1,21 @@
%h2 Mengenänderung
%p
= group_order_article.group_order.ordergroup.name
hat von
= group_order_article.order_article.article.name
bekommen:
- remote_form_for group_order_article, |
:url => {:action => 'update_group_order_article', :id => group_order_article }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
%p
%b Menge:
(Einheit:
= group_order_article.order_article.article.unit
)
= form.text_field :quantity, :size => "6"
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

9
app/views/finance/balancing/_edit_note.html.haml Normal file
View file

@ -0,0 +1,9 @@
%h2 Notiz bearbeiten
- remote_form_for 'order', @order, :url => {:action => 'update_note', :id => @order}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
= form.text_area "note", :size => "60x20"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

8
app/views/finance/balancing/_editResults.haml → app/views/finance/balancing/_edit_results_by_articles.html.haml
View file

@ -1,12 +1,12 @@
%p{:style => "float:left"}
%b Lieferung bearbeiten
%p{:style => "float:right"}
= link_to_remote "Artikel hinzufügen", :url => {:action => "newArticleResult", :id => @order}
//= remote_link_to "Artikel hinzufügen", :url => {:action => "newArticleResult", :id => @order}
%table{:class => "ordered_articles", :style => "clear:both"}
%thead
%tr
%th{:colspan => "2"} Artikel
%th{:colspan => "1"} Artikel
%th Nr.
%th Menge
%th GebGr * Einheit
@ -16,5 +16,5 @@
%th Pfand
%th{:colspan => "2"}
%tbody#result_table
- for @article in @order.order_article_results
= render :partial => "articleResults"
- for order_article in @order.order_articles.all(:include => [:article, :article_price])
= render :partial => "order_article_result", :locals => {:order_article => order_article}

25
app/views/finance/balancing/_groupOrderArticleResults.haml
View file

@ -1,25 +0,0 @@
%td{:colspan => "7"}
%p
Notiz:
= @article.note
%table
%thead
%tr
%td
%td{:style => "width:8em"} Gruppe
%td Einheiten
%td Gesamtpreis
%td{:colspan => "3",:style => "width:14em"}
= link_to_remote '[Gruppe hinzufügen]', :url => {:action => "newGroupResult", :id => @article}, :before => "Element.show('loader')", :success => "Element.hide('loader')"
%tbody{:id => "groups_results_#{@article.id}"}
- for @result in @article.group_order_article_results
= render :partial => "groupResults"
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'results'), :id => "sum_of_article_#{@article.id}"}
%td
%td{:style => "width:8em"} Summe
%td{:id => "totalArticleQuantity_#{@article.id}"}= @article.total[:quantity]
%td{:id => "totalArticlePrice_#{@article.id}", :class => "currency"}
= number_to_currency(@article.total[:price])
%td{:colspan => "3"}
- reset_cycle('results')

17
app/views/finance/balancing/_groupResult.haml
View file

@ -1,17 +0,0 @@
%td
%td{:style=>"width:50%"}= @result.group_order_result.group_name
%td{:id => "group_order_article_result_#{@result.id}_quantity"}= @result.quantity
%td{:class => "currency"}= number_to_currency(@result.order_article_result.fc_price * @result.quantity)
%td{:style=>"width:1em", :class => "actions"}
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Menge ändern'), |
:url => {:action => 'updateGroupResult', :id => @result}, |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td{:style=>"width:1em", :class => "actions"}
= link_to_remote image_tag('b_drop.png', :size => "16x16", :border => 0, :alt => 'Gruppenergebnis löschen'), |
:url => {:action => 'destroyGroupResult', :id => @result}, |
:confirm => 'Bist du sicher?', |
:method => 'post', |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%td

2
app/views/finance/balancing/_groupResults.haml
View file

@ -1,2 +0,0 @@
%tr{:class => cycle('even', 'odd', :name => 'results')}[@result]
= render :partial => "groupResult"

39
app/views/finance/balancing/_group_order_articles.html.haml Normal file
View file

@ -0,0 +1,39 @@
%td{:colspan => "7"}
%table
%thead
%tr
%td
%td{:style => "width:8em"} Gruppe
%td Einheiten
%td Gesamtpreis
%td{:colspan => "3",:style => "width:14em"}
= remote_link_to '[Gruppe hinzufügen]', :url => {:action => "new_group_order_article", :id => order_article}
%tbody
- for group_order_article in order_article.group_order_articles.all(:include => [:group_order])
%tr{:class => cycle('even', 'odd', :name => 'results')}[group_order_article]
%td
%td{:style=>"width:50%"}
= group_order_article.group_order.ordergroup.name
%td{:id => "group_order_article_#{group_order_article.id}_quantity"}
= group_order_article.quantity
%td.currency
= number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.quantity, :unit => "")
%td.actions{:style=>"width:1em"}
= remote_link_to icon(:edit), :update => 'edit_box', |
:url => {:action => 'edit_group_order_article', :id => group_order_article}, |
:success => "Element.hide('loader'); Element.show('edit_box')" |
%td.actions{:style=>"width:1em"}
= remote_link_to icon(:delete), |
:url => {:action => 'destroy_group_order_article', :id => group_order_article}, |
:confirm => 'Bist du sicher?', :method => 'post' |
%td
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'results')}
%td
%td{:style => "width:8em"} Summe
%td{:id => "group_orders_sum_quantity_#{order_article.id}"}
= order_article.group_orders_sum[:quantity]
%td{:id => "group_orders_sum_price_#{order_article.id}", :class => "currency"}
= number_to_currency(order_article.group_orders_sum[:price], :unit => "")
%td{:colspan => "3"}
- reset_cycle('results')

30
app/views/finance/balancing/_groupsOverview.haml
View file

@ -1,30 +0,0 @@
%p
%b
Gruppenbestellungen:
= @order.group_order_results.size
- for groupOrderResult in @order.group_order_results
%p
%table{:style => "width:40em"}[groupOrderResult]
%thead
%tr
%th{:colspan => "6"}= groupOrderResult.group_name
%tbody
- total = 0
- for result in groupOrderResult.group_order_article_results
- price = result.order_article_result.fc_price
- quantity = result.quantity
- subTotal = price * quantity
- total += subTotal
%tr{:class => cycle('even', 'odd', :name => 'article')}
%td= result.order_article_result.name
%td= quantity
%td{:class => "currency"}= number_to_currency(price)
%td= result.order_article_result.unit_quantity
%td= result.order_article_result.unit
%td= number_to_currency(subTotal)
%tfoot
%tr{:class => cycle('even', 'odd', :name => 'article')}
%td{:colspan => "5"} Summe
%td
%b= number_to_currency(total)
- reset_cycle("article")

24
app/views/finance/balancing/_invoice.html.haml Normal file
View file

@ -0,0 +1,24 @@
- if invoice
%table
%tr
%td Rechnungsnummer:
%td= invoice.number
%tr
%td Rechnungsdatum:
%td= invoice.date
%tr
%td Rechnungsbetrag:
%td.curreny= number_to_currency invoice.amount
%tr
%td - Pfand berechnet:
%td.curreny= number_to_currency invoice.deposit
%tr
%td + Pfand gutgeschrieben:
%td.curreny= number_to_currency invoice.deposit_credit
%tr
%td pfandbereinigter Betrag:
%td.curreny= number_to_currency invoice.net_amount
- else
Eine Rechnung für diese Bestellung anlegen:
= link_to "Neue Rechnung erstellen", new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier)

7
app/views/finance/balancing/_newArticleResult.haml
View file

@ -1,7 +0,0 @@
%h2
Neuer gelieferter Artikel die Bestellung
- remote_form_for 'order_article_result', @article, :url => {:action => 'createArticleResult' }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |@form| |
= render :partial => "articleResultForm"

17
app/views/finance/balancing/_newGroupResult.haml
View file

@ -1,17 +0,0 @@
%h2
Neue Gruppenmenge für
= @result.order_article_result.name
- remote_form_for 'group_order_article_result', @result, :url => {:action => 'createGroupResult'}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |@form| |
= error_messages_for 'result'
%p
Gruppe:
= @form.select "group_order_result_id", Ordergroup.find(:all, :order => "name").collect {|og| [og.name, og.id] }
%p
Menge:
= @form.text_field "quantity", :size => 5
= @form.hidden_field "order_article_result_id"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

17
app/views/finance/balancing/_new_group_order_article.html.haml Normal file
View file

@ -0,0 +1,17 @@
%h2
Neue Gruppenmenge für
= group_order_article.order_article.article.name
- remote_form_for group_order_article, :url => {:action => 'create_group_order_article'}, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= form.error_messages
%p
Gruppe:
= form.select :ordergroup_id, Ordergroup.all(:order => "name").collect {|og| [og.name, og.id] }
%p
Menge:
= form.text_field "quantity", :size => 5
= form.hidden_field "order_article_id"
%p
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

7
app/views/finance/balancing/_new_order_article.html.haml Normal file
View file

@ -0,0 +1,7 @@
%h2
Neuer gelieferter Artikel die Bestellung
- remote_form_for order_article, :url => {:action => 'create_order_article' }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
= render :partial => 'order_article_form', :locals => {:form => form}

18
app/views/finance/balancing/_order_article.html.haml Normal file
View file

@ -0,0 +1,18 @@
%td.closed
= link_to_function order_article.article.name, |
"Element.toggle('group_order_articles_#{order_article.id}'); |
Element.toggleClassName(this.up('td'), 'open')" |
%td= order_article.article.order_number
%td= order_article.units_to_order
%td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s
%td= number_to_currency(order_article.price.price, :unit => "")
%td= number_to_currency(order_article.price.fc_price, :unit => "")
%td= order_article.price.tax
%td= order_article.price.deposit
%td
//= remote_link_to icon(:edit), |
//:url => {:action => 'edit_order_article', :id => order_article} |
%td
= remote_link_to icon(:delete), :confirm => 'Bist du sicher?', |
:url => {:action => 'destroy_order_article', :id => order_article}, |
:method => :post |

26
app/views/finance/balancing/_order_article_form.html.haml Normal file
View file

@ -0,0 +1,26 @@
= form.error_messages
%table
%tr
%th Name
%th Nr.
%th
%abbr{:title=>"Anzahl gelieferter Gebinde"} Menge
%th GebGr
%th Einheit
%th netto
%th MwSt.
%th Pfand
%tr
%td= form.text_field 'name', :size => 20
%td= form.text_field 'order_number', :size => 3
%td= form.text_field 'units_to_order', :size => 5
%td= form.text_field 'unit_quantity', :size => 3
%td= form.text_field 'unit', :size => 5
%td= form.text_field 'net_price', :size => 3
%td= form.text_field 'tax', :size => 3
%td= form.text_field 'deposit', :size => 3
= form.hidden_field "order_id"
%br/
= submit_tag "Speichern"
|
= link_to_function 'Abbrechen', "Element.hide('edit_box')"

5
app/views/finance/balancing/_order_article_result.html.haml Normal file
View file

@ -0,0 +1,5 @@
%tr{:class => cycle('even', 'odd', :name => 'articles')}[order_article]
= render :partial => 'order_article', :locals => {:order_article => order_article}
%tr{:id => "group_order_articles_#{order_article.id}", :class => "results", :style => "display:none"}
= render :partial => 'group_order_articles', :locals => {:order_article => order_article}

81
app/views/finance/balancing/_summary.haml
View file

@ -1,60 +1,23 @@
%b=h order.supplier.name
%br/
= "von #{format_date(order.starts)} bis #{format_date(order.ends)}"
%p
%b=h @order.supplier ? @order.supplier.name : _('nonexistent')
| Rechnungsnummer:
= @order.invoice_number
| Rechnungsdatum:
= @order.invoice_date
|
= link_to_remote image_tag('b_edit.png', :size => "16x16", :border => 0, :alt => 'Rechnungsbetrag ändern'), |
:url => {:action => "editOrderSummary", :id => @order}, |
:before => "Element.show('loader')", |
:success => "Element.hide('loader')" |
%table
%tr
%td{:colspan => "2"}
%b Foodcoop
%td{:colspan => "2"}
%b Lieferant
%tr
%td
%abbr{:title => "gelieferten Artikel x Nettopreis"} Nettobetrag:
%td= number_to_currency(@order.sum(:clear))
%td
Rechnungsbetrag
%small (incl. Pfand/Gutschriften)
%td#invoice_amount= number_to_currency(@order.invoice_amount)
%tr
%td
%abbr{:title => "Nettobetrag mit Pfand und MwSt."} Bruttobetrag:
%td= number_to_currency(@order.sum(:gross))
%td
%span - extra Pfand
%small (Kistenpfand etc.)
%td#deposit= number_to_currency(@order.deposit)
%tr
%td
%abbr{:title => "Bruttobetrag mit Foodcoop Aufschlag"} FC Summe:
%td= number_to_currency(@order.sum(:fc))
%td{:style => "border-bottom: 1px solid grey"}
+ Pfandgutschriften
%td{:style => "border-bottom: 1px solid grey"}
#deposit_credit= number_to_currency(@order.deposit_credit)
%tr
%td
%abbr{:title => "Zugeteilte Mengen x Bruttopreise (inkl. Aufschlag)"} Gruppenbeträge:
%td#groups_amount= number_to_currency(@order.sum(:groups))
%td
Summe
%small (Rechungsbetrag ohne Pfand)
%td#clear_invoice= number_to_currency(@order.invoice_amount - @order.deposit + @order.deposit_credit)
%tr
%td{:colspan => "4"}
%abbr{:title => "Gruppenbeträge ohne Aufschlag minus Rechnung ohne Pfand. |
Im Idealfall sollte hier 0.00 stehen."} Differenz ohne Aufschlag: |
%span#profit= number_to_currency(@order.profit(false))
%tr
%td{:colspan => "4"}
%b
%abbr{:title => "= Gruppenbeträge - Rechnung ohne Pfand"} Differenz mit Aufschlag
= "(#{number_to_percentage(APP_CONFIG[:price_markup])}):"
%span#profit= number_to_currency(@order.profit)
%table
%tr
%td Nettobetrag:
%td= number_to_currency(order.sum(:clear))
%tr
%td Bruttobetrag:
%td= number_to_currency(order.sum(:gross))
%tr
%td FC-Betrag:
%td= number_to_currency(order.sum(:fc))
%tr
%td Summe der Gruppenbeträge:
%td= number_to_currency(order.sum(:groups))
%tr
%td FC Gewinn ohne Aufschlag:
%td= number_to_currency(order.profit(:with_markup => false))
%tr
%td FC Gewinn mit Aufschlag:
%td#order_profit= number_to_currency(order.profit)

12
app/views/finance/balancing/confirm.html.haml
View file

@ -1,16 +1,16 @@
%h1 Bestellung abschließen
.single_column#confirm{:style => "width:35em"}
-title "Bestellung abschließen"
%div{:style => "width: 40em"}
%p
Wenn die Bestellung abgeschlossen wird, werden ebenfalls alle Gruppenkonten aktualisiert.
%br/
Die Konten werden wie folgt belastet:
%table.list{:style => "width:35em"}
- for groupResult in @order.group_order_results
- for group_order in @order.group_orders
%tr{:class => cycle('even', 'odd')}
%td= groupResult.group_name
%td= number_to_currency(groupResult.price)
%td= group_order.ordergroup.name
%td= number_to_currency(group_order.price)
%p
%div{:style => "float:left"}
= button_to "Abschließen", :action => "close", :id => @order
%div{:style => "float:right"}
= link_to 'Zurück zur Abrechnung', :action => "new", :id => @order
= link_to 'Zurück zur Abrechnung', :action => 'new', :id => @order

4
app/views/finance/balancing/index.haml
View file

@ -48,7 +48,7 @@
%table.list
%thead
%tr
%th Name
%th Lieferant
%th Ende
%th Betrag(FC)
%th
@ -58,6 +58,6 @@
%td= order.supplier.name
%td= format_date(order.ends)
%td{:class => "currency"}= number_to_currency(order.sum(:fc))
%td= link_to "abrechnen", :action => "editOrder", :id => order
%td= link_to "abrechnen", :action => "new", :id => order
- else
Super, alles schon abgerechnet...

13
app/views/finance/balancing/list.html.haml
View file

@ -1,11 +1,7 @@
%h1 beendete Bestellungen
%p
- title "beendete Bestellungen"
%p{:style => "width:30em"}
%i
Aktuell gibt es die Möglichkeit eine Bestellung mittels dem "abrechnen"-link zu verbuchen, d.h.
nach Bearbeitung der Liefermengen die Gruppenbeträge automatisiert zu verbuchen,
%br/
oder die Bestellung manuell abzurechnen (Kontostände selbst zu aktualisieren) und mittels "auf gebucht setzen"
die Bestellung als abgeschlossen zu deklarieren.
Beschreibungstext für die Abrechnunsmodi ....
.left_column{:style => "width:70em"}
.box_title
.column_content
@ -32,6 +28,7 @@
- unless order.closed?
= link_to "abrechnen", :action => "new", :id => order
|
= link_to 'auf "gebucht" setzen', {:action => 'setAllBooked', :id => order}, :confirm => 'Wirklich alle Gruppenbestellungen für diese Bestellung auf "gebucht" setzen?', :method => "post"
= link_to 'direkt schließen', {:action => 'close_direct', :id => order}, |
:confirm => 'Wirklich die Bestellung schließen setzen?', :method => "post" |
- else
%i derzeit gibt es keine beendeten Bestellungen

39
app/views/finance/balancing/new.html.haml
View file

@ -1,37 +1,44 @@
%h1 Bestellung abrechnen
- title "#{@order.supplier.name} abrechnen"
- if @order.closed?
%p
%b Achtung, Bestellung wurde schon abgerechnet!
.left_column{:style => 'width: 50em'}
.left_column{:style => 'width: 24em'}
.box_title
%h2
= @order.supplier.name + " | " + format_date(@order.starts) + ' --> ' + format_date(@order.ends)
%h2 Zusammenfassung
.column_content#summary
#order_summary
= render :partial => "summary"
= render :partial => "summary", :locals => {:order => @order}
.left_column{:style => 'width: 24em'}
.box_title
%h2 Rechnung
.column_content#invoice
= render :partial => "invoice", :locals => {:invoice => @order.invoice}
.right_column{:style => 'width: 20em'}
.box_title
%h2 Aktionen
.column_content
%ul
- unless @order.invoice
%li= link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order)
- unless @order.closed?
%li= link_to "Bestellung abschließen", :action => "confirm", :id => @order
.right_column{:style => 'clear:both;width: 28%'}
.box_title
%h2 Protokoll
%h2 Notizen/Protokoll
.column_content
#note
- unless @order.note.empty?
= simple_format @order.note
- else
%p Hier kannst Du deine Abrechnung kommentieren
%small Protokoll bearbeiten:
= link_to_remote image_tag("b_edit.png", :size => "16x16", :border => "0"), |
:update => 'results', :url => { :action => 'new', :id => @order, :view => 'editNote' }, |
:before => "Element.show('loader')", :success => "Element.hide('loader')" |
%hr/
= remote_link_to "Notiz bearbeiten", |
:update => 'edit_box', :url => {:action => 'edit_note', :id => @order}, |
:success => "Element.hide('loader'); Element.show('edit_box')" |
.box_title
%h2 Kommentare
.column_content
#comments
= render :partial => 'shared/comments'
@ -39,11 +46,11 @@
.box_title
#editOrderNav
%ul
%li= link_to_remote 'Gruppenübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
%li= link_to_remote 'Artikelübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'articlesOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
%li= link_to_remote 'Bestellung bearbeiten', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'editResults' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
%li= remote_link_to 'Gruppenübersicht', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'groupsOverview'}
%li= remote_link_to 'Artikelübersicht', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'articlesOverview'}
%li= remote_link_to 'Bestellung bearbeiten', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'editResults'}
.column_content
#results
= render :partial => 'groupsOverview'
= render :partial => 'edit_results_by_articles'
%p= link_to_top
#edit_box{:style => 'display:none'}

11
app/views/finance/invoices/_form.html.haml
View file

@ -1,9 +1,12 @@
- form_for([:finance, @invoice]) do |f|
= f.error_messages
= f.hidden_field :delivery_id
= f.hidden_field :order_id
- if @invoice.delivery
%p= "Diese Rechnung ist mit einer #{link_to "Lieferung", [@invoice.supplier,@invoice.delivery]} verknüpft."
- if @invoice.order
%p= "Diese Rechnung ist mit einer #{link_to "Bestellung", @invoice.order} verknüpft."
%p
= f.label :supplier_id
%br/
@ -24,6 +27,14 @@
= f.label :amount
%br/
= f.text_field :amount
%p
= f.label :deposit
%br/
= f.text_field :deposit
%p
= f.label :deposit_credit
%br/
= f.text_field :deposit_credit
%p
= f.label :note
%br/