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. |
||
|---|---|---|
| .. | ||
| _edit.html.haml | ||
| _new.html.haml | ||
| create.js.haml | ||
| destroy.js.haml | ||
| edit.js.haml | ||
| new.js.haml | ||
| update.js.haml | ||