Commit 72dcf90a authored by chris's avatar chris

openpyxl: use recent version (untested!)

parent 19c18faa
......@@ -4,12 +4,12 @@ from __future__ import unicode_literals
from django.contrib.sites.models import Site
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
from openpyxl.cell import get_column_letter
from openpyxl.style import NumberFormat
from openpyxl.utils import get_column_letter
from openpyxl.styles.numbers import NumberFormat
from openpyxl.styles import Border
from openpyxl.workbook import Workbook
from const import *
from .const import *
from repanier.const import EMPTY_STRING
from repanier.models import Staff
from repanier.tools import cap
......
......@@ -5,11 +5,11 @@ from django.db import transaction
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from openpyxl import load_workbook
from openpyxl.style import Border
from openpyxl.style import NumberFormat
from openpyxl.styles import Border
from openpyxl.styles.numbers import NumberFormat
import repanier.apps
from export_tools import *
from repanier.xlsx.export_tools import *
from repanier.models import Configuration
from repanier.const import *
from repanier.models import BankAccount, Permanence, Product, Purchase
......
......@@ -5,7 +5,7 @@ from django.http import HttpResponse
from django.utils.translation import ugettext_lazy as _
import repanier.apps
from export_tools import *
from .export_tools import *
from repanier.models import Producer, OfferItem
from repanier.models import Product
from repanier.tools import *
......
......@@ -3,11 +3,11 @@ from __future__ import unicode_literals
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from openpyxl.style import Fill
from openpyxl.styles import Fill
from openpyxl.styles import Color
import repanier.apps
from export_tools import *
from .export_tools import *
from repanier.const import *
from repanier.models import Customer, OfferItem, CustomerInvoice, ProducerInvoice, \
DeliveryBoard, Purchase, Configuration
......@@ -16,7 +16,7 @@ from repanier.models import PermanenceBoard
from repanier.models import Producer
from repanier.models import Staff
from repanier.tools import get_base_unit, next_row
from xlsx_stock import export_permanence_stock
from .xlsx_stock import export_permanence_stock
def next_purchase(purchases):
......
......@@ -8,7 +8,7 @@ from django.utils import translation
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
from export_tools import *
from .export_tools import *
from repanier.const import *
from repanier.models import Product
from repanier.tools import next_row
......
......@@ -5,11 +5,11 @@ from django.db import transaction
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from openpyxl import load_workbook
from openpyxl.style import Fill
from openpyxl.styles import Fill
from openpyxl.styles import Color
from export_tools import *
from import_tools import *
from .export_tools import *
from .import_tools import *
from repanier.apps import REPANIER_SETTINGS_CURRENCY_XLSX
from repanier.const import *
from repanier.models import OfferItem
......
......@@ -6,11 +6,11 @@ from django.db.models import Q
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from openpyxl import load_workbook
from openpyxl.style import Fill
from openpyxl.styles import Fill
from openpyxl.styles import Color
import repanier.apps
from export_tools import *
from .export_tools import *
from repanier.const import *
from repanier.models import OfferItem, Product
from repanier.tools import update_offer_item, next_row
......
......@@ -29,6 +29,6 @@ djangocms-cascade==0.12.5
djangocms-text-ckeditor==3.5.0
djangorestframework==3.6.3
easy-thumbnails==2.4.1
openpyxl==1.8.6
openpyxl
psycopg2==2.7.1
uwsgi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment