Add base templates to extend
- kfet/base_col_1.html for one column content. - kfet/base_col_2.html for two columns content (left for fixed content, right for main content).
This commit is contained in:
parent
1845ce825f
commit
e60e347a53
|
@ -257,13 +257,13 @@ textarea {
|
||||||
padding:0px 5px;
|
padding:0px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center .table .form-control {
|
.table .form-control {
|
||||||
padding: 1px 12px ;
|
padding: 1px 12px ;
|
||||||
height:28px;
|
height:28px;
|
||||||
margin:3px 0px;
|
margin:3px 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center .table-condensed input.form-control {
|
.table-condensed input.form-control {
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
border-top: 0;
|
border-top: 0;
|
||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
|
@ -630,3 +630,27 @@ thead .tooltip {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Statement creation */
|
||||||
|
|
||||||
|
.statement-create-summary table {
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.statement-create-summary tr td {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.statement-create-summary tr td:first-child {
|
||||||
|
padding-right: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.statement-create-summary tr td:last-child {
|
||||||
|
width: 80px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#detail_taken table td,
|
||||||
|
#detail_balance table td {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
|
@ -51,15 +51,6 @@
|
||||||
box-shadow: inset 0 5px 5px -5px #000;
|
box-shadow: inset 0 5px 5px -5px #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 767px) {
|
|
||||||
.navbar-nav > li:hover > a,
|
|
||||||
.navbar-nav > li > a:focus,
|
|
||||||
.nav .open > a:hover,
|
|
||||||
.nav .open > a:focus {
|
|
||||||
box-shadow: inset 0 5px 5px -5px #000, inset 0 -5px 5px -5px #000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-nav .dropdown .dropdown-menu {
|
.navbar-nav .dropdown .dropdown-menu {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Liste des comptes{% endblock %}
|
{% block title %}Liste des comptes{% endblock %}
|
||||||
{% block content-header-title %}Comptes{% endblock %}
|
{% block header-title %}Comptes{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ accounts|length|add:-1 }}</div>
|
<div class="line line-big">{{ accounts|length|add:-1 }}</div>
|
||||||
<div class="line line-bigsub">compte{{ accounts|length|add:-1|pluralize }}</div>
|
<div class="line line-bigsub">compte{{ accounts|length|add:-1|pluralize }}</div>
|
||||||
|
@ -21,11 +18,11 @@
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.account.negative' %}">Négatifs</a>
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.account.negative' %}">Négatifs</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des comptes</h2>
|
<h2>Liste des comptes</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -52,7 +49,7 @@
|
||||||
<td>{{ account.trigramme }}</td>
|
<td>{{ account.trigramme }}</td>
|
||||||
<td>{{ account.name }}</td>
|
<td>{{ account.name }}</td>
|
||||||
<td class="text-right">{{ account.balance }}€</td>
|
<td class="text-right">{{ account.balance }}€</td>
|
||||||
<td>{{ account.is_cof }}</td>
|
<td>{{ account.is_cof|yesno:"Oui,Non" }}</td>
|
||||||
<td>{{ account.departement }}</td>
|
<td>{{ account.departement }}</td>
|
||||||
<td>{{ account.promo|default_if_none:'' }}</td>
|
<td>{{ account.promo|default_if_none:'' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -61,8 +58,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,21 +1,17 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}Nouveau compte{% endblock %}
|
{% block title %}Nouveau compte{% endblock %}
|
||||||
|
{% block header-title %}Création d'un compte{% endblock %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
|
<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content-header-title %}Création d'un compte{% endblock %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-content %}
|
||||||
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
|
|
||||||
<div class="content-center content-form">
|
|
||||||
<form action="" method="post" class="account_create">
|
<form action="" method="post" class="account_create">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div>
|
<div>
|
||||||
|
@ -37,9 +33,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
// Affichage des résultats d'autocomplétion
|
// Affichage des résultats d'autocomplétion
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}Nouveau compte{% endblock %}
|
{% block title %}Nouveau compte{% endblock %}
|
||||||
|
{% block header-title %}Création d'un compte{% endblock %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
|
<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content-header-title %}Création d'un compte{% endblock %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-center content-form">
|
|
||||||
<form action="" method="post" class="account_create">
|
<form action="" method="post" class="account_create">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div>
|
<div>
|
||||||
|
@ -36,9 +33,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
// Affichage des résultats d'autocomplétion
|
// Affichage des résultats d'autocomplétion
|
||||||
|
|
|
@ -1,24 +1,18 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Groupes de comptes{% endblock %}
|
{% block title %}Groupes de comptes{% endblock %}
|
||||||
{% block content-header-title %}Groupes de comptes{% endblock %}
|
{% block header-title %}Groupes de comptes{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top text-center">
|
|
||||||
<div class="line"></div>
|
|
||||||
</div>
|
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.account.group.create' %}">Créer un groupe</a>
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.account.group.create' %}">Créer un groupe</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
{% for group in groups %}
|
{% for group in groups %}
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<div class="buttons-title">
|
<div class="buttons-title">
|
||||||
|
@ -30,15 +24,21 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<h3>Permissions</h3>
|
<h3>Permissions</h3>
|
||||||
<ul>
|
{% regroup group.permissions.all by content_type as grouped_perms %}
|
||||||
{% for perm in group.permissions.all %}
|
<ul class="list-unstyled">
|
||||||
<li>{{ perm.name }}</li>
|
{% for perms_group in grouped_perms %}
|
||||||
|
<li><b>{{ perms_group.grouper|title }}</b>
|
||||||
|
<ul class="list-unstyled">
|
||||||
|
{% for perm in perms_group.list %}
|
||||||
|
<li style="padding-left: 20px">{{ perm.name }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<h3>Comptes</h3>
|
<h3>Comptes</h3>
|
||||||
<ul>
|
<ul class="list-unstyled">
|
||||||
{% for user in group.user_set.all %}
|
{% for user in group.user_set.all %}
|
||||||
<li>{{ user.profile.account_kfet }}</li>
|
<li>{{ user.profile.account_kfet }}</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -47,8 +47,5 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends 'kfet/base_col_1.html' %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
|
@ -8,14 +8,12 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}Permissions - Édition{% endblock %}
|
{% block title %}Permissions - Édition{% endblock %}
|
||||||
{% block content-header-title %}Modification des permissions{% endblock %}
|
{% block header-title %}Modification des permissions{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-center content-form">
|
|
||||||
<form action="" method="post" class="form-horizontal">
|
<form action="" method="post" class="form-horizontal">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
@ -35,9 +33,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include "kfet/form_submit_snippet.html" with value="Enregistrer" %}
|
{% include "kfet/form_submit_snippet.html" with value="Enregistrer" %}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Comptes en négatifs{% endblock %}
|
{% block title %}Comptes - Négatifs{% endblock %}
|
||||||
{% block content-header-title %}Comptes - Négatifs{% endblock %}
|
{% block header-title %}Comptes en négatifs{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ negatives|length }}</div>
|
<div class="line line-big">{{ negatives|length }}</div>
|
||||||
<div class="line line-bigsub">compte{{ negatives|length|pluralize }} en négatif</div>
|
<div class="line line-bigsub">compte{{ negatives|length|pluralize }} en négatif</div>
|
||||||
|
@ -25,11 +22,11 @@
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.settings' %}">Modifier les valeurs par défaut</a>
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.settings' %}">Modifier les valeurs par défaut</a>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des comptes en négatifs</h2>
|
<h2>Liste des comptes en négatifs</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -73,8 +70,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load kfet_tags %}
|
{% load kfet_tags %}
|
||||||
{% load l10n %}
|
{% load l10n %}
|
||||||
|
@ -29,14 +29,6 @@ $(document).ready(function() {
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% if account.user == request.user %}
|
|
||||||
Mon compte
|
|
||||||
{% else %}
|
|
||||||
Informations du compte {{ account.trigramme }}
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content-header-title %}
|
|
||||||
{% if account.user == request.user %}
|
{% if account.user == request.user %}
|
||||||
Mon compte
|
Mon compte
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -44,17 +36,20 @@ $(document).ready(function() {
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block header-title %}
|
||||||
|
{% if account.user == request.user %}
|
||||||
|
Mon compte
|
||||||
|
{% else %}
|
||||||
|
Informations du compte {{ account.trigramme }}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block fixed-content %}
|
||||||
|
{% include "kfet/left_account.html" %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
{% include 'kfet/left_account.html' %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-right">
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
{% if account.user == request.user %}
|
{% if account.user == request.user %}
|
||||||
<div class="content-right-block tab-pane fade in active" id="tab_stats">
|
<div class="content-right-block tab-pane fade in active" id="tab_stats">
|
||||||
|
@ -82,9 +77,6 @@ $(document).ready(function() {
|
||||||
<div id="history"></div>
|
<div id="history"></div>
|
||||||
</div><!-- content-right-block -->
|
</div><!-- content-right-block -->
|
||||||
</div><!-- tab-content -->
|
</div><!-- tab-content -->
|
||||||
</div><!-- content-right-->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
{{ negative_form.media }}
|
{{ negative_form.media }}
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content-header-title %}
|
{% block header-title %}
|
||||||
{% if account.user == request.user %}
|
{% if account.user == request.user %}
|
||||||
Modification de mes informations
|
Modification de mes informations
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -20,12 +20,10 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-center content-form">
|
|
||||||
<form action="" method="post" class="form-horizontal">
|
<form action="" method="post" class="form-horizontal">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% include 'kfet/form_snippet.html' with form=user_form %}
|
{% include 'kfet/form_snippet.html' with form=user_form %}
|
||||||
|
@ -39,9 +37,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
|
{% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends 'kfet/base_col_2.html' %}
|
||||||
|
|
||||||
{% block title %}Articles{% endblock %}
|
{% block title %}Articles{% endblock %}
|
||||||
{% block content-header-title %}Articles{% endblock %}
|
{% block header-title %}Articles{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ articles|length }}</div>
|
<div class="line line-big">{{ articles|length }}</div>
|
||||||
<div class="line line-bigsub">article{{ articles|length|pluralize }}</div>
|
<div class="line line-bigsub">article{{ articles|length|pluralize }}</div>
|
||||||
|
@ -20,11 +17,10 @@
|
||||||
Catégories
|
Catégories
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des articles</h2>
|
<h2>Liste des articles</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -65,8 +61,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends 'kfet/base_col_1.html' %}
|
||||||
|
|
||||||
{% block title %}Nouvel article{% endblock %}
|
{% block title %}Nouvel article{% endblock %}
|
||||||
{% block content-header-title %}Création d'un article{% endblock %}
|
{% block header-title %}Création d'un article{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include "kfet/base_form.html" with authz=perms.kfet.add_article submit_text="Enregistrer" %}
|
{% include "kfet/base_form.html" with authz=perms.kfet.add_article submit_text="Enregistrer" %}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends 'kfet/base_col_2.html' %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
|
@ -6,14 +6,11 @@
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/statistic.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/statistic.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}Informations sur l'article {{ article }}{% endblock %}
|
{% block title %}Article - {{ article.name }}{% endblock %}
|
||||||
{% block content-header-title %}Article - {{ article.name }}{% endblock %}
|
{% block header-title %}Informations sur l'article {{ article.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ article.name }}</div>
|
<div class="line line-big">{{ article.name }}</div>
|
||||||
<div class="line line-bigsub">{{ article.category }}</div>
|
<div class="line line-bigsub">{{ article.category }}</div>
|
||||||
|
@ -29,15 +26,15 @@
|
||||||
Modifier
|
Modifier
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Historique</h2>
|
<h2>Historique</h2>
|
||||||
<div class="row">
|
<div class="row" style="padding-bottom: 15px">
|
||||||
<div class="col-sm-6">
|
<div class="col-md-6">
|
||||||
<h3>Inventaires</h3>
|
<h3>Inventaires</h3>
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
|
@ -58,8 +55,9 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-md-6">
|
||||||
<h3>Prix fournisseurs</h3>
|
<h3>Prix fournisseurs</h3>
|
||||||
|
<div class="table-responsive">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -83,22 +81,16 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div><!-- /row-->
|
</div><!-- /row-->
|
||||||
</div>
|
</div>
|
||||||
<div class="content-right-block content-right-block-transparent">
|
<div class="content-right-block">
|
||||||
<h2>Statistiques</h2>
|
<h2>Statistiques</h2>
|
||||||
<div class="row">
|
<div>
|
||||||
<div class="col-sm-12 nopadding">
|
<h3>Ventes</h3>
|
||||||
<div class="panel-md-margin">
|
|
||||||
<h3>Ventes de {{ article.name }}</h3>
|
|
||||||
<div id="stat_last"></div>
|
<div id="stat_last"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /row -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block title %}Édition de l'article {{ article.name }}{% endblock %}
|
{% block title %}{{ article.name }} - Édition{% endblock %}
|
||||||
{% block content-header-title %}Article {{ article.name }} - Édition{% endblock %}
|
{% block header-title %}Édition de l'article {{ article.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include "kfet/base_form.html" with authz=perms.kfet.change_article submit_text="Mettre à jour"%}
|
{% include "kfet/base_form.html" with authz=perms.kfet.change_article submit_text="Mettre à jour"%}
|
||||||
|
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
<body>
|
<body>
|
||||||
{% include "kfet/base_nav.html" %}
|
{% include "kfet/base_nav.html" %}
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
{% block content-header %}
|
{% block header %}
|
||||||
<div class="row row-page-header">
|
<div class="row row-page-header">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<h1 class="page-header">{% block content-header-title %}{% endblock %}</h1>
|
<h1 class="page-header">{% block header-title %}{% endblock %}</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
14
kfet/templates/kfet/base_col_1.html
Normal file
14
kfet/templates/kfet/base_col_1.html
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{% extends "kfet/base.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="nopadding {% block main-size %}col-md-8 col-md-offset-2{% endblock %}">
|
||||||
|
{% include "kfet/base_messages.html" %}
|
||||||
|
<div class="content-center {% block main-class %}{% endblock %}">
|
||||||
|
{% block main-content %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
|
||||||
|
{% endblock %}
|
19
kfet/templates/kfet/base_col_2.html
Normal file
19
kfet/templates/kfet/base_col_2.html
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{% extends "kfet/base.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-content-left {% block fixed-size %}col-sm-4 col-md-3{% endblock %}">
|
||||||
|
<div class="content-left">
|
||||||
|
{% block fixed-content %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-content-right {% block main-size %}col-sm-8 col-md-9{% endblock %}">
|
||||||
|
{% include "kfet/base_messages.html" %}
|
||||||
|
<div class="content-right">
|
||||||
|
{% block main-content %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endblock %}
|
|
@ -1,9 +1,5 @@
|
||||||
{% load kfet_tags %}
|
{% load kfet_tags %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-center content-form">
|
|
||||||
<form action="" method="post" class="form-horizontal">
|
<form action="" method="post" class="form-horizontal">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% include "kfet/form_snippet.html" %}
|
{% include "kfet/form_snippet.html" %}
|
||||||
|
@ -12,6 +8,3 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include "kfet/form_submit_snippet.html" with value=submit_text %}
|
{% include "kfet/form_submit_snippet.html" with value=submit_text %}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
|
@ -1,22 +1,19 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Categories d'articles{% endblock %}
|
{% block title %}Categories d'articles{% endblock %}
|
||||||
{% block content-header-title %}Categories d'articles{% endblock %}
|
{% block header-title %}Categories d'articles{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ categories|length }}</div>
|
<div class="line line-big">{{ categories|length }}</div>
|
||||||
<div class="line line-bigsub">catégorie{{ categories|length|pluralize }}</div>
|
<div class="line line-bigsub">catégorie{{ categories|length|pluralize }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des catégories</h2>
|
<h2>Liste des catégories</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -46,8 +43,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block title %}Édition de la catégorie {{ category.name }}{% endblock %}
|
{% block title %}{{ articlecategory.name }} - Édition{% endblock %}
|
||||||
{% block content-header-title %}Catégorie {{ category.name }} - Édition{% endblock %}
|
{% block header-title %}Édition de la catégorie {{ articlecategory.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include "kfet/base_form.html" with authz=perms.kfet.edit_articlecategory submit_text="Enregistrer"%}
|
{% include "kfet/base_form.html" with authz=perms.kfet.edit_articlecategory submit_text="Enregistrer"%}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Liste des caisses{% endblock %}
|
{% block title %}Caisses{% endblock %}
|
||||||
{% block content-header-title %}Caisses{% endblock %}
|
{% block header-title %}Caisses{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top text-center">
|
<div class="content-left-top text-center">
|
||||||
<div class="line line-big">{{ checkouts|length }}</div>
|
<div class="line line-big">{{ checkouts|length }}</div>
|
||||||
<div class="line line-bigsub">caisse{{ checkouts|length|pluralize }}</div>
|
<div class="line line-bigsub">caisse{{ checkouts|length|pluralize }}</div>
|
||||||
|
@ -15,11 +12,11 @@
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des caisses</h2>
|
<h2>Liste des caisses</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -53,8 +50,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,28 +1,13 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% block extra_head %}{{ form.media }}{% endblock %}
|
{% block extra_head %}{{ form.media }}{% endblock %}
|
||||||
|
|
||||||
{% block title %}Nouvelle caisse{% endblock %}
|
{% block title %}Nouvelle caisse{% endblock %}
|
||||||
{% block content-header-title %}Création d'une caisse{% endblock %}
|
{% block header-title %}Création d'une caisse{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% include "kfet/base_form.html" with authz=perms.kfet.add_checkout submit_text="Enregistrer" %}
|
||||||
<form action="" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form.non_field_errors}}
|
|
||||||
{% for field in form %}
|
|
||||||
{{ field.errors }}
|
|
||||||
{{ field.label_tag }}
|
|
||||||
<div style="position:relative">{{ field }}</div>
|
|
||||||
{% if field.help_text %}
|
|
||||||
<p class="help">{{ field.help_text|safe }}</p>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% if not perms.kfet.add_checkout %}
|
|
||||||
<input type="password" name="KFETPASSWORD">
|
|
||||||
{% endif %}
|
|
||||||
<input type="submit" value="Enregistrer">
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,16 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Informations sur la caisse {{ checkout.name }}{% endblock %}
|
{% block title %}Caisse - {{ checkout.name }}{% endblock %}
|
||||||
{% block content-header-title %}Caisse - {{ checkout.name }}{% endblock %}
|
{% block header-title %}Informations sur la caisse {{ checkout.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
{% include 'kfet/left_checkout.html' %}
|
{% include 'kfet/left_checkout.html' %}
|
||||||
</div>
|
{% endblock %}
|
||||||
</div>
|
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
{% block main-content %}
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Relevés</h2>
|
<h2>Relevés</h2>
|
||||||
<div>
|
<div class="table-responsive">
|
||||||
{% if not statements %}
|
{% if not statements %}
|
||||||
Pas de relevé
|
Pas de relevé
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -44,8 +38,5 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,39 +1,18 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
{% block extra_head %}{{ form.media }}{% endblock %}
|
{% block extra_head %}{{ form.media }}{% endblock %}
|
||||||
|
|
||||||
{% block title %}Édition de la caisse {{ checkout.name }}{% endblock %}
|
{% block title %}Caisse {{ checkout.name }} - Édition{% endblock %}
|
||||||
{% block content-header-title %}Caisse {{ checkout.name }} - Édition{% endblock %}
|
{% block header-title %}Édition de la caisse {{ checkout.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
{% include "kfet/left_checkout.html" %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
{% include 'kfet/left_checkout.html' %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<form action="" method="post">
|
<div style="padding: 15px;">
|
||||||
{% csrf_token %}
|
{% include "kfet/base_form.html" with authz=perms.kfet.change_checkout submit_text="Mettre à jour" %}
|
||||||
{{ form.non_field_errors }}
|
|
||||||
{% for field in form %}
|
|
||||||
{{ field.errors }}
|
|
||||||
{{ field.label_tag }}
|
|
||||||
<div style="position:relative">{{ field }}</div>
|
|
||||||
{% if field.help_text %}
|
|
||||||
<p class="help">{{ field.help_text|safe }}</p>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% if not perms.kfet.add_checkout %}
|
|
||||||
<input type="password" name="KFETPASSWORD">
|
|
||||||
{% endif %}
|
|
||||||
<input type=submit value="Mettre à jour">
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1,45 +1,62 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
{% load l10n %}
|
{% load l10n %}
|
||||||
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
{% block title %}Nouveau relevé{% endblock %}
|
{% block title %}Nouveau relevé - {{ checkout.name }}{% endblock %}
|
||||||
{% block content-header-title %}Caisse {{ checkout.name }} - Nouveau relevé{% endblock %}
|
{% block header-title %}Création d'un relevé pour la caisse {{ checkout.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
{% include "kfet/left_checkout.html" %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
<div class="row">
|
{% block main-content %}
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
{% include 'kfet/left_checkout.html' %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-right">
|
|
||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Général</h2>
|
<h2>Général</h2>
|
||||||
<div>
|
<div class="content-form statement-create-summary">
|
||||||
<label>
|
<table>
|
||||||
Ne pas compter la caisse
|
<tr>
|
||||||
{{ form.not_count }}
|
<td>
|
||||||
</label><br>
|
<label for="{{ form.not_count.id_for_label }}" class="control-label">{{ form.not_count.label }}</label>
|
||||||
Ancienne balance : <span id="balance_old">{{ checkout.balance|unlocalize }}</span> €<br>
|
</td>
|
||||||
Nouvelle balance : <span id="balance_new">0</span> €<br>
|
<td>{{ form.not_count }}</td>
|
||||||
Pris : <span id="amount_taken">0</span> €<br>
|
</tr>
|
||||||
Erreur : <span id="amount_error">0</span> €<br>
|
<tr>
|
||||||
|
<td>Ancienne balance</td>
|
||||||
|
<td>
|
||||||
|
<span id="balance_old">{{ checkout.balance|unlocalize }}</span> €
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Nouvelle balance</td>
|
||||||
|
<td><span id="balance_new">0</span> €</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Pris</td>
|
||||||
|
<td><span id="amount_taken">0</span> €</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Erreur</td>
|
||||||
|
<td><span id="amount_error">0</span> €</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
{% if not perms.kfet.add_checkoutstatement %}
|
{% if not perms.kfet.add_checkoutstatement %}
|
||||||
<label for="password">Mot de passe:</label>
|
{% include "kfet/form_authentication_snippet.html" %}
|
||||||
<input type="password" id="password" name="KFETPASSWORD">
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<input type="submit" value="Enregistrer">
|
<br>
|
||||||
|
<div class="row text-center">
|
||||||
|
<input type="submit" value="Enregistrer" class="btn btn-lg btn-primary">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Pris</h2>
|
<h2>Pris</h2>
|
||||||
<div id="detail_taken">
|
<div id="detail_taken">
|
||||||
<table class="table table-bordered">
|
<div class="table-responsive">
|
||||||
<tr style="font-weight:bold;">
|
<table class="table table-condensed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
<td>5€</td>
|
<td>5€</td>
|
||||||
<td>10€</td>
|
<td>10€</td>
|
||||||
<td>20€</td>
|
<td>20€</td>
|
||||||
|
@ -47,7 +64,9 @@
|
||||||
<td>100€</td>
|
<td>100€</td>
|
||||||
<td>200€</td>
|
<td>200€</td>
|
||||||
<td>500€</td>
|
<td>500€</td>
|
||||||
<tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><input id="id_taken_5" name="taken_5" data-value="5" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_5" name="taken_5" data-value="5" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_taken_10" name="taken_10" data-value="10" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_10" name="taken_10" data-value="10" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
|
@ -57,9 +76,13 @@
|
||||||
<td><input id="id_taken_200" name="taken_200" data-value="200" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_200" name="taken_200" data-value="200" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_taken_500" name="taken_500" data-value="500" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_500" name="taken_500" data-value="500" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<table class="table table-bordered">
|
</div>
|
||||||
<tr style="font-weight:bold;">
|
<div class="table-responsive">
|
||||||
|
<table class="table table-condensed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
<td>2€</td>
|
<td>2€</td>
|
||||||
<td>1€</td>
|
<td>1€</td>
|
||||||
<td>0.50€</td>
|
<td>0.50€</td>
|
||||||
|
@ -68,7 +91,9 @@
|
||||||
<td>0.05€</td>
|
<td>0.05€</td>
|
||||||
<td>0.02€</td>
|
<td>0.02€</td>
|
||||||
<td>0.01€</td>
|
<td>0.01€</td>
|
||||||
<tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><input id="id_taken_2" name="taken_2" data-value="2" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_2" name="taken_2" data-value="2" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_taken_1" name="taken_1" data-value="1" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_1" name="taken_1" data-value="1" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
|
@ -79,15 +104,32 @@
|
||||||
<td><input id="id_taken_002" name="taken_002" data-value="0.02" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_002" name="taken_002" data-value="0.02" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_taken_001" name="taken_001" data-value="0.01" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_taken_001" name="taken_001" data-value="0.01" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<p style="font-weight:bold"> Chèque:</p> <input id="id_taken_cheque" name="taken_cheque" data-value="1" min="0" step="0.01" value="0" type="number" class="form-control" required>
|
</div>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="table table-condensed">
|
||||||
|
<thead>
|
||||||
|
<tr><td>Chèques</td></tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<input id="id_taken_cheque" name="taken_cheque" data-value="1" min="0" step="0.01" value="0" type="number" class="form-control" required>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>En caisse</h2>
|
<h2>En caisse</h2>
|
||||||
<div id="detail_balance">
|
<div id="detail_balance">
|
||||||
<table class="table table-bordered">
|
<div class="table-responsive">
|
||||||
<tr style="font-weight:bold;">
|
<table class="table table-condensed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
<td>5€</td>
|
<td>5€</td>
|
||||||
<td>10€</td>
|
<td>10€</td>
|
||||||
<td>20€</td>
|
<td>20€</td>
|
||||||
|
@ -95,7 +137,9 @@
|
||||||
<td>100€</td>
|
<td>100€</td>
|
||||||
<td>200€</td>
|
<td>200€</td>
|
||||||
<td>500€</td>
|
<td>500€</td>
|
||||||
<tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><input id="id_balance_5" name="balance_5" data-value="5" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_5" name="balance_5" data-value="5" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_balance_10" name="balance_10" data-value="10" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_10" name="balance_10" data-value="10" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
|
@ -105,9 +149,13 @@
|
||||||
<td><input id="id_balance_200" name="balance_200" data-value="200" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_200" name="balance_200" data-value="200" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_balance_500" name="balance_500" data-value="500" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_500" name="balance_500" data-value="500" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<table class="table table-bordered">
|
</div>
|
||||||
<tr style="font-weight:bold;">
|
<div class="table-responsive">
|
||||||
|
<table class="table table-condensed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
<td>2€</td>
|
<td>2€</td>
|
||||||
<td>1€</td>
|
<td>1€</td>
|
||||||
<td>0.50€</td>
|
<td>0.50€</td>
|
||||||
|
@ -116,7 +164,9 @@
|
||||||
<td>0.05€</td>
|
<td>0.05€</td>
|
||||||
<td>0.02€</td>
|
<td>0.02€</td>
|
||||||
<td>0.01€</td>
|
<td>0.01€</td>
|
||||||
<tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><input id="id_balance_2" name="balance_2" data-value="2" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_2" name="balance_2" data-value="2" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_balance_1" name="balance_1" data-value="1" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_1" name="balance_1" data-value="1" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
|
@ -127,13 +177,12 @@
|
||||||
<td><input id="id_balance_002" name="balance_002" data-value="0.02" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_002" name="balance_002" data-value="0.02" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
<td><input id="id_balance_001" name="balance_001" data-value="0.01" min="0" value="0" type="number" class="form-control" required></td>
|
<td><input id="id_balance_001" name="balance_001" data-value="0.01" min="0" value="0" type="number" class="form-control" required></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block title %}Modification d'un relevé{% endblock %}
|
{% block title %}Modification d'un relevé{% endblock %}
|
||||||
{% block content-header-title %}
|
{% block header-title %}
|
||||||
Caisse {{ checkout.name }} - Modification relevé {{ checkoutstatement.at }}
|
Caisse {{ checkout.name }}<br>
|
||||||
|
Modification du relevé {{ checkoutstatement.at }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include "kfet/base_form.html" with authz=perms.kfet.change_checkoutstatement submit_text="Enregistrer"%}
|
{% include "kfet/base_form.html" with authz=perms.kfet.change_checkoutstatement submit_text="Enregistrer"%}
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,18 @@
|
||||||
{% extends "kfet/base.html" %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load kfet_tags %}
|
{% load kfet_tags %}
|
||||||
|
|
||||||
{% block title %}Accueil{% endblock %}
|
{% block title %}Accueil{% endblock %}
|
||||||
{% block content-header %}{% endblock %}
|
{% block header %}{% endblock %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/home.css' %}">
|
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/home.css' %}">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-size %}col-md-10 col-md-offset-1{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-10 col-md-offset-1 nopadding">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-center">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Carte</h2>
|
<h2>Carte</h2>
|
||||||
<div class="column-row">
|
<div class="column-row">
|
||||||
|
@ -55,9 +54,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
|
@ -1,30 +1,25 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Inventaires{% endblock %}
|
{% block title %}Inventaires{% endblock %}
|
||||||
{% block content-header-title %}Inventaires{% endblock %}
|
{% block header-title %}Inventaires{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
|
||||||
</div>
|
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<a href="{% url 'kfet.inventory.create' %}" class="btn btn-primary btn-lg">
|
<a href="{% url 'kfet.inventory.create' %}" class="btn btn-primary btn-lg">
|
||||||
Nouveau
|
Nouveau
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Liste des inventaires</h2>
|
<h2>Liste des inventaires</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-condensed">
|
<table class="table table-condensed">
|
||||||
<thead class="thead-default">
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>Date</td>
|
<td>Date</td>
|
||||||
|
@ -57,8 +52,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
|
@ -8,14 +8,12 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}Nouvel inventaire{% endblock %}
|
{% block title %}Nouvel inventaire{% endblock %}
|
||||||
{% block content-header-title %}Nouvel inventaire{% endblock %}
|
{% block header-title %}Création d'un inventaire{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-size %}col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 nopadding">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-center">
|
|
||||||
<form id='inventoryform' action="" method="post">
|
<form id='inventoryform' action="" method="post">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-condensed text-center">
|
<table class="table table-condensed text-center">
|
||||||
|
@ -87,10 +85,6 @@
|
||||||
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function init_total(type) {
|
function init_total(type) {
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Inventaire #{{ inventory.pk }}{% endblock %}
|
{% block title %}Inventaire #{{ inventory.pk }}{% endblock %}
|
||||||
{% block content-header-title %}Inventaire #{{ inventory.pk }}{% endblock %}
|
{% block header-title %}Inventaire #{{ inventory.pk }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line"><b>Date:</b> {{ inventory.at }}</div>
|
<div class="line"><b>Date:</b> {{ inventory.at }}</div>
|
||||||
<div class="line"><b>Par:</b> {{ inventory.by.trigramme }}</div>
|
<div class="line"><b>Par:</b> {{ inventory.by.trigramme }}</div>
|
||||||
|
@ -20,11 +17,11 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Détails</h2>
|
<h2>Détails</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -55,8 +52,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
{% block title %}K-Psul{% endblock %}
|
{% block title %}K-Psul{% endblock %}
|
||||||
|
|
||||||
{% block content-header %}{% endblock %}
|
{% block header %}{% endblock %}
|
||||||
|
|
||||||
{% block help %}
|
{% block help %}
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,19 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Commandes{% endblock %}
|
{% block title %}Commandes{% endblock %}
|
||||||
{% block content-header-title %}Commandes{% endblock %}
|
{% block header-title %}Commandes{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line line-big">{{ orders|length }}</div>
|
<div class="line line-big">{{ orders|length }}</div>
|
||||||
<div class="line line-bigsub">commande{{ orders|length|pluralize }}</div>
|
<div class="line line-bigsub">commande{{ orders|length|pluralize }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="buttons">
|
|
||||||
</div>
|
{% endblock %}
|
||||||
</div>
|
|
||||||
</div>
|
{% block main-content %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Fournisseurs</h2>
|
<h2>Fournisseurs</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -99,8 +94,5 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
{% block title %}Nouvelle commande{% endblock %}
|
{% block title %}Nouvelle commande{% endblock %}
|
||||||
{% block content-header-title %}Nouvelle commande {{ supplier.name }}{% endblock %}
|
{% block header-title %}Création d'une commande {{ supplier.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-size %}col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 nopadding">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-center">
|
|
||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -77,9 +75,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type='text/javascript'>
|
<script type='text/javascript'>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
|
|
@ -1,22 +1,26 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Commande #{{ order.pk }}{% endblock %}
|
{% block title %}Commande #{{ order.pk }}{% endblock %}
|
||||||
{% block content-header-title %}Commande #{{ order.pk }}{% endblock %}
|
{% block header-title %}Commande #{{ order.pk }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="content-left-top">
|
<div class="content-left-top">
|
||||||
<div class="line"><b>Créée le:</b> {{ order.at }}</div>
|
<div class="line"><b>Créée le:</b> {{ order.at }}</div>
|
||||||
<div class="line"><b>Fournisseur:</b> {{ order.supplier.name }}</div>
|
<div class="line"><b>Fournisseur:</b> {{ order.supplier.name }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="buttons">
|
||||||
|
{% if not order.inventory %}
|
||||||
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.order.to_inventory' order.pk %}">
|
||||||
|
Générer inventaire
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
{% endblock %}
|
||||||
{% include 'kfet/base_messages.html' %}
|
|
||||||
<div class="content-right">
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Détails</h2>
|
<h2>Détails</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -60,8 +64,5 @@
|
||||||
<textarea class="form-control" style="height:500px;">{{ mail }}</textarea>
|
<textarea class="form-control" style="height:500px;">{{ mail }}</textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
{% block title %}Nouvel inventaire{% endblock %}
|
{% block title %}Nouvel inventaire{% endblock %}
|
||||||
{% block content-header-title %}Création d'inventaire depuis une commande{% endblock %}
|
{% block header-title %}Création d'inventaire depuis la commande #{{ order.pk }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-size %}col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 nopadding">
|
|
||||||
{% include "kfet/base_messages.html" %}
|
|
||||||
<div class="content-center">
|
|
||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -52,8 +50,5 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
<input type="submit" value="Enregistrer" class="btn btn-primary btn-lg btn-block">
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,23 +1,20 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_2.html" %}
|
||||||
|
|
||||||
{% block title %}Paramètres{% endblock %}
|
{% block title %}Paramètres{% endblock %}
|
||||||
{% block content-header-title %}Paramètres{% endblock %}
|
{% block header-title %}Paramètres{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block fixed-content %}
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-4 col-md-3 col-content-left">
|
|
||||||
<div class="content-left">
|
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.settings.update' %}">
|
<a class="btn btn-primary btn-lg" href="{% url 'kfet.settings.update' %}">
|
||||||
Modifier
|
Modifier
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
{% endblock %}
|
||||||
<div class="col-sm-8 col-md-9 col-content-right">
|
|
||||||
{% include 'kfet/base_messages.html' %}
|
{% block main-content %}
|
||||||
<div class="content-right">
|
|
||||||
<div class="content-right-block">
|
<div class="content-right-block">
|
||||||
<h2>Valeurs</h2>
|
<h2>Valeurs</h2>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -32,15 +29,12 @@
|
||||||
{% for key, value in kfet_config.list %}
|
{% for key, value in kfet_config.list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ key }}</td>
|
<td>{{ key }}</td>
|
||||||
<td>{{ value }}</td>
|
<td>{{ value|default_if_none:"" }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block title %}Modification des paramètres{% endblock %}
|
{% block title %}Modification des paramètres{% endblock %}
|
||||||
{% block content-header-title %}Modification des paramètres{% endblock %}
|
{% block header-title %}Modification des paramètres{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include "kfet/base_form.html" with authz=perms.kfet.change_settings submit_text="Mettre à jour"%}
|
{% include "kfet/base_form.html" with authz=perms.kfet.change_settings submit_text="Mettre à jour"%}
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
|
|
||||||
{% block title %}Fournisseur - Modification{% endblock %}
|
{% block title %}{{ supplier.name }} - Édition{% endblock %}
|
||||||
{% block content-header-title %}Fournisseur - Modification{% endblock %}
|
{% block header-title %}Édition du fournisseur {{ supplier.name }}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-class %}content-form{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
{% include 'kfet/base_form.html' with authz=perms.kfet.change_supplier submit_text="Mettre à jour" %}
|
{% include 'kfet/base_form.html' with authz=perms.kfet.change_supplier submit_text="Mettre à jour" %}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'kfet/base.html' %}
|
{% extends "kfet/base_col_1.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
|
@ -7,13 +7,14 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}Nouveaux transferts{% endblock %}
|
{% block title %}Nouveaux transferts{% endblock %}
|
||||||
{% block content-header-title %}Nouveaux transferts{% endblock %}
|
{% block header-title %}Création de transferts{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block main-size %}col-sm-12{% endblock %}
|
||||||
|
|
||||||
|
{% block main-content %}
|
||||||
|
|
||||||
|
<form id="transfers_form" style="background-color: transparent;">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|
||||||
<form id="transfers_form">
|
|
||||||
<div class="transfer_general text-center">
|
<div class="transfer_general text-center">
|
||||||
<input type="text" name="comment" id="comment" placeholder="Commentaire"><!--
|
<input type="text" name="comment" id="comment" placeholder="Commentaire"><!--
|
||||||
--><button type="submit" id="submit" class="btn btn-primary btn-lg">Enregistrer</button>
|
--><button type="submit" id="submit" class="btn btn-primary btn-lg">Enregistrer</button>
|
||||||
|
|
|
@ -2062,6 +2062,7 @@ def order_to_inventory(request, pk):
|
||||||
|
|
||||||
return render(request, 'kfet/order_to_inventory.html', {
|
return render(request, 'kfet/order_to_inventory.html', {
|
||||||
'formset': formset,
|
'formset': formset,
|
||||||
|
'order': order,
|
||||||
})
|
})
|
||||||
|
|
||||||
class SupplierUpdate(SuccessMessageMixin, UpdateView):
|
class SupplierUpdate(SuccessMessageMixin, UpdateView):
|
||||||
|
|
Loading…
Reference in a new issue