mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-19 13:54:25 +01:00
fixed accounting codes interface + fixed csv generation
This commit is contained in:
Sylvain
parent
26c98394ac
commit
acacd9a19e
@ -900,10 +900,10 @@ angular.module('application.router', ['ui.router'])
|
||||
settings: ['Setting', function (Setting) {
|
||||
return Setting.query({
|
||||
names: `['invoice_legals', 'invoice_text', 'invoice_VAT-rate', 'invoice_VAT-active', 'invoice_order-nb', 'invoice_code-value', \
|
||||
'invoice_code-active', 'invoice_reference', 'invoice_logo', 'accounting_journal_code', 'accounting_client_code' \
|
||||
'invoice_code-active', 'invoice_reference', 'invoice_logo', 'accounting_journal_code', 'accounting_client_code', \
|
||||
'accounting_client_label', 'accounting_wallet_code', 'accounting_wallet_label', 'accounting_VAT_code', 'accounting_VAT_label', \
|
||||
'accounting_subscription_code', 'accounting_subscription_label', 'accounting_Machine_code', 'accounting_Machine_label' \
|
||||
'accounting_Training_code', 'accounting_Training_label', 'accounting_Event_code', 'accounting_Event_label' \
|
||||
'accounting_subscription_code', 'accounting_subscription_label', 'accounting_Machine_code', 'accounting_Machine_label', \
|
||||
'accounting_Training_code', 'accounting_Training_label', 'accounting_Event_code', 'accounting_Event_label', \
|
||||
'accounting_Space_code', 'accounting_Space_label', 'accounting_coupon_code', 'accounting_coupon_label']` }).$promise;
|
||||
}],
|
||||
invoices: [ 'Invoice', function (Invoice) {
|
||||
|
||||
@ -267,48 +267,48 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="machineCode" translate>{{ 'invoices.accounting_machine_code' }}</label>
|
||||
<label for="machineCode" translate>{{ 'invoices.accounting_Machine_code' }}</label>
|
||||
<input type="text" id="machineCode" ng-model="settings.machineCode.value" class="form-control" placeholder="{{ 'invoices.general_machine_code' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.machineCode)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="machineLabel" translate>{{ 'invoices.accounting_machine_label' }}</label>
|
||||
<label for="machineLabel" translate>{{ 'invoices.accounting_Machine_label' }}</label>
|
||||
<input type="text" id="machineLabel" ng-model="settings.machineLabel.value" class="form-control" placeholder="{{ 'invoices.general_machine_label' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.machineLabel)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="trainingCode" translate>{{ 'invoices.accounting_training_code' }}</label>
|
||||
<label for="trainingCode" translate>{{ 'invoices.accounting_Training_code' }}</label>
|
||||
<input type="text" id="trainingCode" ng-model="settings.trainingCode.value" class="form-control" placeholder="{{ 'invoices.general_training_code' | translate }}" />
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.trainingCode)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="trainingLabel" translate>{{ 'invoices.accounting_training_label' }}</label>
|
||||
<label for="trainingLabel" translate>{{ 'invoices.accounting_Training_label' }}</label>
|
||||
<input type="text" id="trainingLabel" ng-model="settings.trainingLabel.value" class="form-control" placeholder="{{ 'invoices.general_training_label' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.trainingLabel)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="eventCode" translate>{{ 'invoices.accounting_event_code' }}</label>
|
||||
<label for="eventCode" translate>{{ 'invoices.accounting_Event_code' }}</label>
|
||||
<input type="text" id="eventCode" ng-model="settings.eventCode.value" class="form-control" placeholder="{{ 'invoices.general_event_code' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.eventCode)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="eventLabel" translate>{{ 'invoices.accounting_event_label' }}</label>
|
||||
<label for="eventLabel" translate>{{ 'invoices.accounting_Event_label' }}</label>
|
||||
<input type="text" id="eventLabel" ng-model="settings.eventLabel.value" class="form-control" placeholder="{{ 'invoices.general_event_label' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.eventLabel)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="spaceCode" translate>{{ 'invoices.accounting_space_code' }}</label>
|
||||
<label for="spaceCode" translate>{{ 'invoices.accounting_Space_code' }}</label>
|
||||
<input type="text" id="spaceCode" ng-model="settings.spaceCode.value" class="form-control" placeholder="{{ 'invoices.general_space_code' | translate }}" />
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.spaceCode)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="spaceLabel" translate>{{ 'invoices.accounting_space_label' }}</label>
|
||||
<label for="spaceLabel" translate>{{ 'invoices.accounting_Space_label' }}</label>
|
||||
<input type="text" id="spaceLabel" ng-model="settings.spaceLabel.value" class="form-control" placeholder="{{ 'invoices.general_space_label' | translate }}"/>
|
||||
<button name="button" class="btn btn-warning" ng-click="save(settings.spaceLabel)" translate>{{ 'save' }}</button>
|
||||
</div>
|
||||
|
||||
@ -8,7 +8,7 @@ class AccountingExportService
|
||||
@encoding = encoding
|
||||
@format = format
|
||||
@separator = separator
|
||||
@journal_code = Setting.find_by(name: 'accounting-export_journal-code')&.value || ''
|
||||
@journal_code = Setting.find_by(name: 'accounting_journal_code')&.value || ''
|
||||
@date_format = date_format
|
||||
@columns = columns
|
||||
@vat_rate = Setting.find_by(name: 'invoice_VAT-rate')&.value&.to_f || 0
|
||||
@ -33,12 +33,12 @@ class AccountingExportService
|
||||
columns.each do |column|
|
||||
row << I18n.t("accounting_export.#{column}") << separator
|
||||
end
|
||||
row
|
||||
"#{row}\n"
|
||||
end
|
||||
|
||||
def generate_rows(invoice)
|
||||
"#{client_row(invoice)}\n" \
|
||||
"#{items_rows(invoice)}\n" \
|
||||
"#{items_rows(invoice)}" \
|
||||
"#{vat_row(invoice)}\n"
|
||||
end
|
||||
|
||||
|
||||
@ -451,21 +451,21 @@ en:
|
||||
general_subscription_code: "Accounting code for all subscriptions"
|
||||
accounting_subscription_label: "Subscriptions label"
|
||||
general_subscription_label: "Account label for all subscriptions"
|
||||
accounting_machine_code: "Machines code"
|
||||
accounting_Machine_code: "Machines code"
|
||||
general_machine_code: "Accounting code for all machines"
|
||||
accounting_machine_label: "Machine label"
|
||||
accounting_Machine_label: "Machine label"
|
||||
general_machine_label: "Account label for all machines"
|
||||
accounting_training_code: "Trainings code"
|
||||
accounting_Training_code: "Trainings code"
|
||||
general_training_code: "Accounting code for all trainings"
|
||||
accounting_training_label: "Trainings label"
|
||||
accounting_Training_label: "Trainings label"
|
||||
general_training_label: "Account label for all trainings"
|
||||
accounting_event_code: "Events code"
|
||||
accounting_Event_code: "Events code"
|
||||
general_event_code: "Accounting code for all events"
|
||||
accounting_event_label: "Events label"
|
||||
accounting_Event_label: "Events label"
|
||||
general_event_label: "Account label for all events"
|
||||
accounting_space_code: "Space code"
|
||||
accounting_Space_code: "Space code"
|
||||
general_space_code: "Accounting code for all spaces"
|
||||
accounting_space_label: "Spaces label"
|
||||
accounting_Space_label: "Spaces label"
|
||||
general_space_label: "Account label for all spaces"
|
||||
accounting_coupon_code: "Coupons code"
|
||||
general_coupon_code: "Accounting code for all coupons"
|
||||
|
||||
@ -451,21 +451,21 @@ es:
|
||||
general_subscription_code: "Accounting code for all subscriptions" # translation_missing
|
||||
accounting_subscription_label: "Subscriptions label" # translation_missing
|
||||
general_subscription_label: "Account label for all subscriptions" # translation_missing
|
||||
accounting_machine_code: "Machines code" # translation_missing
|
||||
accounting_Machine_code: "Machines code" # translation_missing
|
||||
general_machine_code: "Accounting code for all machines" # translation_missing
|
||||
accounting_machine_label: "Machine label" # translation_missing
|
||||
accounting_Machine_label: "Machine label" # translation_missing
|
||||
general_machine_label: "Account label for all machines" # translation_missing
|
||||
accounting_training_code: "Trainings code" # translation_missing
|
||||
accounting_Training_code: "Trainings code" # translation_missing
|
||||
general_training_code: "Accounting code for all trainings" # translation_missing
|
||||
accounting_training_label: "Trainings label" # translation_missing
|
||||
accounting_Training_label: "Trainings label" # translation_missing
|
||||
general_training_label: "Account label for all trainings" # translation_missing
|
||||
accounting_event_code: "Events code" # translation_missing
|
||||
accounting_Event_code: "Events code" # translation_missing
|
||||
general_event_code: "Accounting code for all events" # translation_missing
|
||||
accounting_event_label: "Events label" # translation_missing
|
||||
accounting_Event_label: "Events label" # translation_missing
|
||||
general_event_label: "Account label for all events" # translation_missing
|
||||
accounting_space_code: "Space code" # translation_missing
|
||||
accounting_Space_code: "Space code" # translation_missing
|
||||
general_space_code: "Accounting code for all spaces" # translation_missing
|
||||
accounting_space_label: "Spaces label" # translation_missing
|
||||
accounting_Space_label: "Spaces label" # translation_missing
|
||||
general_space_label: "Account label for all spaces" # translation_missing
|
||||
accounting_coupon_code: "Coupons code" # translation_missing
|
||||
general_coupon_code: "Accounting code for all coupons" # translation_missing
|
||||
|
||||
@ -453,19 +453,19 @@ fr:
|
||||
general_subscription_label: "Libellé du compte pour tous les abonnements"
|
||||
accounting_machine_code: "Code machines"
|
||||
general_machine_code: "Code comptable pour toutes les machines"
|
||||
accounting_machine_label: "Libellé machine"
|
||||
accounting_Machine_label: "Libellé machine"
|
||||
general_machine_label: "Libellé du compte pour toutes les machines"
|
||||
accounting_training_code: "Code formations"
|
||||
accounting_Training_code: "Code formations"
|
||||
general_training_code: "Code comptable pour toutes les formations"
|
||||
accounting_training_label: "Libellé formations"
|
||||
accounting_Training_label: "Libellé formations"
|
||||
general_training_label: "Libellé du compte pour toutes les formations"
|
||||
accounting_event_code: "Code évènements"
|
||||
accounting_Event_code: "Code évènements"
|
||||
general_event_code: "Code comptable pour tous les évènements"
|
||||
accounting_event_label: "Libellé évènements"
|
||||
accounting_Event_label: "Libellé évènements"
|
||||
general_event_label: "Libellé du compte pour tous les évènements"
|
||||
accounting_space_code: "Code espaces"
|
||||
accounting_Space_code: "Code espaces"
|
||||
general_space_code: "Code comptable pour tous les espaces"
|
||||
accounting_space_label: "Libellé espaces"
|
||||
accounting_Space_label: "Libellé espaces"
|
||||
general_space_label: "Libellé du compte pour tous les espaces"
|
||||
accounting_coupon_code: "Code pour codes promo"
|
||||
general_coupon_code: "Code comptable pour tous les codes promo"
|
||||
|
||||
@ -451,21 +451,21 @@ pt:
|
||||
general_subscription_code: "Accounting code for all subscriptions" # translation_missing
|
||||
accounting_subscription_label: "Subscriptions label" # translation_missing
|
||||
general_subscription_label: "Account label for all subscriptions" # translation_missing
|
||||
accounting_machine_code: "Machines code" # translation_missing
|
||||
accounting_Machine_code: "Machines code" # translation_missing
|
||||
general_machine_code: "Accounting code for all machines" # translation_missing
|
||||
accounting_machine_label: "Machine label" # translation_missing
|
||||
accounting_Machine_label: "Machine label" # translation_missing
|
||||
general_machine_label: "Account label for all machines" # translation_missing
|
||||
accounting_training_code: "Trainings code" # translation_missing
|
||||
accounting_Training_code: "Trainings code" # translation_missing
|
||||
general_training_code: "Accounting code for all trainings" # translation_missing
|
||||
accounting_training_label: "Trainings label" # translation_missing
|
||||
accounting_Training_label: "Trainings label" # translation_missing
|
||||
general_training_label: "Account label for all trainings" # translation_missing
|
||||
accounting_event_code: "Events code" # translation_missing
|
||||
accounting_Event_code: "Events code" # translation_missing
|
||||
general_event_code: "Accounting code for all events" # translation_missing
|
||||
accounting_event_label: "Events label" # translation_missing
|
||||
accounting_Event_label: "Events label" # translation_missing
|
||||
general_event_label: "Account label for all events" # translation_missing
|
||||
accounting_space_code: "Space code" # translation_missing
|
||||
accounting_Space_code: "Space code" # translation_missing
|
||||
general_space_code: "Accounting code for all spaces" # translation_missing
|
||||
accounting_space_label: "Spaces label" # translation_missing
|
||||
accounting_Space_label: "Spaces label" # translation_missing
|
||||
general_space_label: "Account label for all spaces" # translation_missing
|
||||
accounting_coupon_code: "Coupons code" # translation_missing
|
||||
general_coupon_code: "Accounting code for all coupons" # translation_missing
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user