diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index 5aa4d73425..9530487ce8 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -248,6 +248,7 @@ "DEFINE_UNTIL_DATE": "Define a limit date", "DEFAULT_QUANTITY": "Default Quantity", "DEBTOR_BALANCE_REMAINING": "Debtor's Remaining Balance", + "DECREASE" : "Decrease", "DEPOT": "Depot", "DESCRIPTION": "Description", "DESIGNATION": "Designation", @@ -319,6 +320,7 @@ "INCLUDE_DATE_INTERVAL": "Include date interval", "INCOME": "Income", "INCOME_EXPENSE": "Income and Expense", + "INCREASE" : "Increase", "INTL": "International", "INVENTORY": "Inventory", "INVENTORY_ITEM": "Item", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 031be2e269..3816d4e7e1 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -250,6 +250,7 @@ "DEBTOR_CREDITOR": "Débiteur/Créditeur", "DEFINE_UNTIL_DATE": "Définir une date limite", "DEBTOR_BALANCE_REMAINING": "Solde Restant du Débiteur", + "DECREASE" : "Dimunition", "DEPOT": "Depot", "DESCRIPTION": "Description", "DETAILS": "Details", @@ -319,6 +320,7 @@ "ID": "ID", "INCOME": "Recettes", "INCOME_EXPENSE": "Recettes et dépenses", + "INCREASE": "Augmentation", "INCLUDE_DATE_INTERVAL": "Inclure l'intervalle de dates", "INCLUDE_ZEROES": "Inclure des lignes avec des valeurs zéro", "INTL": "Internationale", diff --git a/client/src/modules/stock/adjustment/adjustment.html b/client/src/modules/stock/adjustment/adjustment.html index 393348d658..5c48042315 100644 --- a/client/src/modules/stock/adjustment/adjustment.html +++ b/client/src/modules/stock/adjustment/adjustment.html @@ -7,8 +7,8 @@
  • {{ StockCtrl.depot.text }} - - {{ StockCtrl.adjustmentOption }} + + {{ StockCtrl.adjustmentType}}
    • @@ -35,123 +35,123 @@
    -
    - -
    -
    - -
    -
    -
    - - - +
    +
    + +
    +
    +
    + + + +
    -
    - - - - +
    - -
    - - -
    -
    + + + + + +
    + + +
    +
    +
    +
    +
    +
    +

    STOCK.INCREASE

    +

    STOCK.INCREASE_HELP

    +
    -
    -
    -

    STOCK.INCREASE

    -

    STOCK.INCREASE_HELP

    -
    - -
    -

    STOCK.DECREASE

    -

    STOCK.DECREASE_HELP

    +
    +

    STOCK.DECREASE

    +

    STOCK.DECREASE_HELP

    +
    -
    - - -
    -
    - -

    - - FORM.INFO.NO_DESTINATION -

    - -
    - -
    + +
    +
    + +

    + + FORM.INFO.NO_DESTINATION +

    + + +
    + +
    - - - + + + +
    +
    - -
    - -
    -
    - - -
    -
    -
    - + +
    +
    - - FORM.BUTTONS.SUBMIT - + +
    +
    +
    + + + + FORM.BUTTONS.SUBMIT + +
    -
    diff --git a/client/src/modules/stock/adjustment/adjustment.js b/client/src/modules/stock/adjustment/adjustment.js index 2bed3d05e3..af3fee15de 100644 --- a/client/src/modules/stock/adjustment/adjustment.js +++ b/client/src/modules/stock/adjustment/adjustment.js @@ -41,62 +41,77 @@ function StockAdjustmentController( vm.checkValidity = checkValidity; vm.submit = submit; vm.changeDepot = changeDepot; + vm.handleAdjustmentOption = handleAdjustmentOption; // grid columns var columns = [ - { field : 'status', - width : 25, - displayName : '', - cellTemplate : 'modules/stock/exit/templates/status.tmpl.html' }, - - { field : 'code', - width : 120, - displayName : 'TABLE.COLUMNS.CODE', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/exit/templates/code.tmpl.html' }, - - { field : 'description', - displayName : 'TABLE.COLUMNS.DESCRIPTION', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/exit/templates/description.tmpl.html' }, - - { field : 'lot', - width : 150, - displayName : 'TABLE.COLUMNS.LOT', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/exit/templates/lot.tmpl.html' }, - - { field : 'quantity', - width : 150, - displayName : 'TABLE.COLUMNS.QUANTITY', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/adjustment/templates/quantity.tmpl.html', - treeAggregationType : uiGridGroupingConstants.aggregation.SUM }, - - { field : 'available_lot', - width : 150, - displayName : 'TABLE.COLUMNS.AVAILABLE', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/exit/templates/available.tmpl.html' }, - - { field : 'expiration_date', - width : 150, - displayName : 'TABLE.COLUMNS.EXPIRATION_DATE', - headerCellFilter : 'translate', - cellTemplate : 'modules/stock/exit/templates/expiration.tmpl.html' }, - - { field: 'actions', width: 25, cellTemplate: 'modules/stock/exit/templates/actions.tmpl.html' }, + { + field: 'status', + width: 25, + displayName: '', + cellTemplate: 'modules/stock/exit/templates/status.tmpl.html' + }, + + { + field: 'code', + width: 120, + displayName: 'TABLE.COLUMNS.CODE', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/exit/templates/code.tmpl.html' + }, + + { + field: 'description', + displayName: 'TABLE.COLUMNS.DESCRIPTION', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/exit/templates/description.tmpl.html' + }, + + { + field: 'lot', + width: 150, + displayName: 'TABLE.COLUMNS.LOT', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/exit/templates/lot.tmpl.html' + }, + + { + field: 'quantity', + width: 150, + displayName: 'TABLE.COLUMNS.QUANTITY', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/adjustment/templates/quantity.tmpl.html', + treeAggregationType: uiGridGroupingConstants.aggregation.SUM + }, + + { + field: 'available_lot', + width: 150, + displayName: 'TABLE.COLUMNS.AVAILABLE', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/exit/templates/available.tmpl.html' + }, + + { + field: 'expiration_date', + width: 150, + displayName: 'TABLE.COLUMNS.EXPIRATION_DATE', + headerCellFilter: 'translate', + cellTemplate: 'modules/stock/exit/templates/expiration.tmpl.html' + }, + + { field: 'actions', width: 25, cellTemplate: 'modules/stock/exit/templates/actions.tmpl.html' }, ]; // grid options vm.gridOptions = { - appScopeProvider : vm, - enableSorting : false, - enableColumnMenus : false, - columnDefs : columns, - data : vm.Stock.store.data, - fastWatch : true, - flatEntityAccess : true, + appScopeProvider: vm, + enableSorting: false, + enableColumnMenus: false, + columnDefs: columns, + data: vm.Stock.store.data, + fastWatch: true, + flatEntityAccess: true, }; // add items @@ -111,6 +126,14 @@ function StockAdjustmentController( checkValidity(); } + function handleAdjustmentOption() { + if (vm.adjustmentOption === 'increase') { + vm.adjustmentType = 'FORM.LABELS.INCREASE'; + } else if (vm.adjustmentOption === 'decrease') { + vm.adjustmentType = 'FORM.LABELS.DECREASE'; + } + } + // configure item function configureItem(item) { item._initialised = true; @@ -131,8 +154,8 @@ function StockAdjustmentController( function startup() { vm.movement = { - date : new Date(), - entity : {}, + date: new Date(), + entity: {}, }; vm.depot = cache.depot; @@ -172,28 +195,30 @@ function StockAdjustmentController( if (form.$invalid || !vm.adjustmentOption) { return; } if (vm.adjustmentOption === 'increase') { + vm.adjustmentType = 'FORM.LABELS.INCREASE'; isExit = 0; fluxId = bhConstants.flux.FROM_ADJUSTMENT; } else if (vm.adjustmentOption === 'decrease') { + vm.adjustmentType = 'FORM.LABELS.DECREASE'; isExit = 1; fluxId = bhConstants.flux.TO_ADJUSTMENT; } var movement = { - depot_uuid : vm.depot.uuid, - entity_uuid : vm.movement.entity.uuid, - date : vm.movement.date, - description : vm.movement.description, - is_exit : isExit, - flux_id : fluxId, - user_id : Session.user.id, + depot_uuid: vm.depot.uuid, + entity_uuid: vm.movement.entity.uuid, + date: vm.movement.date, + description: vm.movement.description, + is_exit: isExit, + flux_id: fluxId, + user_id: Session.user.id, }; var lots = vm.Stock.store.data.map(function (row) { return { - uuid : row.lot.uuid, - quantity : row.quantity, - unit_cost : row.lot.unit_cost, + uuid: row.lot.uuid, + quantity: row.quantity, + unit_cost: row.lot.unit_cost, }; });