diff --git a/src/docs/models/invoice.py b/src/docs/models/invoice.py index fb33099..fd8436a 100644 --- a/src/docs/models/invoice.py +++ b/src/docs/models/invoice.py @@ -44,6 +44,9 @@ class Invoice(BaseInvoiceModel, LinkedDocsMixin): sum=self.invoice_items.aggregate(Sum('total_price'))['total_price__sum'] ) + def __str__(self): + return self.to_string_for_json() + class InvoiceItem(BaseItemInvoiceModel): """Табличная часть счета.""" diff --git a/src/dokumentor/static/css/style.css b/src/dokumentor/static/css/style.css index c9ef7f5..d678127 100644 --- a/src/dokumentor/static/css/style.css +++ b/src/dokumentor/static/css/style.css @@ -445,6 +445,7 @@ a.delete { vertical-align: top; } { margin-left: 10px; } .doc-form #client .hilight {font-size:25px;} +.doc-form #client .deck {font-size:25px;} .doc-form #saldo_debit input { margin-left: 12px; } .doc-form #saldo_credit input { margin-left: 5px; } .doc-form #saldo_debit .errorlist, .doc-form #saldo_credit .errorlist { margin-left: 83px; } @@ -814,3 +815,12 @@ input[type=number] { text-transform: uppercase; } /* */ + +/* select */ + +#doc-form #id_invoice, +#id_platej_type, +#id_payment_type { + font-size: 25px; + height: 40px; +} diff --git a/src/dokumentor/static/js/client.commons.js b/src/dokumentor/static/js/client.commons.js index fd6c975..1705981 100644 --- a/src/dokumentor/static/js/client.commons.js +++ b/src/dokumentor/static/js/client.commons.js @@ -2,6 +2,7 @@ function setup_client_edit_form(form) { var btn1_caption = form.data('dialog-btn-caption') || "Сохранить"; var form_id = form.attr('id'); var dlg_id = form_id + '_dlg'; + form.dialog({ modal: true, autoOpen: false, diff --git a/src/dokumentor/templates/docs/_base/base_edit.html b/src/dokumentor/templates/docs/_base/base_edit.html index ec7bff5..166a194 100644 --- a/src/dokumentor/templates/docs/_base/base_edit.html +++ b/src/dokumentor/templates/docs/_base/base_edit.html @@ -14,7 +14,6 @@