From a9df9604942ba07fc428fa3a5d8571d968550630 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Mon, 9 Jan 2012 16:55:30 +0530
Subject: [PATCH] On Print Hide, hide net_total, rounded_total_export and
 grand_total_export

---
 .../receivable_voucher/receivable_voucher.txt |  12 +-
 .../Discount_purchase_cycle.py                |   0
 erpnext/patches/before_jan_2012/__init__.py   |   0
 .../accounts_default_form.py                  |   0
 .../{ => before_jan_2012}/auto_indent.py      |   0
 .../{ => before_jan_2012}/c_form_patch.py     |   0
 .../delivery_billing_status_patch.py          |   0
 .../deploy_email_digest.py                    |   0
 .../edigest_enable_income_year_to_date.py     |   0
 .../employeewise_balance_leave_report.py      |   0
 .../erpnext_structure_cleanup.py              |   0
 .../{ => before_jan_2012}/index_patch.py      |   0
 .../install_print_formats.py                  |   0
 .../{ => before_jan_2012}/lcw_patch.py        |   0
 erpnext/patches/{ => before_jan_2012}/p1.py   |   0
 .../{ => before_jan_2012}/packing_slip.py     |   0
 .../{ => before_jan_2012}/price_list_patch.py |   0
 .../print_hide_price_list.py                  |   0
 .../profile_mark_not_in_create.py             |   0
 .../{ => before_jan_2012}/project_patch.py    |   0
 .../{ => before_jan_2012}/reload_address.py   |   0
 .../{ => before_jan_2012}/reload_bom.py       |   0
 .../{ => before_jan_2012}/reload_doclayer.py  |   0
 .../reload_email_digest.py                    |   0
 ...eload_employeewise_balance_leave_report.py |   0
 .../{ => before_jan_2012}/reload_flat_bom.py  |   0
 .../{ => before_jan_2012}/reload_gl_mapper.py |   0
 .../{ => before_jan_2012}/reload_lc_wizard.py |   0
 .../reload_print_format.py                    |   0
 .../reload_project_task.py                    |   0
 .../{ => before_jan_2012}/reload_reco.py      |   0
 .../{ => before_jan_2012}/reload_rv.py        |   0
 .../reload_support_ticket.py                  |   0
 .../remove_duplicate_table_mapper_detail.py   |   0
 .../remove_extra_button_from_email_digest.py  |   0
 .../remove_old_cp_email_settings.py           |   0
 .../remove_page_break_from_defaults.py        |   0
 .../remove_previous_field_property_setter.py  |   0
 .../repost_account_bal.py                     |   0
 .../{ => before_jan_2012}/repost_stock.py     |   0
 .../{ => before_jan_2012}/sal_man_patch.py    |   0
 .../task_email_notification.py                |   0
 .../{ => before_jan_2012}/update_0_idx.py     |   0
 .../update_gle_against_voucher_for_jv.py      |   0
 erpnext/patches/jan_mar_2012/__init__.py      |   0
 .../patches/jan_mar_2012/print_hide_totals.py |  20 ++++
 .../stable_branch_shift_09_01_12.py           |  38 +++++++
 erpnext/patches/patch_list.py                 |  10 ++
 .../selling/doctype/quotation/quotation.txt   |  12 +-
 .../doctype/sales_order/sales_order.txt       |  12 +-
 .../doctype/other_charges/other_charges.js    | 106 +++++++++++-------
 .../doctype/delivery_note/delivery_note.txt   |  12 +-
 index.html                                    |   2 +-
 versions-master.db                            | Bin 742400 -> 742400 bytes
 54 files changed, 161 insertions(+), 63 deletions(-)
 rename erpnext/patches/{ => before_jan_2012}/Discount_purchase_cycle.py (100%)
 mode change 100755 => 100644
 create mode 100644 erpnext/patches/before_jan_2012/__init__.py
 rename erpnext/patches/{ => before_jan_2012}/accounts_default_form.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/auto_indent.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/c_form_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/delivery_billing_status_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/deploy_email_digest.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/edigest_enable_income_year_to_date.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/employeewise_balance_leave_report.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/erpnext_structure_cleanup.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/index_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/install_print_formats.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/lcw_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/p1.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/packing_slip.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/price_list_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/print_hide_price_list.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/profile_mark_not_in_create.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/project_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_address.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_bom.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_doclayer.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_email_digest.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_employeewise_balance_leave_report.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_flat_bom.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_gl_mapper.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_lc_wizard.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_print_format.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_project_task.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_reco.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_rv.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/reload_support_ticket.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/remove_duplicate_table_mapper_detail.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/remove_extra_button_from_email_digest.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/remove_old_cp_email_settings.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/remove_page_break_from_defaults.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/remove_previous_field_property_setter.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/repost_account_bal.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/repost_stock.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/sal_man_patch.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/task_email_notification.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/update_0_idx.py (100%)
 rename erpnext/patches/{ => before_jan_2012}/update_gle_against_voucher_for_jv.py (100%)
 create mode 100644 erpnext/patches/jan_mar_2012/__init__.py
 create mode 100644 erpnext/patches/jan_mar_2012/print_hide_totals.py
 create mode 100644 erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py

diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
index c194e7cc0c..2d890387aa 100644
--- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
+++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:18',
 		'docstatus': 0,
-		'modified': '2011-12-22 19:04:07',
+		'modified': '2012-01-09 16:52:22',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -21,7 +21,7 @@
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1324367593',
+		'_last_update': '1326105583',
 		'change_log': '1. Change in pull_details method dt.-26-06-2009',
 		'colour': 'White:FFF',
 		'default_print_format': 'Standard',
@@ -34,7 +34,7 @@
 		'server_code_error': ' ',
 		'show_in_menu': 0,
 		'subject': 'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding',
-		'version': 392
+		'version': 394
 	},
 
 	# These values are common for all DocFormat
@@ -653,7 +653,7 @@
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 1
 	},
 
@@ -1218,7 +1218,7 @@
 		'oldfieldname': 'grand_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 1
 	},
 
@@ -1231,7 +1231,7 @@
 		'oldfieldname': 'rounded_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1
+		'print_hide': 0
 	},
 
 	# DocField
diff --git a/erpnext/patches/Discount_purchase_cycle.py b/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py
old mode 100755
new mode 100644
similarity index 100%
rename from erpnext/patches/Discount_purchase_cycle.py
rename to erpnext/patches/before_jan_2012/Discount_purchase_cycle.py
diff --git a/erpnext/patches/before_jan_2012/__init__.py b/erpnext/patches/before_jan_2012/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/patches/accounts_default_form.py b/erpnext/patches/before_jan_2012/accounts_default_form.py
similarity index 100%
rename from erpnext/patches/accounts_default_form.py
rename to erpnext/patches/before_jan_2012/accounts_default_form.py
diff --git a/erpnext/patches/auto_indent.py b/erpnext/patches/before_jan_2012/auto_indent.py
similarity index 100%
rename from erpnext/patches/auto_indent.py
rename to erpnext/patches/before_jan_2012/auto_indent.py
diff --git a/erpnext/patches/c_form_patch.py b/erpnext/patches/before_jan_2012/c_form_patch.py
similarity index 100%
rename from erpnext/patches/c_form_patch.py
rename to erpnext/patches/before_jan_2012/c_form_patch.py
diff --git a/erpnext/patches/delivery_billing_status_patch.py b/erpnext/patches/before_jan_2012/delivery_billing_status_patch.py
similarity index 100%
rename from erpnext/patches/delivery_billing_status_patch.py
rename to erpnext/patches/before_jan_2012/delivery_billing_status_patch.py
diff --git a/erpnext/patches/deploy_email_digest.py b/erpnext/patches/before_jan_2012/deploy_email_digest.py
similarity index 100%
rename from erpnext/patches/deploy_email_digest.py
rename to erpnext/patches/before_jan_2012/deploy_email_digest.py
diff --git a/erpnext/patches/edigest_enable_income_year_to_date.py b/erpnext/patches/before_jan_2012/edigest_enable_income_year_to_date.py
similarity index 100%
rename from erpnext/patches/edigest_enable_income_year_to_date.py
rename to erpnext/patches/before_jan_2012/edigest_enable_income_year_to_date.py
diff --git a/erpnext/patches/employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py
similarity index 100%
rename from erpnext/patches/employeewise_balance_leave_report.py
rename to erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py
diff --git a/erpnext/patches/erpnext_structure_cleanup.py b/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py
similarity index 100%
rename from erpnext/patches/erpnext_structure_cleanup.py
rename to erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py
diff --git a/erpnext/patches/index_patch.py b/erpnext/patches/before_jan_2012/index_patch.py
similarity index 100%
rename from erpnext/patches/index_patch.py
rename to erpnext/patches/before_jan_2012/index_patch.py
diff --git a/erpnext/patches/install_print_formats.py b/erpnext/patches/before_jan_2012/install_print_formats.py
similarity index 100%
rename from erpnext/patches/install_print_formats.py
rename to erpnext/patches/before_jan_2012/install_print_formats.py
diff --git a/erpnext/patches/lcw_patch.py b/erpnext/patches/before_jan_2012/lcw_patch.py
similarity index 100%
rename from erpnext/patches/lcw_patch.py
rename to erpnext/patches/before_jan_2012/lcw_patch.py
diff --git a/erpnext/patches/p1.py b/erpnext/patches/before_jan_2012/p1.py
similarity index 100%
rename from erpnext/patches/p1.py
rename to erpnext/patches/before_jan_2012/p1.py
diff --git a/erpnext/patches/packing_slip.py b/erpnext/patches/before_jan_2012/packing_slip.py
similarity index 100%
rename from erpnext/patches/packing_slip.py
rename to erpnext/patches/before_jan_2012/packing_slip.py
diff --git a/erpnext/patches/price_list_patch.py b/erpnext/patches/before_jan_2012/price_list_patch.py
similarity index 100%
rename from erpnext/patches/price_list_patch.py
rename to erpnext/patches/before_jan_2012/price_list_patch.py
diff --git a/erpnext/patches/print_hide_price_list.py b/erpnext/patches/before_jan_2012/print_hide_price_list.py
similarity index 100%
rename from erpnext/patches/print_hide_price_list.py
rename to erpnext/patches/before_jan_2012/print_hide_price_list.py
diff --git a/erpnext/patches/profile_mark_not_in_create.py b/erpnext/patches/before_jan_2012/profile_mark_not_in_create.py
similarity index 100%
rename from erpnext/patches/profile_mark_not_in_create.py
rename to erpnext/patches/before_jan_2012/profile_mark_not_in_create.py
diff --git a/erpnext/patches/project_patch.py b/erpnext/patches/before_jan_2012/project_patch.py
similarity index 100%
rename from erpnext/patches/project_patch.py
rename to erpnext/patches/before_jan_2012/project_patch.py
diff --git a/erpnext/patches/reload_address.py b/erpnext/patches/before_jan_2012/reload_address.py
similarity index 100%
rename from erpnext/patches/reload_address.py
rename to erpnext/patches/before_jan_2012/reload_address.py
diff --git a/erpnext/patches/reload_bom.py b/erpnext/patches/before_jan_2012/reload_bom.py
similarity index 100%
rename from erpnext/patches/reload_bom.py
rename to erpnext/patches/before_jan_2012/reload_bom.py
diff --git a/erpnext/patches/reload_doclayer.py b/erpnext/patches/before_jan_2012/reload_doclayer.py
similarity index 100%
rename from erpnext/patches/reload_doclayer.py
rename to erpnext/patches/before_jan_2012/reload_doclayer.py
diff --git a/erpnext/patches/reload_email_digest.py b/erpnext/patches/before_jan_2012/reload_email_digest.py
similarity index 100%
rename from erpnext/patches/reload_email_digest.py
rename to erpnext/patches/before_jan_2012/reload_email_digest.py
diff --git a/erpnext/patches/reload_employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py
similarity index 100%
rename from erpnext/patches/reload_employeewise_balance_leave_report.py
rename to erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py
diff --git a/erpnext/patches/reload_flat_bom.py b/erpnext/patches/before_jan_2012/reload_flat_bom.py
similarity index 100%
rename from erpnext/patches/reload_flat_bom.py
rename to erpnext/patches/before_jan_2012/reload_flat_bom.py
diff --git a/erpnext/patches/reload_gl_mapper.py b/erpnext/patches/before_jan_2012/reload_gl_mapper.py
similarity index 100%
rename from erpnext/patches/reload_gl_mapper.py
rename to erpnext/patches/before_jan_2012/reload_gl_mapper.py
diff --git a/erpnext/patches/reload_lc_wizard.py b/erpnext/patches/before_jan_2012/reload_lc_wizard.py
similarity index 100%
rename from erpnext/patches/reload_lc_wizard.py
rename to erpnext/patches/before_jan_2012/reload_lc_wizard.py
diff --git a/erpnext/patches/reload_print_format.py b/erpnext/patches/before_jan_2012/reload_print_format.py
similarity index 100%
rename from erpnext/patches/reload_print_format.py
rename to erpnext/patches/before_jan_2012/reload_print_format.py
diff --git a/erpnext/patches/reload_project_task.py b/erpnext/patches/before_jan_2012/reload_project_task.py
similarity index 100%
rename from erpnext/patches/reload_project_task.py
rename to erpnext/patches/before_jan_2012/reload_project_task.py
diff --git a/erpnext/patches/reload_reco.py b/erpnext/patches/before_jan_2012/reload_reco.py
similarity index 100%
rename from erpnext/patches/reload_reco.py
rename to erpnext/patches/before_jan_2012/reload_reco.py
diff --git a/erpnext/patches/reload_rv.py b/erpnext/patches/before_jan_2012/reload_rv.py
similarity index 100%
rename from erpnext/patches/reload_rv.py
rename to erpnext/patches/before_jan_2012/reload_rv.py
diff --git a/erpnext/patches/reload_support_ticket.py b/erpnext/patches/before_jan_2012/reload_support_ticket.py
similarity index 100%
rename from erpnext/patches/reload_support_ticket.py
rename to erpnext/patches/before_jan_2012/reload_support_ticket.py
diff --git a/erpnext/patches/remove_duplicate_table_mapper_detail.py b/erpnext/patches/before_jan_2012/remove_duplicate_table_mapper_detail.py
similarity index 100%
rename from erpnext/patches/remove_duplicate_table_mapper_detail.py
rename to erpnext/patches/before_jan_2012/remove_duplicate_table_mapper_detail.py
diff --git a/erpnext/patches/remove_extra_button_from_email_digest.py b/erpnext/patches/before_jan_2012/remove_extra_button_from_email_digest.py
similarity index 100%
rename from erpnext/patches/remove_extra_button_from_email_digest.py
rename to erpnext/patches/before_jan_2012/remove_extra_button_from_email_digest.py
diff --git a/erpnext/patches/remove_old_cp_email_settings.py b/erpnext/patches/before_jan_2012/remove_old_cp_email_settings.py
similarity index 100%
rename from erpnext/patches/remove_old_cp_email_settings.py
rename to erpnext/patches/before_jan_2012/remove_old_cp_email_settings.py
diff --git a/erpnext/patches/remove_page_break_from_defaults.py b/erpnext/patches/before_jan_2012/remove_page_break_from_defaults.py
similarity index 100%
rename from erpnext/patches/remove_page_break_from_defaults.py
rename to erpnext/patches/before_jan_2012/remove_page_break_from_defaults.py
diff --git a/erpnext/patches/remove_previous_field_property_setter.py b/erpnext/patches/before_jan_2012/remove_previous_field_property_setter.py
similarity index 100%
rename from erpnext/patches/remove_previous_field_property_setter.py
rename to erpnext/patches/before_jan_2012/remove_previous_field_property_setter.py
diff --git a/erpnext/patches/repost_account_bal.py b/erpnext/patches/before_jan_2012/repost_account_bal.py
similarity index 100%
rename from erpnext/patches/repost_account_bal.py
rename to erpnext/patches/before_jan_2012/repost_account_bal.py
diff --git a/erpnext/patches/repost_stock.py b/erpnext/patches/before_jan_2012/repost_stock.py
similarity index 100%
rename from erpnext/patches/repost_stock.py
rename to erpnext/patches/before_jan_2012/repost_stock.py
diff --git a/erpnext/patches/sal_man_patch.py b/erpnext/patches/before_jan_2012/sal_man_patch.py
similarity index 100%
rename from erpnext/patches/sal_man_patch.py
rename to erpnext/patches/before_jan_2012/sal_man_patch.py
diff --git a/erpnext/patches/task_email_notification.py b/erpnext/patches/before_jan_2012/task_email_notification.py
similarity index 100%
rename from erpnext/patches/task_email_notification.py
rename to erpnext/patches/before_jan_2012/task_email_notification.py
diff --git a/erpnext/patches/update_0_idx.py b/erpnext/patches/before_jan_2012/update_0_idx.py
similarity index 100%
rename from erpnext/patches/update_0_idx.py
rename to erpnext/patches/before_jan_2012/update_0_idx.py
diff --git a/erpnext/patches/update_gle_against_voucher_for_jv.py b/erpnext/patches/before_jan_2012/update_gle_against_voucher_for_jv.py
similarity index 100%
rename from erpnext/patches/update_gle_against_voucher_for_jv.py
rename to erpnext/patches/before_jan_2012/update_gle_against_voucher_for_jv.py
diff --git a/erpnext/patches/jan_mar_2012/__init__.py b/erpnext/patches/jan_mar_2012/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/patches/jan_mar_2012/print_hide_totals.py b/erpnext/patches/jan_mar_2012/print_hide_totals.py
new file mode 100644
index 0000000000..5d1854ddf0
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/print_hide_totals.py
@@ -0,0 +1,20 @@
+import webnotes
+
+def execute():
+	"""
+		To Hide Net Total, Grand Total Export and Rounded Total Export on checking print hide
+		
+		Uncheck print_hide for fields:
+			net_total, grand_total_export and rounded_total_export
+		For DocType(s):
+			* Receivable Voucher
+			* Sales Order
+			* Delivery Note
+			* Quotation
+	"""
+	webnotes.conn.sql("""\
+		UPDATE tabDocField
+		SET print_hide = 0
+		WHERE fieldname IN ('net_total', 'grand_total_export', 'rounded_total_export')
+		AND parent IN ('Receivable Voucher', 'Sales Order', 'Delivery Note', 'Quotation')
+	""")
diff --git a/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py
new file mode 100644
index 0000000000..bd8641172a
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py
@@ -0,0 +1,38 @@
+import webnotes
+from webnotes.modules.module_manager import reload_doc
+	
+def execute():
+	"""
+		* Reload RV Tax Detail
+		* Reload Support Ticket
+		* Run Install Print Format Patch
+		* Reload DocLayer
+	"""
+	reload_doc('accounts', 'doctype', 'rv_tax_detail')
+	reload_doc('support', 'doctype', 'support_ticket')
+	reload_print_formats()
+	reload_doc('core', 'doctype', 'doclayer')
+
+def reload_print_formats():
+	"""
+		Reloads the following print formats:
+		* Sales Invoice Classic/Modern/Spartan
+		* Sales Order Classic/Modern/Spartan
+		* Delivery Note Classic/Modern/Spartan
+		* Quotation Classic/Modern/Spartan
+	"""
+	reload_doc('accounts', 'Print Format', 'Sales Invoice Classic')
+	reload_doc('accounts', 'Print Format', 'Sales Invoice Modern')
+	reload_doc('accounts', 'Print Format', 'Sales Invoice Spartan')
+
+	reload_doc('selling', 'Print Format', 'Sales Order Classic')
+	reload_doc('selling', 'Print Format', 'Sales Order Modern')
+	reload_doc('selling', 'Print Format', 'Sales Order Spartan')
+
+	reload_doc('selling', 'Print Format', 'Quotation Classic')
+	reload_doc('selling', 'Print Format', 'Quotation Modern')
+	reload_doc('selling', 'Print Format', 'Quotation Spartan')
+
+	reload_doc('stock', 'Print Format', 'Delivery Note Classic')
+	reload_doc('stock', 'Print Format', 'Delivery Note Modern')
+	reload_doc('stock', 'Print Format', 'Delivery Note Spartan')
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 80f1cc1df0..78e0e9adfb 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -7,5 +7,15 @@ patch_list = [
 		'patch_module': 'patches',
 		'patch_file': 'reload_project_task',
 		'description': 'Reload doctype task of project module'
+	},
+	{
+		'patch_module': 'patches.jan_mar_2012',
+		'patch_file': 'stable_branch_shift_09_01_12',
+		'description': 'Various Reloads for shifting branch from master to stable'
+	},
+	{
+		'patch_module': 'patches.jan_mar_2012',
+		'patch_file': 'print_hide_totals',
+		'description': 'Uncheck print_hide for RV, SO, DN and Quotation'
 	}
 ]
diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt
index ac58dc4db9..d1054bfcc2 100644
--- a/erpnext/selling/doctype/quotation/quotation.txt
+++ b/erpnext/selling/doctype/quotation/quotation.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:17',
 		'docstatus': 0,
-		'modified': '2011-12-22 19:03:04',
+		'modified': '2012-01-09 16:52:51',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -21,7 +21,7 @@
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1322549700',
+		'_last_update': '1325570646',
 		'allow_attach': 1,
 		'allow_email': 0,
 		'allow_trash': 1,
@@ -41,7 +41,7 @@
 		'show_in_menu': 0,
 		'subject': 'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
 		'tag_fields': 'status',
-		'version': 598
+		'version': 599
 	},
 
 	# These values are common for all DocFormat
@@ -703,7 +703,7 @@
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '100px'
 	},
@@ -902,7 +902,7 @@
 		'oldfieldname': 'grand_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '200px'
 	},
@@ -917,7 +917,7 @@
 		'oldfieldname': 'rounded_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '200px'
 	},
diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt
index 2e6ea99966..0ff3ee049f 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.txt
+++ b/erpnext/selling/doctype/sales_order/sales_order.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:21',
 		'docstatus': 0,
-		'modified': '2011-12-22 19:03:25',
+		'modified': '2012-01-09 16:52:34',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -21,7 +21,7 @@
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1324295218',
+		'_last_update': '1325570646',
 		'allow_attach': 0,
 		'colour': 'White:FFF',
 		'default_print_format': 'Standard',
