Conflicts: .gitignore .rbenv-version app/controllers/finance/balancing_controller.rb app/views/finance/balancing/_order_article_form.html.haml Fixed updating current price in finance balancing. |
||
|---|---|---|
| .. | ||
| balancing_controller.rb | ||
| base_controller.rb | ||
| financial_transactions_controller.rb | ||
| group_order_articles_controller.rb | ||
| invoices_controller.rb | ||
| order_articles_controller.rb | ||
| ordergroups_controller.rb | ||