@@ -162,16 +162,23 @@ def test_make_sales_invoice(self):
162
162
si1 = make_sales_invoice (so .name )
163
163
self .assertEqual (len (si1 .get ("items" )), 0 )
164
164
165
- def test_overall_discount_calculatin (self ):
165
+ def test_overall_discount_calculation (self ):
166
166
so = make_sales_order (do_not_submit = True )
167
167
168
168
discount_percent = 5
169
169
grand_total = so .grand_total
170
- additional_discount_account = create_account (
171
- account_name = "Discount Account" ,
172
- parent_account = "Indirect Expenses - _TC" ,
173
- company = "_Test Company" ,
170
+ net_total = so .net_total
171
+ additional_discount_account = frappe .db .get_value (
172
+ "Account" , {"account_name" : "Test Discount Account" , "company" : "_Test Company" }, "name"
174
173
)
174
+
175
+ if not additional_discount_account :
176
+ additional_discount_account = create_account (
177
+ account_name = "Test Discount Account" ,
178
+ parent_account = "Indirect Expenses - _TC" ,
179
+ company = "_Test Company" ,
180
+ )
181
+
175
182
discount_amount = grand_total * (discount_percent / 100 )
176
183
177
184
so .apply_discount_on = "Grand Total"
@@ -182,15 +189,23 @@ def test_overall_discount_calculatin(self):
182
189
so .save ()
183
190
184
191
self .assertEqual (so .grand_total , (grand_total - discount_amount ))
192
+ self .assertEqual (so .net_total , net_total )
193
+
194
+ so .submit ()
185
195
186
196
def test_sales_invoice_creation_from_sales_order_with_cash_discount_fields (self ):
187
197
so = make_sales_order (do_not_submit = True )
188
198
189
- additional_discount_account = create_account (
190
- account_name = "Discount Account" ,
191
- parent_account = "Indirect Expenses - _TC" ,
192
- company = "_Test Company" ,
199
+ additional_discount_account = frappe .db .get_value (
200
+ "Account" , {"account_name" : "Test Discount Account" , "company" : "_Test Company" }, "name"
193
201
)
202
+
203
+ if not additional_discount_account :
204
+ additional_discount_account = create_account (
205
+ account_name = "Test Discount Account" ,
206
+ parent_account = "Indirect Expenses - _TC" ,
207
+ company = "_Test Company" ,
208
+ )
194
209
discount_percent = 5
195
210
196
211
so .apply_discount_on = "Grand Total"
@@ -207,6 +222,10 @@ def test_sales_invoice_creation_from_sales_order_with_cash_discount_fields(self)
207
222
self .assertEqual (so .apply_discount_on , si .apply_discount_on )
208
223
self .assertEqual (so .additional_discount_percentage , si .additional_discount_percentage )
209
224
self .assertEqual (so .grand_total , si .grand_total )
225
+ self .assertEqual (so .net_total , si .net_total )
226
+
227
+ si .save ()
228
+ si .submit ()
210
229
211
230
def test_so_billed_amount_against_return_entry (self ):
212
231
from erpnext .accounts .doctype .sales_invoice .sales_invoice import make_sales_return
0 commit comments