[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnumed-bugs] <bug>: on billing - before printing invoice
From: |
Karsten Hilbert |
Subject: |
Re: [Gnumed-bugs] <bug>: on billing - before printing invoice |
Date: |
Tue, 12 Apr 2016 14:27:45 +0200 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Tue, Apr 12, 2016 at 02:13:58PM +0200, Karsten Hilbert wrote:
> > user comment : on billing - before printing invoice
> >
> > client version: 1.6.3
>
> ...
>
> > File "C:\Python27\lib\site-packages\Gnumed\wxpython\gmBillingWidgets.py",
> > line 627, in create_invoice_from_bill
> > bill['pk_org_unit'] = gmPraxis.gmCurrentPraxisBranch()['pk_org_unit']
>
> That is rather strange because that has been fixed in 1.6.3
> and the downloadable 1.6.3 tarball does, indeed, not contain
> that line anymore.
This is the relevant commit:
commit e2f19a9ba6b416895cb010ab9622718789de1064
Author: Karsten Hilbert <address@hidden>
Date: Wed Mar 30 11:47:09 2016 +0200
Fix invoice creation
Set the source org on the invoice doc rather than on the
bill instance. That was a thinko when adding source org
support to documents. Reported by Marc.
which contains:
diff --git a/gnumed/gnumed/client/wxpython/gmBillingWidgets.py
b/gnumed/gnumed/client/wxpython/gmBillingWidgets.py
index 473b7a2..7a9b380 100644
--- a/gnumed/gnumed/client/wxpython/gmBillingWidgets.py
+++ b/gnumed/gnumed/client/wxpython/gmBillingWidgets.py
@@ -621,10 +621,10 @@ def create_invoice_from_bill(parent = None,
bill=None, print_it=False, keep_a_co
filenames = files2import,
document_type = template['instance_type'],
review_as_normal = True,
- reference = bill['invoice_id']
+ reference = bill['invoice_id'],
+ pk_org_unit =
gmPraxis.gmCurrentPraxisBranch()['pk_org_unit']
)
bill['pk_doc'] = doc['pk_doc']
- bill['pk_org_unit'] =
gmPraxis.gmCurrentPraxisBranch()['pk_org_unit']
bill.save()
if not print_it:
Karsten
--
GPG key ID E4071346 @ eu.pool.sks-keyservers.net
E167 67FD A291 2BEA 73BD 4537 78B9 A9F9 E407 1346