Do not allow negative stock (#3214)

Currently translated at 16.5% (23 of 139 strings)

Translation: opensourcepos/reports
Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/reports/es_MX/

.travis.yml

@@ -16,7 +16,7 @@ script:
   - docker run --rm -v $(pwd):/app jekkos/composer composer install
   - docker run --rm -v $(pwd):/app jekkos/composer php bin/install.php translations develop
   - sed -i "s/'\(dev\)'/'$rev'/g" application/config/config.php
-  - docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt
+  - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower
     sh -c "npm install && bower install && grunt package"
   - docker build . --target ospos -t ospos
   - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
@@ -24,12 +24,12 @@ env:
   global:
   - DOCKER_COMPOSE_VERSION=1.21.1
   - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
 after_success:
   - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
     "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"
 before_deploy:
   - version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
-  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
   - TRAVIS_TAG=$(echo $branch.$version)
   - git tag -f "$branch.$version"
   - sudo mv dist/opensourcepos.zip "dist/opensourcepos.$branch.$version.zip"

application/controllers/Sales.php

@@ -456,15 +456,17 @@ class Sales extends Secure_Controller
 				$data['warning'] = $stock_warning;
 			}
 		}
-		else
-		{
-			if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD, NULL, NULL, $price))
+		else {
+			$out_of_stock = $this->sale_lib->out_of_stock($item_id_or_number_or_item_kit_or_receipt, $item_location);
+			if ($out_of_stock == '')
 			{
-				$data['error'] = $this->lang->line('sales_unable_to_add_item');
+				if (!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD, NULL, NULL, $price)) {
+					$data['error'] = $this->lang->line('sales_unable_to_add_item');
+				}
 			}
 			else
 			{
-				$data['warning'] = $this->sale_lib->out_of_stock($item_id_or_number_or_item_kit_or_receipt, $item_location);
+				$data['warning'] = $out_of_stock;
 			}
 		}
 

application/language/en-US/login_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "I'm not a robot.";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot.";
+$lang["login_invalid_gcaptcha"] = "Please verify that you are not a robot.";
 $lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file.";
 $lang["login_invalid_username_and_password"] = "Invalid Username or Password.";
 $lang["login_login"] = "Login";

application/language/es_MX/reports_lang.php

@@ -37,7 +37,7 @@ $lang["reports_discount_type"] = "";
 $lang["reports_discounts"] = "";
 $lang["reports_discounts_summary_report"] = "";
 $lang["reports_earned"] = "";
-$lang["reports_employee"] = "";
+$lang["reports_employee"] = "Empleado";
 $lang["reports_employees"] = "";
 $lang["reports_employees_summary_report"] = "";
 $lang["reports_expenses"] = "";

application/language/nl/login_lang.php

@@ -1,7 +1,7 @@
 <?php
 $lang["login_gcaptcha"] = "Ik ben geen robot.";
 $lang["login_go"] = "Aanmelden";
-$lang["login_invalid_gcaptcha"] = "Ik ben geen robot is ongeldig.";
+$lang["login_invalid_gcaptcha"] = "Bewijs dat je geen robot bent.";
 $lang["login_invalid_installation"] = "De installatie is niet juist, controleer uw php.ini bestand.";
 $lang["login_invalid_username_and_password"] = "Ongeldige gebruikersnaam of wachtwoord.";
 $lang["login_login"] = "Aanmelden";

package.json

@@ -20,7 +20,7 @@
     "POS"
   ],
   "devDependencies": {
-    "grunt": "~0.4.5",
+    "grunt": "~1.4.0",
     "grunt-apigen": "^0.1.3",
     "grunt-bower": "^0.21.0",
     "grunt-bower-concat": "^1.0.0",