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

make settle directly less dangerous

Browse source 
(closes foodcoops#275)
This commit is contained in:
wvengen 2014-03-21 10:51:22 +01:00
parent ea8e4ee560
commit 852f3484ad
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/locales/en.yml
View file

@ -542,6 +542,8 @@ en:
comment_on_transaction: Here you can add a comment to your accounting.
comments: Comments
confirm_order: Settle order
close_direct: Skip settling
close_direct_confirm: 'You are about to settle the order without charging member acounts. Do this only when you have already debited member accounts manually, or if you really know what you are doing.'
create_invoice: Create invoice
edit_note: Edit note
edit_order: Edit order
@ -556,8 +558,6 @@ en:
orders:
clear: accounting
cleared: accounted (%{amount})
close: settle directly
confirm: Do you really want to settle the order?
end: End
ended: closed
name: Supplier
@ -1110,6 +1110,7 @@ en:
orders_settled: Settled
title: Manage orders
model:
close_direct_message: Order settled without charging member accounts.
error_closed: Order was already settled
error_nosel: At least one article must be selected
error_starts_before_ends: must be after the start date (or remain empty)