DGNum/gestioCOF
13
2
Fork 2
Code Issues 82 Pull requests 17 Projects Releases 12 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into Aufinal/editions

Browse source
This commit is contained in:
Ludovic Stephan 2017-04-01 18:09:23 -03:00
commit 944a73eef7
6 changed files with 169 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kfet/migrations/0049_merge.py Normal file
View file

@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('kfet', '0048_article_hidden'),
('kfet', '0048_default_datetime'),
]
operations = [
]

16
kfet/templates/kfet/kpsul.html
View file

@ -1381,11 +1381,19 @@ $(document).ready(function() {
}
}
for (var i=0; i<data['articles'].length; i++) {
article = data['articles'][i];
articles_container.find('#data-article-'+article['id'])
.addClass('low-stock');
articles_container.find('#data-article-'+article['id']+' .stock')
var article = data['articles'][i];
var article_line = articles_container.find('#data-article-'+article.id);
if (article.stock <= 5 && article.stock >= -5) {
article_line.addClass('low-stock');
} else {
article_line.removeClass('low-stock');
}
article_line.find('.stock')
.text(article['stock']);
var i = 0;
while (i < articlesList.length && articlesList[i][1] != article.id) i++ ;
articlesList[i][4] = article.stock ;
}
if (data['addcost']) {
settings['addcost_for'] = data['addcost']['for'];