@@ -38,7 +38,7 @@
 		'show_in_menu': 0,
 		'subject': 'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
 		'tag_fields': 'delivery_status,billing_status',
-		'version': 609
+		'version': 610
 	},
 
 	# These values are common for all DocFormat
@@ -771,7 +771,7 @@
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '150px'
 	},
@@ -951,7 +951,7 @@
 		'oldfieldname': 'grand_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '150px'
 	},
@@ -965,7 +965,7 @@
 		'oldfieldname': 'rounded_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'width': '150px'
 	},
 
diff --git a/erpnext/setup/doctype/other_charges/other_charges.js b/erpnext/setup/doctype/other_charges/other_charges.js
index ddc9755254..9be3e2d577 100644
--- a/erpnext/setup/doctype/other_charges/other_charges.js
+++ b/erpnext/setup/doctype/other_charges/other_charges.js
@@ -8,50 +8,80 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
 }*/
 
 // For customizing print
+cur_frm.pformat.net_total = function(doc) {
+	return '';
+}
+
+cur_frm.pformat.grand_total_export = function(doc) {
+	return '';
+}
+
+cur_frm.pformat.round_total_export = function(doc) {
+	return '';
+}
 
 cur_frm.pformat.other_charges= function(doc){
   //function to make row of table
-  var make_row = function(title,val,bold){
-    var bstart = '<b>'; var bend = '</b>';
-    return '<tr><td style="width:50%;">'+(bold?bstart:'')+title+(bold?bend:'')+'</td>'
-     +'<td style="width:25%;text-align:right;">'+doc.currency+'</td>'
-     +'<td style="width:25%;text-align:right;">'+val+'</td>'
-     +'</tr>'
-  }
+	var make_row = function(title,val,bold){
+		var bstart = '<b>'; var bend = '</b>';
+		return '<tr><td style="width:50%;">'+(bold?bstart:'')+title+(bold?bend:'')+'</td>'
+		 +'<td style="width:25%;text-align:right;">'+doc.currency+'</td>'
+		 +'<td style="width:25%;text-align:right;">'+val+'</td>'
+		 +'</tr>'
+	}
 
-  function convert_rate(val){
-    var new_val = flt(val)/flt(doc.conversion_rate);
-    return new_val;
-  }
-  out ='';
-  if (!doc.print_without_amount) {
-    var cl = getchildren('RV Tax Detail',doc.name,'other_charges');
+	function convert_rate(val){
+		var new_val = flt(val)/flt(doc.conversion_rate);
+		return new_val;
+	}
+	out ='';
+	if (!doc.print_without_amount) {
+		print_hide_dict = {};
+		for(var i in locals['DocField']) {
+			var doc_field = locals['DocField'][i];
+			if(doc_field.fieldname) {
+				print_hide_dict[doc_field.fieldname] = doc_field.print_hide;
+			}
+		}
 
-    // outer table  
-    var out='<div><table class="noborder" style="width:100%"><tr><td style="width: 60%"></td><td>';
-    
-    // main table
-    out +='<table class="noborder" style="width:100%">'+make_row('Net Total',fmt_money(convert_rate(doc.net_total)),1);
+		var cl = getchildren('RV Tax Detail',doc.name,'other_charges');
 
-    // add rows
-    if(cl.length){
-      for(var i=0;i<cl.length;i++){
-        if(fmt_money(convert_rate(cl[i].tax_amount))!=0 && !cl[i].included_in_print_rate)
-          out += make_row(cl[i].description,fmt_money(convert_rate(cl[i].tax_amount)),0);
-      }
-    }
-  
-    // grand total
-    out +=make_row('Grand Total',fmt_money(doc.grand_total_export),1) +make_row('Rounded Total',fmt_money(doc.rounded_total_export),1)
-    if(doc.in_words_export){
-      out +='</table></td></tr>';
-      out += '<tr><td colspan = "2">';
-      out += '<table><tr><td style="width:25%;"><b>In Words</b></td>'
-      out+= '<td style="width:50%;">'+doc.in_words_export+'</td></tr>'
-    }
-    out +='</table></td></tr></table></div>';   
-  }
-  return out;
+		// outer table  
+		var out='<div><table class="noborder" style="width:100%"><tr><td style="width: 60%"></td><td>';
+
+		// main table
+
+		out +='<table class="noborder" style="width:100%">';
+		if(!print_hide_dict['net_total']) {
+			out +=make_row('Net Total',fmt_money(convert_rate(doc.net_total)),1);
+		}
+
+		// add rows
+		if(cl.length){
+			for(var i=0;i<cl.length;i++){
+				if(fmt_money(convert_rate(cl[i].tax_amount))!=0 && !cl[i].included_in_print_rate)
+				  out += make_row(cl[i].description,fmt_money(convert_rate(cl[i].tax_amount)),0);
+			}
+		}
+
+		// grand total
+		if(!print_hide_dict['grand_total_export']) {
+			out += make_row('Grand Total',fmt_money(doc.grand_total_export),1);
+		}
+		
+		if(!print_hide_dict['rounded_total_export']) {
+			out += make_row('Rounded Total',fmt_money(doc.rounded_total_export),1);
+		}
+
+		if(doc.in_words_export){
+			out +='</table></td></tr>';
+			out += '<tr><td colspan = "2">';
+			out += '<table><tr><td style="width:25%;"><b>In Words</b></td>'
+			out+= '<td style="width:50%;">'+doc.in_words_export+'</td></tr>'
+		}
+		out +='</table></td></tr></table></div>';   
+	}
+	return out;
 }
 
 cur_frm.cscript.charge_type = function(doc, cdt, cdn) {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt
index 5340955e67..3078bf6ff2 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.txt
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2011-04-18 15:58:20',
 		'docstatus': 0,
-		'modified': '2011-12-22 19:03:44',
+		'modified': '2012-01-09 16:52:43',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -21,7 +21,7 @@
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1324367019',
+		'_last_update': '1326105502',
 		'colour': 'White:FFF',
 		'default_print_format': 'Standard',
 		'doctype': 'DocType',
@@ -37,7 +37,7 @@
 		'show_in_menu': 0,
 		'subject': 'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed',
 		'tag_fields': 'billing_status',
-		'version': 460
+		'version': 463
 	},
 
 	# These values are common for all DocFormat
