diff --git a/project/customer/views/docs.py b/project/customer/views/docs.py index e519e2c..152c08c 100644 --- a/project/customer/views/docs.py +++ b/project/customer/views/docs.py @@ -60,7 +60,7 @@ def get_doc(request, order_num=None): ws.write(11, 0, u"СЧЕТ № %s от %s" % (order_num, license.order_date.strftime('%d.%m.%Y')), style0_center) ws.write(13, 0, u"Покупатель: %s" % data.name, style1) - ws.write(16, 2, u"Использование сервиса Dokumentor сроком %s" % (license.get_term()), style3) + ws.write(16, 2, u"Лицензия Dokumentor.ru на %s" % (license.get_term()), style3) style3.num_format_str = "#,##0.00" @@ -71,7 +71,7 @@ def get_doc(request, order_num=None): ws.write(21, 0, u"Всего наименование 1, на сумму %s,00 руб." % license.pay_sum, style1) ws.write(23, 0, u"%s." % rubles(license.pay_sum).capitalize(), style2) - ws.insert_bitmap(os.path.join(XLS_ROOT, 'stamp.bmp'), 25, 12, y=3, scale_x=1, scale_y=1.1) + ws.insert_bitmap(os.path.join(XLS_ROOT, 'stamp.bmp'), 26, 12, y=3, scale_y=1.1) elif pm == 2: # заполняем квитанцию style0 = easyxf('font: name Times New Roman, height 160, bold True;' @@ -83,13 +83,13 @@ def get_doc(request, order_num=None): ) # заполняем оригинал - ws.write(11, 4, u"Использование сервиса Dokumentor сроком %s" % (license.get_term()), style1) + ws.write(11, 4, u"Лицензия Dokumentor.ru на %s" % (license.get_term()), style1) ws.write(13, 13, data.get_boss_fio(), style0) ws.write(14, 13, re.sub("^\s+|\n|\r|\s+$", ' ', data.address), style0) ws.write(15, 11, license.pay_sum, style1) # заполняем копию - ws.write(31, 4, u"Использование сервиса Dokumentor сроком %s" % (license.get_term()), style1) + ws.write(31, 4, u"Лицензия Dokumentor.ru на %s" % (license.get_term()), style1) ws.write(33, 13, data.get_boss_fio(), style0) ws.write(34, 13, re.sub("^\s+|\n|\r|\s+$", ' ', data.address), style0) ws.write(35, 11, license.pay_sum, style1) diff --git a/project/templates/xls/4pd.xls b/project/templates/xls/4pd.xls index 63f4d76..38cd287 100755 Binary files a/project/templates/xls/4pd.xls and b/project/templates/xls/4pd.xls differ diff --git a/project/templates/xls/act.xls b/project/templates/xls/act.xls index 9ac610f..2bf0d97 100755 Binary files a/project/templates/xls/act.xls and b/project/templates/xls/act.xls differ diff --git a/project/templates/xls/bill.xls b/project/templates/xls/bill.xls index 315dd7d..43458d5 100755 Binary files a/project/templates/xls/bill.xls and b/project/templates/xls/bill.xls differ diff --git a/project/templates/xls/stamp.bmp b/project/templates/xls/stamp.bmp index 096feb7..28d9b39 100755 Binary files a/project/templates/xls/stamp.bmp and b/project/templates/xls/stamp.bmp differ