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. |
||
|---|---|---|
| .. | ||
| de.yml | ||
| en.yml | ||
| simple_form.en.yml | ||
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. |
||
|---|---|---|
| .. | ||
| de.yml | ||
| en.yml | ||
| simple_form.en.yml | ||