resolved merge conflicts

2018-01-09 12:05:20 +05:30
parent d2d54826ab 471bc618b5
commit 892a7a6980
22 changed files with 359 additions and 99 deletions
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -18,7 +18,10 @@ class BuyingController(StockController):
 		if hasattr(self, "taxes"):
 			self.flags.print_taxes_with_zero_amount = cint(frappe.db.get_single_value("Print Settings",
 				 "print_taxes_with_zero_amount"))
+			self.flags.show_inclusive_tax_in_print = self.is_inclusive_tax()
+
 			self.print_templates = {
+				"total": "templates/print_formats/includes/total.html",
 				"taxes": "templates/print_formats/includes/taxes.html"
 			}