@@ -703,7 +703,7 @@
 		'oldfieldname': 'net_total',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '150px'
 	},
@@ -885,7 +885,7 @@
 		'oldfieldname': 'grand_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'reqd': 0,
 		'width': '150px'
 	},
@@ -900,7 +900,7 @@
 		'oldfieldname': 'rounded_total_export',
 		'oldfieldtype': 'Currency',
 		'permlevel': 1,
-		'print_hide': 1,
+		'print_hide': 0,
 		'width': '150px'
 	},
 
diff --git a/index.html b/index.html
index 8c95f87dec..1edfd89f20 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="368"
+	<script type="text/javascript">window._version_number="370"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
diff --git a/versions-master.db b/versions-master.db
index 56eff64907d1599ab799834dc9d9f02ed70becab..bdd3bc85f5ae5d128573e820460b57867b5ddf92 100644
GIT binary patch
delta 1096
zcmZXTT})GF7{}lDea`7=4?XmYwv3N{01B~Cpp9*DajQ((LKZ9%W41Y6ZA<Kid>jf}
z<_9fysad9hy%$GsOt@LdlAQ(4;sK3`O-wL)BNtwIG4Mw2#*HKz*mlquljFsky!k&*
ze$VrNpZCenx8>*CW@?2=gvb-^q!2=Z*_J4tT==HMeIP=Z3?;{NrzbPwcy?s?^zg*F
zGZ_(!i^l)JAqrYHVi1Cxa0gtFhffu|`8grAEG<}E+}#(+bh@3R{|Niu+@mJys|=aw
zD^2e*8j^I?QbTIVZn99`(8N!`FkwTCgRUoC(x{jBSM%jnP3PYhT7f0#f$Q*{Vz=%A
z+Up2oj?UU!SyK>_m>!DPIV!=Av%~4k55cp!b3-Hs6ZkF8gJH4ifP;xaL7;^|fO-Q?
z=q?<fh33Q1MJ{SuP}yq!3GfoV5IDlzJ_r|SKG1GHGm#xi2frO38Ai*CtxOBl<7vwM
z^`V0Eaop;d76G+&ghHuECKMU$%nYVGq9Mohn5Jejq5ZLRDj5q6rXtC%K}9}(jQqOB
zSPi6zK!G12O18)<DQc)u0=@EHspApU?3(w*^vDKz594>Xy>qwgP@nXX+(Z*6gARS=
zxZEg}Be>J9>nI{ONOMNqtk-*G|GQSKdfMVirphCrrwFFub8wM0@;hFFCHy^piJp=a
ziQy)S^UKg9S4uO9im;2n^_8BHkZsb4hp&4*X_q$X_pR{K!Zp5%ZpH<=X%XoB*Z>x!
z!oQki6<ytTU+9r7ven>sB1ZQ{NBQ!G9)4K17`~>5`l@MOtaj2@dQ|w2EWP)jUU?`+
zk2}c<;;<KCFV5jIsUjH|fZr6?g9V~}fAotq>fvi&+fcYiI~`z0?UdVYYHino4YKe3
zq3MgoWH0U9X}LVLU7Fg)>eM#5e2I120`P@2cOKlT=R7c9VyoKt1d4yMLOmQL(%)CP
z>eBrpquwvF=2NV@G7MR1eT}W7Yu#pb=NUWT!<JG%7}S2?6tgjhKigd+w`#U>A7hBi
zzEYo!(~eQ?vzeAB*?n4cf608sq?)hrTPrnJ5s!M1wsAS|k;mi)86$Cg0=rR<RF|k2
OWAF_6S)EN(jKKd@HAa{K

delta 765
zcmZXRT}YE*6vv<EIq%0dH&f^4ck`=U&1qxJR|Ct$guv9LBHD*ew`k$V+~x<Ex}`C@
zu+rz^CFr7{KvEa_2Cv;E2}%(JWzbdDO_y~g1-g1?L>Iw1aQOfJhr>B1G;a;fTkmG+
zf(Vf<CA$$q#j|Ds2bVh|e1;F~q{kHqb_{v^0dId_N8ey?m&cENE2>|h_vsWjVi1A}
zxDRiDLc5fr{Yq#!QBSg1`rv?(pX+wH-K8A;raStl7SuF1v4CX3KBf(E%*3&JzqYZQ
zldkFXv@>SNXwcBJ3fKG{^BA7NM_7PyDJAI;(3dHCD(LN)qq8YR`b5aX-afZyq~vO_
zw+9O09H!w5xh!)SoR~Ue`IucvJ)vicA*`cei-npj2B;2~&~Q-=Sjm{8l}I~9Hvuow
z>y|T2v=YW>$Wp598ua$KORfd_`_R%#F=K`-9Ho4-AmNY?OVO6|M4Y>&u}VpycQE&!
zlemj9eP#k4MsNe_z(}^q6TAwmq??rEpLkelYr}9dsu7oOYf|a=DjjXyQ`1KStynFF
zV~UjIH&)Yz3P-uiRaREv=<>K-6}BtpsEW%oAjbM{$@rqmjsCONM0xHKJzbwpL;iHb
z9kXD!*^ZY9E<uSdN14OE<fSh*bEH>(p~V21NQF%Zn{W`XkyPR#8_*;fH<t-CE(v1)
zK~1*kGimZ9{`KB5NJh<+-z}v1bw{8)YNED1^W?;CWMUV~6T4(`oHfc8XcHffLYjPV
z6qt6bk_)zA>M5(vfl4BNn&HzU>r;%pKE-M;v&IoSc*W1#Y&PAl*2;Td*rr^}N1VXP
zPT(c2DuC<b->;IjN&G1cKNg&k`ea^7m0X{!em=xn6q**%POD|@v}R``^8-piwFp)r
h2)X1fxkm;_6>i08XhzI#Oc-El7e_dGwlSd}eghDm<u3pL