Merge branch 'master' into edge

This commit is contained in:
Rushabh Mehta
2013-04-03 10:42:12 +05:30
13 changed files with 267 additions and 102 deletions

View File

@@ -0,0 +1,20 @@
import webnotes
def execute():
if not webnotes.conn.exists("Country", "Aruba"):
webnotes.bean({
"doctype": "Country",
"country_name": "Aruba",
"time_zones": "America/Aruba",
"date_format": "mm-dd-yyyy"
}).insert()
if not webnotes.conn.exists("Currency", "AWG"):
webnotes.bean({
"doctype": "Currency",
"currency_name": "AWG",
"fraction": "Cent",
"fraction_units": 100,
"symbol": "Afl",
"number_format": "#,###.##"
}).insert()

View File

@@ -0,0 +1,18 @@
import webnotes
def execute():
webnotes.conn.sql("""update `tabQuotation` set customer_name = organization
where quotation_to = 'Lead' and ifnull(lead, '') != ''
and ifnull(organization, '') != ''""")
webnotes.conn.sql("""update `tabQuotation` set customer_name = lead_name
where quotation_to = 'Lead' and ifnull(lead, '') != ''
and ifnull(organization, '') = '' and ifnull(lead_name, '') != ''""")
webnotes.conn.sql("""update `tabQuotation` set contact_display = lead_name
where quotation_to = 'Lead' and ifnull(lead, '') != '' and ifnull(lead_name, '') != ''""")
webnotes.conn.sql("""update `tabOpportunity` set contact_display = lead_name
where enquiry_from = 'Lead' and ifnull(lead, '') != '' and ifnull(lead_name, '') != ''""")
webnotes.conn.sql("""update `tabOpportunity` opp, `tabLead` lead
set opp.customer_name = lead.company_name where opp.lead = lead.name""")

View File

@@ -158,6 +158,7 @@ patch_list = [
"patches.january_2013.enable_currencies",
"patches.january_2013.remove_unwanted_permission",
"patches.january_2013.remove_landed_cost_master",
"execute:webnotes.reload_doc('core', 'doctype', 'print_format')",
"patches.january_2013.reload_print_format",
"patches.january_2013.rebuild_tree",
"execute:webnotes.reload_doc('core','doctype','docfield') #2013-01-28",
@@ -231,4 +232,10 @@ patch_list = [
"patches.march_2013.p08_create_aii_accounts",
"patches.march_2013.p03_update_buying_amount",
"patches.april_2013.p01_update_serial_no_valuation_rate",
"patches.april_2013.p02_add_country_and_currency",
"patches.april_2013.p03_fixes_for_lead_in_quotation",
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Classic") # 2013-04-02',
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-04-02',
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02',
]