Merge branch 'develop'

bumped to version 6.24.2
[fix] recurring
2016-03-03 13:02:23 +05:30 · 2016-03-03 13:32:23 +06:00 · 2016-03-03 13:00:30 +05:30 · 2016-03-03 11:30:01 +05:30 · 2016-03-03 11:29:54 +05:30 · 2016-03-03 11:27:42 +05:30
200 changed files with 20978 additions and 18752 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.23.3'
+__version__ = '6.24.2'
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
@@ -0,0 +1,414 @@
+{
+    "country_code": "at",
+    "name": "Austria - Chart of Accounts - Einheitskontenrahmen provided by fairkom.eu",
+    "tree": {
+        "Klasse 0 Aktiva: Anlageverm\u00f6gen": {
+				"0100 Konzessionen ": {"account_type": "Fixed Asset"},
+				"0110 Patentrechte und Lizenzen ": {"account_type": "Fixed Asset"},
+				"0120 Datenverarbeitungsprogramme ": {"account_type": "Fixed Asset"},
+				"0130 Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte ": {"account_type": "Fixed Asset"},
+				"0140 Pacht- und Mietrechte ": {"account_type": "Fixed Asset"},
+				"0150 Bezugs- und ähnliche Rechte ": {"account_type": "Fixed Asset"},
+				"0160 Geschäfts-/Firmenwert ": {"account_type": "Fixed Asset"},
+				"0170 Umgründungsmehrwert ": {"account_type": "Fixed Asset"},
+				"0180 Geleistete Anzahlungen auf immaterielle Vermögensgegenstände": {"account_type": "Fixed Asset"},
+				"0190 Kumulierte Abschreibungen zu immateriellen Vermögensgegenständen ": {"account_type": "Fixed Asset"},
+				"0200 Unbebaute Grundstücke, soweit nicht landwirtschaftlich genutzt ": {"account_type": "Fixed Asset"},
+				"0210 Bebaute Grundstücke (Grundwert) ": {"account_type": "Fixed Asset"},
+				"0220 Landwirtschaftlich genutzte Grundstücke ": {"account_type": "Fixed Asset"},
+				"0230 Grundstücksgleiche Rechte ": {"account_type": "Fixed Asset"},
+				"0300 Betriebs- und Geschäftsgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
+				"0310 Wohn- und Sozialgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
+				"0320 Betriebs- und Geschäftsgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
+				"0330 Wohn- und Sozialgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
+				"0340 Grundstückseinrichtungen auf eigenem Grund ": {"account_type": "Fixed Asset"},
+				"0350 Grundstückseinrichtungen auf fremdem Grund ": {"account_type": "Fixed Asset"},
+				"0360 Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden": {"account_type": "Fixed Asset"},
+				"0370 Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden": {"account_type": "Fixed Asset"},
+				"0390 Kumulierte Abschreibungen zu Grundstücken ": {"account_type": "Fixed Asset"},
+				"0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},				
+				"0500 Maschinenwerkzeuge ": {"account_type": "Fixed Asset"},
+				"0510 Allgemeine Werkzeuge und Handwerkzeuge ": {"account_type": "Fixed Asset"},
+				"0520 Prototypen, Formen, Modelle ": {"account_type": "Fixed Asset"},
+				"0530 Andere Erzeugungshilfsmittel (auch Softwarewerkzeuge)": {"account_type": "Fixed Asset"},
+				"0540 Hebezeuge und Montageanlagen ": {"account_type": "Fixed Asset"},
+				"0550 Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozess ": {"account_type": "Fixed Asset"},
+				"0560 Festwerte technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
+				"0590 Kumulierte Abschreibungen zu technischen Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
+				"0600 Betriebs- und Geschäftsausstattung, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
+				"0610 Andere Anlagen, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
+				"0620 Büromaschinen, EDV-Anlagen ": {"account_type": "Fixed Asset"},
+				"0630 PKW und Kombis ": {"account_type": "Fixed Asset"},
+				"0640 LKW ": {"account_type": "Fixed Asset"},
+				"0650 Andere Beförderungsmittel ": {"account_type": "Fixed Asset"},
+				"0660 Gebinde ": {"account_type": "Fixed Asset"},
+				"0670 Geringwertige Vermögensgegenstände, soweit nicht im Erzeugungssprozess verwendet": {"account_type": "Fixed Asset"},
+				"0680 Festwerte außer technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
+				"0690 Kumulierte Abschreibungen zu anderen Anlagen, Betriebs- und Geschäftsausstattung": {"account_type": "Fixed Asset"},
+				"0700 Geleistete Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
+				"0710 Anlagen in Bau ": {"account_type": "Fixed Asset"},
+				"0790 Kumulierte Abschreibungen zu geleisteten Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
+				"0800 Anteile an verbundenen Unternehmen ": {"account_type": "Fixed Asset"},
+				"0810 Beteiligungen an Gemeinschaftsunternehmen ": {"account_type": "Fixed Asset"},
+				"0820 Beteiligungen an angeschlossenen (assoziierten) Unternehmen ": {"account_type": "Fixed Asset"},
+				"0830 Eigene Anteile, Anteile an herrschenden oder mit Mehrheit beteiligten ": {"account_type": "Fixed Asset"},
+				"0840 Sonstige Beteiligungen ": {"account_type": "Fixed Asset"},
+				"0850 Ausleihungen an verbundene Unternehmen ": {"account_type": "Fixed Asset"},
+				"0860 Ausleihungen an Unternehmen mit Beteiligungsverhältnis": {"account_type": "Fixed Asset"},
+				"0870 Ausleihungen an Gesellschafter ": {"account_type": "Fixed Asset"},
+				"0880 Sonstige Ausleihungen ": {"account_type": "Fixed Asset"},
+				"0890 Anteile an Kapitalgesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
+				"0900 Anteile an Personengesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
+				"0910 Genossenschaftsanteile ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
+				"0920 Anteile an Investmentfonds ": {"account_type": "Fixed Asset"},
+				"0930 Festverzinsliche Wertpapiere des Anlagevermögens ": {"account_type": "Fixed Asset"},
+				"0980 Geleistete Anzahlungen auf Finanzanlagen ": {"account_type": "Fixed Asset"},
+				"0990 Kumulierte Abschreibungen zu Finanzanlagen ": {"account_type": "Fixed Asset"},
+            "root_type": "Asset"
+        },    
+        "Klasse 1 Aktiva: Vorr\u00e4te": {
+            "1000 Bezugsverrechnung": {"account_type": "Stock"},
+            "1100 Rohstoffe": {"account_type": "Stock"},
+            "1200 Bezogene Teile": {"account_type": "Stock"},
+            "1300 Hilfsstoffe": {"account_type": "Stock"},
+            "1350 Betriebsstoffe": {"account_type": "Stock"},
+            "1360 Vorrat Energietraeger": {"account_type": "Stock"},            
+            "1400 Unfertige Erzeugnisse": {"account_type": "Stock"},
+            "1500 Fertige Erzeugnisse": {"account_type": "Stock"},
+            "1600 Handelswarenvorrat": {"account_type": "Stock Received But Not Billed"},
+            "1700 Noch nicht abrechenbare Leistungen": {"account_type": "Stock"},
+            "1900 Wertberichtigungen": {"account_type": "Stock"},
+            "1800 Geleistete Anzahlungen": {"account_type": "Stock"},
+            "root_type": "Asset"
+        },    
+        "Klasse 3 Passiva: Verbindlichkeiten": {
+            "3020 Steuerr\u00fcckstellungen": {"account_type": "Tax"},
+            "3040 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},
+            "3110 Verbindlichkeiten gegen\u00fcber Bank": {"account_type": "Payable"},
+            "3150 Verbindlichkeiten Darlehen": {"account_type": "Payable"},
+            "3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},            
+            "3380 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
+                "account_type": "Payable"
+            },
+            "3400 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
+            "3460 Verbindlichkeiten gegenueber Gesellschaftern": {"account_type": "Payable"},
+            "3470 Einlagen stiller Gesellschafter": {"account_type": "Payable"},
+            "3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},                        
+            "3600 Verbindlichkeiten Sozialversicherung": {"account_type": "Payable"},
+            "3000 Allgemeine Verbindlichkeiten (Schuld)": {"account_type": "Payable"},
+            "3700 Sonstige Verbindlichkeiten": {"account_type": "Payable"},
+            "3900 Passive Rechnungsabgrenzungsposten": {"account_type": "Payable"},
+            "3100 Anleihen (einschlie\u00dflich konvertibler)": {"account_type": "Payable"},
+            "3200 Erhaltene Anzahlungen auf Bestellungen": {"account_type": "Payable"},
+            "3040 R\u00fcckstellungen f\u00fcr Abfertigung": {"account_type": "Payable"},
+            "3010 R\u00fcckstellungen f\u00fcr Pensionen": {"account_type": "Payable"},
+            "3530 USt. \u00a719 (reverse charge)": {
+                "account_type": "Tax"
+            },
+            "3500 Verbindlichkeiten aus Umsatzsteuer": {"account_type": "Tax"},
+            "3580 Umsatzsteuer Zahllast": {
+                "account_type": "Tax"
+            },
+            "3510 Umsatzsteuer aus i.g. Erwerb 10%": {
+                "account_type": "Tax"
+            },
+            "3520 Umsatzsteuer aus i.g. Erwerb 20%": {
+                "account_type": "Tax"
+            },
+            "3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
+            "3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
+                "account_type": "Payable"
+            },
+            "3000 Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
+                "account_type": "Payable"
+            },
+            "3370 Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
+                "account_type": "Payable"
+            },
+            "3400 Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
+            "3570 Verrechnung Finanzamt": {
+                "account_type": "Tax"
+            },
+            "root_type": "Liability"
+        },      
+        "Klasse 2 Aktiva: Umlaufverm\u00f6gen, Rechnungsabgrenzungen": {
+            "2030 Forderungen aus Lieferungen und Leistungen Inland (0% USt, umsatzsteuerfrei)": {
+                "account_type": "Receivable"
+            },
+            "2010 Forderungen aus Lieferungen und Leistungen Inland (10% USt, umsatzsteuerfrei)": {
+                "account_type": "Receivable"
+            },
+            "2000 Forderungen aus Lieferungen und Leistungen Inland (20% USt, umsatzsteuerfrei)": {
+                "account_type": "Receivable"
+            },
+            "2040 Forderungen aus Lieferungen und Leistungen Inland (sonstiger USt-Satz)": {
+                "account_type": "Receivable"
+            },                                    
+            "2100 Forderungen aus Lieferungen und Leistungen EU": {
+                "account_type": "Receivable"
+            },
+            "2150 Forderungen aus Lieferungen und Leistungen Ausland (Nicht-EU)": {
+                "account_type": "Receivable"
+            },
+            "2200 Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "2250 Forderungen gegen\u00fcber Unternehmen, mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "2300 Sonstige Forderungen und Verm\u00f6gensgegenst\u00e4nde": {
+                "account_type": "Receivable"
+            },
+            "2630 Sonstige Wertpapiere": {
+                "account_type": "Stock"
+            },
+            "2750 Kassenbest\u00e4nde in Fremdw\u00e4hrung": {
+                "account_type": "Cash"
+            },
+            "2900 Aktive Rechnungsabrenzungsposten": {
+                "account_type": "Receivable"
+            },
+            "2600 Anteile an verbundenen Unternehmen": {
+                "account_type": "Equity"
+            },
+            "2680 Besitzwechsel ohne Forderungen": {
+                "account_type": "Receivable"
+            },
+            "2950 Aktiviertes Disagio": {
+                "account_type": "Receivable"
+            },
+            "2610 Eigene Anteile und Wertpapiere an mit Mehrheit beteiligten Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "2570 Einfuhrumsatzsteuer (bezahlt)": {"account_type": "Tax"},
+            
+            "2460 Eingeforderte aber noch nicht eingezahlte Einlagen": {
+                "account_type": "Receivable"
+            },
+            "2180 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
+                "account_type": "Receivable"
+            },
+            "2130 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
+                "account_type": "Receivable"
+            },
+            "2080 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
+                "account_type": "Receivable"
+            },
+            "2270 Einzelwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "2230 Einzelwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "2470 Einzelwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
+                "account_type": "Receivable"
+            },
+            "2700 Kassenbestand": {
+                "account_type": "Cash"
+            },
+            "2190 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. sonstiges Ausland": {
+                "account_type": "Receivable"
+            },
+            "2130 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
+                "account_type": "Receivable"
+            },
+            "2100 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
+                "account_type": "Receivable"
+            },
+            "2280 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "2240 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "2480 Pauschalwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
+                "account_type": "Receivable"
+            },
+            "2740 Postwertzeichen": {
+                "account_type": "Cash"
+            },
+            "2780 Schecks in Euro": {
+                "account_type": "Cash"
+            },
+            "2800 Guthaben bei Kreditinstitut": {
+                "account_type": "Bank"
+            },            
+            "2810 Guthaben bei Paypal": {
+                "account_type": "Bank"
+            },
+            "2930 Mietvorauszahlungen": {
+                "account_type": "Receivable"
+            },
+            "2980 Abgrenzung latenter Steuern": {
+                "account_type": "Receivable"
+            },
+            "2500 Vorsteuer": {
+                "account_type": "Receivable"
+            },
+            "2510 Vorsteuer aus innergemeinschaftlichem Erwerb 10%": {
+                "account_type": "Tax"
+            },
+            "2520 Vorsteuer aus innergemeinschaftlichem Erwerb 20%": {
+                "account_type": "Tax"
+            },
+            "2530 Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
+                "account_type": "Tax"
+            },
+            "2690 Wertberichtigungen zu Wertpapieren und Anteilen": {
+                "account_type": "Receivable"
+            },
+            "root_type": "Asset"
+        },
+          "Klasse 4: Betriebliche Erträge": {
+            "4000 Erlöse 20 %": {"account_type": "Income Account"},          
+            "4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},            
+            "4010 Erl\u00f6se 10 %": {"account_type": "Income Account"},
+            "4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},            
+            "4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},      
+            "4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},            
+            "4410 Erl\u00f6sreduktion 10 %": {"account_type": "Expense Account"},
+            "4420 Erl\u00f6sreduktion 20 %": {"account_type": "Expense Account"},
+            "4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},            
+            "4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"}, 
+            "4500 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {"account_type": "Income Account"},
+            "4580 Aktivierte Eigenleistungen": {"account_type": "Income Account"},
+            "4600 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
+            "4630 Ertr\u00e4ge aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
+            "4660 Ertr\u00e4ge aus der Zuschreibung zum Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
+            "4700 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {"account_type": "Income Account"},
+            "4800 \u00dcbrige betriebliche Ertr\u00e4ge": {"account_type": "Income Account"},
+            "root_type": "Income"
+        },        
+        "Klasse 5: Aufwand f\u00fcr Material und Leistungen": {
+            "5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},        
+            "5100 Verbrauch an Rohstoffen": {"account_type": "Cost of Goods Sold"},
+            "5200 Verbrauch von bezogenen Fertig- und Einzelteilen": {"account_type": "Cost of Goods Sold"},
+            "5300 Verbrauch von Hilfsstoffen": {"account_type": "Cost of Goods Sold"},
+            "5340 Verbrauch Verpackungsmaterial": {"account_type": "Cost of Goods Sold"},
+            "5470 Verbrauch von Kleinmaterial": {"account_type": "Cost of Goods Sold"},
+            "5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},                                  
+            "5400 Verbrauch von Betriebsstoffen": {"account_type": "Cost of Goods Sold"},
+            "5500 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {"account_type": "Cost of Goods Sold"},
+            "5600 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {"account_type": "Cost of Goods Sold"},
+            "5700 Bearbeitung durch Dritte": {"account_type": "Cost of Goods Sold"},
+            "5900 Aufwandsstellenrechnung Material": {"account_type": "Cost of Goods Sold"},
+            "5820 Skontoertr\u00e4ge (20% USt.)": {"account_type": "Income Account"},
+            "5810 Skontoertr\u00e4ge (10% USt.)": {"account_type": "Income Account"},
+            "5010 Handelswareneinkauf 10 %": {"account_type": "Cost of Goods Sold"},
+            "5020 Handelswareneinkauf 20 %": {"account_type": "Cost of Goods Sold"},
+            "5040 Handelswareneinkauf innergemeinschaftlicher Erwerb 10 % VSt/10 % USt": {"account_type": "Cost of Goods Sold"},
+            "5050 Handelswareneinkauf innergemeinschaftlicher Erwerb 20 % VSt/20 % USt": {"account_type": "Cost of Goods Sold"},
+            "5070 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 10 % USt": {"account_type": "Cost of Goods Sold"},
+            "5080 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 20 % USt": {"account_type": "Cost of Goods Sold"},
+            "root_type": "Expense"
+        },
+        "Klasse 6: Personalaufwand": {
+            "6000 L\u00f6hne": {"account_type": "Payable"},
+            "6200 Geh\u00e4lter": {"account_type": "Payable"},
+            "6400 Aufwendungen f\u00fcr Abfertigungen": {"account_type": "Payable"},
+            "6450 Aufwendungen f\u00fcr Altersversorgung": {"account_type": "Payable"},
+            "6500 Gesetzlicher Sozialaufwand Arbeiter": {"account_type": "Payable"},
+            "6560 Gesetzlicher Sozialaufwand Angestellte": {"account_type": "Payable"},
+            "6600 Lohnabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
+            "6660 Gehaltsabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
+            "6700 Sonstige Sozialaufwendungen": {"account_type": "Payable"},
+            "6900 Aufwandsstellenrechnung Personal": {"account_type": "Payable"},
+            "root_type": "Expense"
+        },       
+         "Klasse 7: Abschreibungen und sonstige betriebliche Aufwendungen": {
+            "7010 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {"account_type": "Depreciation"},
+            "7100 Sonstige Steuern und Geb\u00fchren": {"account_type": "Tax"},
+            "7200 Instandhaltung u. Reinigung durch Dritte, Entsorgung, Energie": {"account_type": "Expense Account"},
+            "7300 Transporte durch Dritte": {"account_type": "Expense Account"},
+            "7310 Fahrrad - Aufwand": {"account_type": "Expense Account"},
+            "7320 Kfz - Aufwand": {"account_type": "Expense Account"},
+            "7330 LKW - Aufwand": {"account_type": "Expense Account"},
+            "7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},            
+            "7350 Reise- und Fahraufwand": {"account_type": "Expense Account"},
+            "7360 Tag- und N\u00e4chtigungsgelder": {"account_type": "Expense Account"},
+            "7380 Nachrichtenaufwand": {"account_type": "Expense Account"},
+            "7400 Miet- und Pachtaufwand": {"account_type": "Expense Account"},
+            "7440 Leasingaufwand": {"account_type": "Expense Account"},
+            "7480 Lizenzaufwand": {"account_type": "Expense Account"},
+            "7500 Aufwand f\u00fcr beigestelltes Personal": {"account_type": "Expense Account"},
+            "7540 Provisionen an Dritte": {"account_type": "Expense Account"},
+            "7580 Aufsichtsratsverg\u00fctungen": {"account_type": "Expense Account"},
+            "7610 Druckerzeugnisse und Vervielf\u00e4ltigungen": {"account_type": "Expense Account"},
+            "7650 Werbung und Repr\u00e4sentationen": {"account_type": "Expense Account"},
+            "7700 Versicherungen": {"account_type": "Expense Account"},
+            "7750 Beratungs- und Pr\u00fcfungsaufwand": {"account_type": "Expense Account"},
+            "7800 Forderungsverluste und Schadensf\u00e4lle": {"account_type": "Expense Account"},
+            "7840 Verschiedene betriebliche Aufwendungen": {"account_type": "Expense Account"},
+            "7910 Aufwandsstellenrechung der Hersteller": {"account_type": "Expense Account"},
+            "7060 Sofortabschreibungen geringwertig": {"account_type": "Expense Account"},
+            "7070 Abschreibungen vom Umlaufverm\u00f6gen, soweit diese die im Unternehmen \u00fcblichen Abschreibungen \u00fcbersteigen": {"account_type": "Depreciation"},
+            "7900 Aufwandsstellenrechnung": {"account_type": "Expense Account"},
+            "7770 Aus- und Fortbildung": {"account_type": "Expense Account"},
+            "7820 Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
+            "7600 B\u00fcromaterial und Drucksorten": {"account_type": "Expense Account"},
+            "7630 Fachliteratur und Zeitungen ": {"account_type": "Expense Account"},
+            "7960 Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {"account_type": "Expense Account"},
+            "7780 Mitgliedsbeitr\u00e4ge": {"account_type": "Expense Account"},
+            "7880 Skontoertr\u00e4ge auf sonstige betriebliche Aufwendungen": {"account_type": "Expense Account"},
+            "7990 Sonstige betrieblichen Aufwendungen": {"account_type": "Expense Account"},
+            "7680 Spenden und Trinkgelder": {"account_type": "Expense Account"},
+            "7790 Spesen des Geldverkehrs": {"account_type": "Expense Account"},
+            "7830 Verluste aus dem Abgang vom Anlageverm\u00f6gen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
+            "7970 Vertriebskosten": {"account_type": "Expense Account"},
+            "7980 Verwaltungskosten": {"account_type": "Expense Account"},
+            "root_type": "Expense"
+        },
+         "Klasse 8: Finanz- und ausserordentliche Ertr\u00e4ge und Aufwendungen": {
+            "8000 Ertr\u00e4ge aus Beteiligungen": {"account_type": "Income Account"},
+            "8050 Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {"account_type": "Income Account"},
+            "8100 Zinsen aus Bankguthaben": {"account_type": "Income Account"},
+            "8110 Zinsen aus gewaehrten Darlehen": {"account_type": "Income Account"},
+            "8130 Verzugszinsenertraege": {"account_type": "Income Account"},
+            "8220 Aufwendungen aus Beteiligungen": {"account_type": "Expense Account"},
+            "8260 Aufwendungen aus sonst. Fiananzanlagen und aus Wertpapieren des Umlaufverm\u00f6gens": {},
+            "8280 Zinsen und \u00e4hnliche Aufwendungem": {"account_type": "Expense Account"},
+            "8400 Au\u00dferordentliche Ertr\u00e4ge": {"account_type": "Income Account"},
+            "8450 Au\u00dferordentliche Aufwendungen": {"account_type": "Expense Account"},
+            "8500 Steuern vom Einkommen und vom Ertrag": {
+                "account_type": "Tax"
+            },
+            "8600 Aufl\u00f6sung unversteuerten R\u00fccklagen": {"account_type": "Income Account"},
+            "8700 Aufl\u00f6sung von Kapitalr\u00fccklagen": {"account_type": "Income Account"},
+            "8750 Aufl\u00f6sung von Gewinnr\u00fccklagen": {"account_type": "Income Account"},
+            "8800 Zuweisung zu unversteuerten R\u00fccklagen": {"account_type": "Expense Account"},
+            "8900 Zuweisung zu Gewinnr\u00fccklagen": {"account_type": "Expense Account"},
+            "8100 Buchwert abgegangener Beteiligungen": {"account_type": "Expense Account"},
+            "8130 Buchwert abgegangener Wertpapiere des Umlaufverm\u00f6gens": {"account_type": "Expense Account"},
+            "8120 Buchwert abgegangener sonstiger Finanzanlagen": {"account_type": "Expense Account"},
+            "8990 Gewinnabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {"account_type": "Expense Account"},
+            "8350 nicht ausgenutzte Lieferantenskonti": {"account_type": "Expense Account"},
+            "root_type": "Income"
+        },       
+        "Klasse 9 Passiva: Eigenkapital, R\u00fccklagen, stille Einlagen, Abschlusskonten": {
+            "9000 Gezeichnetes bzw. gewidmetes Kapital": {
+                "account_type": "Equity"
+            },
+            "9200 Kapitalr\u00fccklagen": {
+                "account_type": "Equity"
+            },
+            "9300 Gewinnr\u00fccklagen": {
+                "account_type": "Equity"
+            },
+            "9400 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
+                "account_type": "Equity"
+            },
+            "9600 Private Entnahmen": {"account_type": "Equity"},
+            "9610 Privatsteuern": {"account_type": "Equity"},
+            "9700 Einlagen stiller Gesellschafter ": {"account_type": "Equity"},
+            "9900 Evidenzkonto": {"account_type": "Equity"},
+            "9800 Er\u00f6ffnungsbilanzkonto (EBK)": {"account_type": "Equity"},
+            "9880 Jahresergebnis laut Gewinn- und Verlustrechnung (G+V)": {"account_type": "Equity"},
+            "9850 Schlussbilanzkonto (SBK)": {"account_type": "Round Off"},
+            "9190 nicht eingeforderte ausstehende Einlagen und berechtigte Entnahmen von Gesellschaftern": {
+                "account_type": "Equity"
+            },
+            "root_type": "Equity"
+        }
+     }   
+  }
+
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -28,7 +28,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 					this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
 					cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 				}
-				if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+				if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
 					cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
 				}
 			}
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -193,7 +193,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "fieldname": "contact_email", 
-   "fieldtype": "Code", 
+   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -1946,6 +1946,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
@@ -2316,12 +2341,39 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "recurring_id", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Document", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Select the period when the invoice will be generated automatically", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "recurring_type", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -2329,7 +2381,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Recurring Type", 
+   "label": "Frequency", 
   "length": 0, 
   "no_copy": 1, 
   "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
@@ -2347,60 +2399,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Start date of current invoice's period", 
-   "fieldname": "from_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "End date of current invoice's period", 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "repeat_on_day_of_month", 
   "fieldtype": "Int", 
   "hidden": 0, 
@@ -2425,8 +2425,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which recurring invoice will be stop", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -2434,7 +2434,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "End Date", 
+   "label": "Recurring Ends On", 
   "length": 0, 
   "no_copy": 1, 
   "permlevel": 0, 
@@ -2447,6 +2447,113 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "fieldname": "submit_on_creation", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Submit on creation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
+   "fieldname": "notify_by_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Notify by email", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
+   "description": "", 
+   "fieldname": "notification_email_address", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Notification Email Address", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
+   "fieldname": "recurring_print_format", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Recurring Print Format", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Print Format", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -2472,11 +2579,63 @@
   "width": "50%"
  }, 
  {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which next invoice will be generated. It is generated on submit.", 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
   "fieldname": "next_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -2496,86 +2655,6 @@
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The unique id for tracking all recurring invoices. It is generated on submit.", 
-   "fieldname": "recurring_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recurring Id", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
-   "fieldname": "notification_email_address", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Notification Email Address", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "fieldname": "recurring_print_format", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recurring Print Format", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Print Format", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
  }
 ], 
 "hide_heading": 0, 
@@ -2589,7 +2668,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-02-22 09:32:04.196291", 
+ "modified": "2016-03-02 07:12:31.805279", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice", 
@@ -2714,26 +2793,6 @@
   "share": 0, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
  }
 ], 
 "read_only": 0, 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -57,7 +57,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 				return item.is_delivered_by_supplier ? true : false;
 			})

-			if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+			if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
 				cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
 					this.make_sales_return, __("Make"));
 				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -219,7 +219,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "fieldname": "contact_email", 
-   "fieldtype": "Code", 
+   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -2257,6 +2257,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -3026,6 +3051,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "label": "Settings", 
   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
@@ -3044,7 +3070,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "depends_on": "eval:doc.docstatus<2", 
-   "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date", 
+   "description": "", 
   "fieldname": "is_recurring", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -3065,12 +3091,39 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "recurring_id", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Document", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Select the period when the invoice will be generated automatically", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "recurring_type", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -3078,7 +3131,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Recurring Type", 
+   "label": "Frequency", 
   "length": 0, 
   "no_copy": 1, 
   "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
@@ -3096,60 +3149,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Start date of current invoice's period", 
-   "fieldname": "from_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "End date of current invoice's period", 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "repeat_on_day_of_month", 
   "fieldtype": "Int", 
   "hidden": 0, 
@@ -3174,8 +3175,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which recurring invoice will be stop", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -3200,84 +3201,61 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "column_break12", 
-   "fieldtype": "Column Break", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "fieldname": "submit_on_creation", 
+   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "label": "Submit on creation", 
   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which next invoice will be generated. It is generated on submit.\n", 
-   "fieldname": "next_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Next Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", 
-   "fieldname": "recurring_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recurring Id", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
   "unique": 0
  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
+   "fieldname": "notify_by_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Notify by email", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "notification_email_address", 
   "fieldtype": "Code", 
   "hidden": 0, 
@@ -3303,7 +3281,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
   "fieldname": "recurring_print_format", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -3326,6 +3304,109 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "This Document", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "next_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Next Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -3364,7 +3445,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-02-22 09:34:35.695558", 
+ "modified": "2016-03-02 07:12:38.793697", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
@@ -3412,7 +3493,7 @@
  }, 
  {
   "amend": 0, 
-   "apply_user_permissions": 1, 
+   "apply_user_permissions": 0, 
   "cancel": 0, 
   "create": 0, 
   "delete": 0, 
@@ -3428,7 +3509,6 @@
   "set_user_permissions": 0, 
   "share": 0, 
   "submit": 0, 
-   "user_permission_doctypes": "[\"Company\"]", 
   "write": 0
  }, 
  {
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -50,36 +50,31 @@ frappe.pages["Accounts Browser"].on_page_load  = function(wrapper){
 		erpnext.account_chart && erpnext.account_chart.make_new();
 	}, "octicon octicon-plus");

+	var company_list = $.map(locals[':Company'], function(c) { return c.name; }).sort();
+
 	// company-select
-	wrapper.$company_select = wrapper.page.add_select("Company", [])
+	wrapper.$company_select = wrapper.page.add_select("Company", company_list)
 		.change(function() {
 			var ctype = frappe.get_route()[1] || 'Account';
 			erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
 				chart_area.get(0), wrapper.page);
 		})

-	// load up companies
-	return frappe.call({
-		method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_companies',
-		callback: function(r) {
-			wrapper.$company_select.empty();
-			$.each(r.message, function(i, v) {
-				$('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select);
-			});
-			wrapper.$company_select.val(frappe.defaults.get_user_default("Company") || r.message[0]).change();
-		}
-	});
 }

 frappe.pages["Accounts Browser"].on_page_show = function(wrapper){
 	// set route
 	var ctype = frappe.get_route()[1] || 'Account';

-
-
-	if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
+	if(frappe.route_options) {
+		if(frappe.route_options.company) {
+			wrapper.$company_select.val(frappe.route_options.company).change();
+		}
+		frappe.route_options = null;
+	} else if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
 		wrapper.$company_select.change();
 	}
+
 }

 erpnext.AccountsChart = Class.extend({
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -92,9 +92,9 @@ def set_contact_details(out, party, party_type):
 def set_other_values(out, party, party_type):
 	# copy
 	if party_type=="Customer":
-		to_copy = ["customer_name", "customer_group", "territory"]
+		to_copy = ["customer_name", "customer_group", "territory", "language"]
 	else:
-		to_copy = ["supplier_name", "supplier_type"]
+		to_copy = ["supplier_name", "supplier_type", "language"]
 	for f in to_copy:
 		out[f] = party.get(f)

--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -269,7 +269,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "fieldname": "contact_email", 
-   "fieldtype": "Code", 
+   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -2237,6 +2237,33 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -2329,7 +2356,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "", 
+   "label": "Settings", 
   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
@@ -2368,11 +2395,39 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "recurring_id", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Document", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Order", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "recurring_type", 
   "fieldtype": "Select", 
   "hidden": 0, 
@@ -2380,7 +2435,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Recurring Type", 
+   "label": "Frequency", 
   "length": 0, 
   "no_copy": 1, 
   "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
@@ -2398,60 +2453,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Start date of current order's period", 
-   "fieldname": "from_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "End date of current order's period", 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "repeat_on_day_of_month", 
   "fieldtype": "Int", 
   "hidden": 0, 
@@ -2476,8 +2479,8 @@
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which recurring order will be stop", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -2502,18 +2505,20 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "column_break83", 
-   "fieldtype": "Column Break", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "fieldname": "submit_on_creation", 
+   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "", 
+   "label": "Submit on creation", 
   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2522,63 +2527,39 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "The date on which next invoice will be generated. It is generated on submit.", 
-   "fieldname": "next_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Next Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "fieldname": "recurring_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recurring Id", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Enter email id separated by commas, order will be mailed automatically on particular date", 
+   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
+   "description": "", 
+   "fieldname": "notify_by_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Notify by email", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
+   "description": "", 
   "fieldname": "notification_email_address", 
   "fieldtype": "Code", 
   "hidden": 0, 
@@ -2604,7 +2585,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring==1", 
+   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
   "fieldname": "recurring_print_format", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -2626,6 +2607,108 @@
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break83", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "This Document", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_recurring", 
+   "description": "", 
+   "fieldname": "next_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Next Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
  }
 ], 
 "hide_heading": 0, 
@@ -2638,7 +2721,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-02-22 09:32:53.191526", 
+ "modified": "2016-03-02 07:12:18.785730", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order", 
@@ -2743,26 +2826,6 @@
   "share": 0, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
  }
 ], 
 "read_only": 0, 
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -2,6 +2,9 @@
 // License: GNU General Public License v3. See license.txt

 frappe.ui.form.on("Supplier", {
+	before_load: function(frm) {
+		frappe.setup_language_field(frm);
+	},
 	refresh: function(frm) {
 		frm.cscript.make_dashboard(frm.doc);

--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -216,7 +216,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "fieldname": "contact_email", 
-   "fieldtype": "Code", 
+   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -1642,6 +1642,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1783,7 +1808,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-02-22 09:36:33.641326", 
+ "modified": "2016-03-02 05:09:20.534046", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation", 
@@ -1908,26 +1933,6 @@
   "share": 0, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
  }
 ], 
 "read_only": 0, 
--- a/erpnext/change_log/v6/v6_24_0.md
+++ b/erpnext/change_log/v6/v6_24_0.md
@@ -0,0 +1,9 @@
+- **Multilingual Print Formats**
+	- Select language in Customer/Supplier
+	- Select print language in translations
+	- Language selector in Print Format preview
+	- Item name, description translatable via **Custom Translations**
+- Publish **Job Openings** on the website and let applicants apply directly from the website
+- Cleanup of **recurring orders and invoices**
+	- Email notifications are now optional
+	- Auto submit on creation is now also optional
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -169,6 +169,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
 			and tabItem.disabled=0
 			and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
 			and (tabItem.`{key}` LIKE %(txt)s
+				or tabItem.item_group LIKE %(txt)s
 				or tabItem.item_name LIKE %(txt)s
 				or tabItem.description LIKE %(txt)s)
 			{fcond} {mcond}
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -38,18 +38,19 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):

 	recurring_documents = frappe.db.sql("""select name, recurring_id
 		from `tab{0}` where is_recurring=1
-		and docstatus=1 and next_date=%s
+		and (docstatus=1 or docstatus=0) and next_date=%s
 		and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date)

 	exception_list = []
 	for ref_document, recurring_id in recurring_documents:
 		if not frappe.db.sql("""select name from `tab%s`
-				where %s=%s and recurring_id=%s and docstatus=1"""
+				where %s=%s and recurring_id=%s and (docstatus=1 or docstatus=0)"""
 				% (doctype, date_field, '%s', '%s'), (next_date, recurring_id)):
 			try:
 				reference_doc = frappe.get_doc(doctype, ref_document)
 				new_doc = make_new_document(reference_doc, date_field, next_date)
-				send_notification(new_doc)
+				if reference_doc.notify_by_email:
+					send_notification(new_doc)
 				if commit:
 					frappe.db.commit()
 			except:
@@ -92,14 +93,15 @@ def make_new_document(reference_doc, date_field, posting_date):
 		date_field: posting_date,
 		"from_date": from_date,
 		"to_date": to_date,
-		"fiscal_year": get_fiscal_year(posting_date)[0]
+		"fiscal_year": get_fiscal_year(posting_date)[0],
+        	"next_date": get_next_date(from_date, mcount,cint(reference_doc.repeat_on_day_of_month))
 	})

 	# copy document fields
 	for fieldname in ("owner", "recurring_type", "repeat_on_day_of_month",
 		"recurring_id", "notification_email_address", "is_recurring", "end_date",
 		"title", "naming_series", "select_print_heading", "ignore_pricing_rule",
-		"posting_time", "remarks"):
+		"posting_time", "remarks", 'submit_on_creation'):
 		if new_document.meta.get_field(fieldname):
 			new_document.set(fieldname, reference_doc.get(fieldname))

@@ -110,7 +112,11 @@ def make_new_document(reference_doc, date_field, posting_date):

 	new_document.run_method("on_recurring", reference_doc=reference_doc)

-	new_document.submit()
+	if reference_doc.submit_on_creation:
+		new_document.submit()
+	else:
+		new_document.docstatus=0
+		new_document.insert()

 	return new_document

@@ -160,6 +166,9 @@ def validate_recurring_document(doc):
 	if doc.is_recurring:
 		validate_notification_email_id(doc)

+		if not doc.recurring_id:
+			doc.recurring_id = doc.name
+
 		if not doc.recurring_type:
 			msgprint(_("Please select {0}").format(doc.meta.get_label("recurring_type")),
 			raise_exception=1)
@@ -170,9 +179,6 @@ def validate_recurring_document(doc):
 #
 def convert_to_recurring(doc, posting_date):
    if doc.is_recurring:
-        if not doc.recurring_id:
-            frappe.db.set(doc, "recurring_id", doc.name)
-
        set_next_date(doc, posting_date)

    elif doc.recurring_id:
@@ -181,18 +187,19 @@ def convert_to_recurring(doc, posting_date):
 #

 def validate_notification_email_id(doc):
-	if doc.notification_email_address:
-		email_list = split_emails(doc.notification_email_address.replace("\n", ""))
+	if doc.notify_by_email:
+		if doc.notification_email_address:
+			email_list = split_emails(doc.notification_email_address.replace("\n", ""))

-		from frappe.utils import validate_email_add
-		for email in email_list:
-			if not validate_email_add(email):
-				throw(_("{0} is an invalid email address in 'Notification \
-					Email Address'").format(email))
+			from frappe.utils import validate_email_add
+			for email in email_list:
+				if not validate_email_add(email):
+					throw(_("{0} is an invalid email address in 'Notification \
+						Email Address'").format(email))

-	else:
-		frappe.throw(_("'Notification Email Addresses' not specified for recurring %s") \
-			% doc.doctype)
+		else:
+			frappe.throw(_("'Notification Email Addresses' not specified for recurring %s") \
+				% doc.doctype)

 def set_next_date(doc, posting_date):
 	""" Set next date on which recurring document will be created"""
@@ -200,7 +207,7 @@ def set_next_date(doc, posting_date):
 	if not doc.repeat_on_day_of_month:
 		msgprint(_("Please enter 'Repeat on Day of Month' field value"), raise_exception=1)

-	next_date = get_next_date(posting_date, month_map[doc.recurring_type],
+	next_date = doc.next_date or get_next_date(doc.from_date, month_map[doc.recurring_type],
 		cint(doc.repeat_on_day_of_month))

 	frappe.db.set(doc, 'next_date', next_date)
--- a/erpnext/controllers/tests/test_recurring_document.py
+++ b/erpnext/controllers/tests/test_recurring_document.py
@@ -15,6 +15,7 @@ def test_recurring_document(obj, test_records):

 	base_doc.update({
 		"is_recurring": 1,
+		"submit_on_create": 1,
 		"recurring_type": "Monthly",
 		"notification_email_address": "test@example.com, test1@example.com, test2@example.com",
 		"repeat_on_day_of_month": getdate(today).day,
@@ -112,7 +113,7 @@ def _test_recurring_document(obj, base_doc, date_field, first_and_last_day):

 	def _test(i):
 		obj.assertEquals(i+1, frappe.db.sql("""select count(*) from `tab%s`
-			where recurring_id=%s and docstatus=1""" % (base_doc.doctype, '%s'),
+			where recurring_id=%s and (docstatus=1 or docstatus=0)""" % (base_doc.doctype, '%s'),
 			(base_doc.recurring_id))[0][0])

 		next_date = get_next_date(base_doc.get(date_field), no_of_months,
@@ -121,7 +122,7 @@ def _test_recurring_document(obj, base_doc, date_field, first_and_last_day):
 		manage_recurring_documents(base_doc.doctype, next_date=next_date, commit=False)

 		recurred_documents = frappe.db.sql("""select name from `tab%s`
-			where recurring_id=%s and docstatus=1 order by name desc"""
+			where recurring_id=%s and (docstatus=1 or docstatus=0) order by name desc"""
 			% (base_doc.doctype, '%s'), (base_doc.recurring_id))

 		obj.assertEquals(i+2, len(recurred_documents))
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -18,6 +18,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
@@ -42,6 +43,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Series", 
@@ -68,6 +70,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Opportunity From", 
@@ -95,6 +98,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Customer", 
@@ -122,6 +126,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Lead", 
@@ -149,6 +154,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Customer / Lead Name", 
@@ -172,6 +178,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -196,6 +203,7 @@
   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
@@ -221,6 +229,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Opportunity Type", 
@@ -248,6 +257,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Status", 
@@ -275,6 +285,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Lost Reason", 
@@ -298,6 +309,7 @@
   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "With Items", 
@@ -323,6 +335,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
@@ -349,6 +362,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Items", 
@@ -377,6 +391,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Info", 
@@ -402,6 +417,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Customer / Lead Address", 
@@ -426,6 +442,7 @@
   "fieldtype": "Small Text", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Address", 
@@ -453,6 +470,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Territory", 
@@ -479,6 +497,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Customer Group", 
@@ -505,6 +524,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -528,6 +548,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Contact Person", 
@@ -553,6 +574,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact", 
@@ -574,9 +596,10 @@
   "collapsible": 0, 
   "depends_on": "eval:doc.lead || doc.customer", 
   "fieldname": "contact_email", 
-   "fieldtype": "Small Text", 
+   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Email", 
@@ -601,6 +624,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Contact Mobile No", 
@@ -625,6 +649,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Source", 
@@ -650,6 +675,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Source", 
@@ -677,6 +703,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign", 
@@ -703,6 +730,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -727,6 +755,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Company", 
@@ -754,6 +783,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Opportunity Date", 
@@ -780,6 +810,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Fiscal Year", 
@@ -807,6 +838,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Next Contact", 
@@ -832,6 +864,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Next Contact By", 
@@ -860,6 +893,7 @@
   "fieldtype": "Datetime", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Next Contact Date", 
@@ -885,6 +919,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -909,6 +944,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Discuss", 
@@ -934,6 +970,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
@@ -964,7 +1001,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-02-03 01:10:50.963569", 
+ "modified": "2016-03-02 05:12:15.429804", 
 "modified_by": "Administrator", 
 "module": "CRM", 
 "name": "Opportunity", 
--- a/erpnext/docs/assets/img/articles/$SGrab_323.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_323.png
--- a/erpnext/docs/assets/img/articles/$SGrab_327.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_327.png
--- a/erpnext/docs/assets/img/articles/$SGrab_328.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_328.png
--- a/erpnext/docs/assets/img/articles/$SGrab_329.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_329.png
--- a/erpnext/docs/assets/img/articles/$SGrab_330.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_330.png
--- a/erpnext/docs/assets/img/articles/$SGrab_331.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_331.png
--- a/erpnext/docs/assets/img/articles/$SGrab_406.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_406.png
--- a/erpnext/docs/assets/img/articles/$SGrab_407.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_407.png
--- a/erpnext/docs/assets/img/articles/$SGrab_408.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_408.png
--- a/erpnext/docs/assets/img/articles/$SGrab_422.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_422.png
--- a/erpnext/docs/assets/img/articles/Order
+++ b/erpnext/docs/assets/img/articles/Order
--- a/erpnext/docs/assets/img/articles/Screen
+++ b/erpnext/docs/assets/img/articles/Screen
--- a/erpnext/docs/assets/img/articles/Screen
+++ b/erpnext/docs/assets/img/articles/Screen
--- a/erpnext/docs/assets/img/articles/Screen
+++ b/erpnext/docs/assets/img/articles/Screen
--- a/erpnext/docs/assets/img/articles/Selection_013.png
+++ b/erpnext/docs/assets/img/articles/Selection_013.png
--- a/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
+++ b/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
--- a/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
+++ b/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
--- a/erpnext/docs/assets/img/articles/Selection_019bf0547.png
+++ b/erpnext/docs/assets/img/articles/Selection_019bf0547.png
--- a/erpnext/docs/assets/img/articles/Selection_028.png
+++ b/erpnext/docs/assets/img/articles/Selection_028.png
--- a/erpnext/docs/assets/img/articles/Selection_029.png
+++ b/erpnext/docs/assets/img/articles/Selection_029.png
--- a/erpnext/docs/assets/img/articles/Selection_030.png
+++ b/erpnext/docs/assets/img/articles/Selection_030.png
--- a/erpnext/docs/assets/img/articles/Selection_043.png
+++ b/erpnext/docs/assets/img/articles/Selection_043.png
--- a/erpnext/docs/assets/img/articles/Selection_044.png
+++ b/erpnext/docs/assets/img/articles/Selection_044.png
--- a/erpnext/docs/assets/img/articles/Selection_064.png
+++ b/erpnext/docs/assets/img/articles/Selection_064.png
--- a/erpnext/docs/assets/img/articles/Selection_066.png
+++ b/erpnext/docs/assets/img/articles/Selection_066.png
--- a/erpnext/docs/assets/img/articles/Selection_069.png
+++ b/erpnext/docs/assets/img/articles/Selection_069.png
--- a/erpnext/docs/assets/img/articles/attach-file-1.gif
+++ b/erpnext/docs/assets/img/articles/attach-file-1.gif
--- a/erpnext/docs/assets/img/articles/attach-file-2.gif
+++ b/erpnext/docs/assets/img/articles/attach-file-2.gif
--- a/erpnext/docs/assets/img/articles/attach-file-3.gif
+++ b/erpnext/docs/assets/img/articles/attach-file-3.gif
--- a/erpnext/docs/assets/img/articles/delete-submitted-doc-1.png
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-1.png
--- a/erpnext/docs/assets/img/articles/delete-submitted-doc-2.png
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-2.png
--- a/erpnext/docs/assets/img/articles/delete-submitted-doc-3.gif
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-3.gif
--- a/erpnext/docs/assets/img/articles/duplicate.gif
+++ b/erpnext/docs/assets/img/articles/duplicate.gif
--- a/erpnext/docs/assets/img/articles/email-file-attachment.gif
+++ b/erpnext/docs/assets/img/articles/email-file-attachment.gif
--- a/erpnext/docs/assets/img/articles/links-1.gif
+++ b/erpnext/docs/assets/img/articles/links-1.gif
--- a/erpnext/docs/assets/img/articles/links-2.gif
+++ b/erpnext/docs/assets/img/articles/links-2.gif
--- a/erpnext/docs/assets/img/articles/merge-docs-1.png
+++ b/erpnext/docs/assets/img/articles/merge-docs-1.png
--- a/erpnext/docs/assets/img/articles/merge-docs-2.gif
+++ b/erpnext/docs/assets/img/articles/merge-docs-2.gif
--- a/erpnext/docs/assets/img/articles/perm-level-1.gif
+++ b/erpnext/docs/assets/img/articles/perm-level-1.gif
--- a/erpnext/docs/assets/img/articles/perm-level-2.png
+++ b/erpnext/docs/assets/img/articles/perm-level-2.png
--- a/erpnext/docs/assets/img/articles/perm-level-3.png
+++ b/erpnext/docs/assets/img/articles/perm-level-3.png
--- a/erpnext/docs/assets/img/articles/rename-a-doc.gif
+++ b/erpnext/docs/assets/img/articles/rename-a-doc.gif
--- a/erpnext/docs/assets/img/articles/rename-account-2.gif
+++ b/erpnext/docs/assets/img/articles/rename-account-2.gif
--- a/erpnext/docs/assets/img/articles/rename-account.png
+++ b/erpnext/docs/assets/img/articles/rename-account.png
--- a/erpnext/docs/assets/img/articles/rename-docs-1.png
+++ b/erpnext/docs/assets/img/articles/rename-docs-1.png
--- a/erpnext/docs/assets/img/articles/search-filter-auto.gif
+++ b/erpnext/docs/assets/img/articles/search-filter-auto.gif
--- a/erpnext/docs/assets/img/articles/search-filter-based-on.gif
+++ b/erpnext/docs/assets/img/articles/search-filter-based-on.gif
--- a/erpnext/docs/assets/img/articles/search-filter-field.gif
+++ b/erpnext/docs/assets/img/articles/search-filter-field.gif
--- a/erpnext/docs/assets/img/articles/search-filter-result.png
+++ b/erpnext/docs/assets/img/articles/search-filter-result.png
--- a/erpnext/docs/assets/img/multilingual_print_format/alternate_language.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/alternate_language.png
--- a/erpnext/docs/assets/img/multilingual_print_format/custom_translation.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/custom_translation.png
--- a/erpnext/docs/assets/img/multilingual_print_format/customer_quotation.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/customer_quotation.png
--- a/erpnext/docs/assets/img/multilingual_print_format/set_customer_default_lang.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/set_customer_default_lang.png
--- a/erpnext/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png
--- a/erpnext/docs/assets/img/multilingual_print_format/supplier_quotation.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/supplier_quotation.png
--- a/erpnext/docs/assets/img/multilingual_print_format/translation.png
+++ b/erpnext/docs/assets/img/multilingual_print_format/translation.png
--- a/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md
@@ -23,6 +23,6 @@ Um Ärgernisse bei der Installation von Instanzen zu vermeiden, ist ERPNext als

 ### 4\. Installieren Sie ERPNext auf Ihrem Unix/Linux/Mac-Rechner

-Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappe Bench](https://github.com/frappe/frappe-bench).
+Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappe Bench](https://github.com/frappe/bench).

 {next}
--- a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -16,6 +16,6 @@ Now, the system will not allow to make any accounting entries before set date. I

 <img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-2.png">

-You can still allow user with certain role to create/edit entries beyound accounts frozen date. You can set that Role in the Account Settings itself.
+You can still allow user with certain role to create/edit entries within accounts frozen date. You can set that Role in the Account Settings itself.

-<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
--- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -1,6 +1,6 @@
 #Managing Transactions In Multiple Currency

-In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. In transaction is created in the parties currency, their currency symbol is updated in the print foramt as well.
+In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. If transaction is created in the parties currency, their currency symbol is updated in the print format as well.

 Let's consider a Sales Invoice, where your base currency is of a Company is USD and party currency is EUR.

@@ -14,7 +14,7 @@ Select Customer from the Customer master. If default Currency is updated in the

 #### Step 3: Exchange Rate

-Currenct Exchange between between base currency and customer currency will auto-fetch.
+Currency Exchange between base currency and customer currency will auto-fetch.

 <img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-1.gif">

@@ -34,5 +34,5 @@ If you have come to terms with party to follow standard exchange rate throughout

 `Accounts > Setup > Currency Exchange`

- If system find Exchange Rate master for any cuurrecy, it is given preference over currency exchnage rate.
+ If system find Exchange Rate master for any currency, it is given preference over currency exchange rate.

--- a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
@@ -1,9 +1,9 @@
 #Delivery from Sales Invoice

-If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invocice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
+If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.

 <img alt="Update Stock" class="screenshot" src="{{docs_base_url}}/assets/img/articles/update-stock.png">

 On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.

-On submission of Sales Invoice, with general ledger posting, stock ledger posting will happen as well.
+On submission of Sales Invoice, with general ledger posting, stock ledger posting will happen as well.
--- a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
@@ -1,4 +1,4 @@
-#WIthdrawing Salary from Owner's Equity Account
+#Withdrawing Salary from Owner's Equity Account

 ### Question

@@ -18,4 +18,4 @@ Example journal entry (using Journal Voucher in ERPNext) for a withdrawal of $10
 1. Credit **Cash** $1000
 2. Debit **Owner's Draws** $1000

-<!-- markdown -->
+<!-- markdown -->
--- a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -21,7 +21,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren

 <img class="screenshot" alt="Period Closing Voucher" src="{{docs_base_url}}/assets/img/accounts/period-closing-voucher.png">

-This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility account like Reserves and Surplus, or Capital Fund account as Closing Account.
+This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account.

 The Period Closing Voucher will make accounting entries (GL Entry) making all your Income and Expense Accounts zero and transferring Profit/Loss balance to the Closing Account.

--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -16,7 +16,7 @@ share the Customer, Supplier and Item records.

 #### Customer

-Represents a customer. A Customer can be an individual or an organizations.
+Represents a customer. A Customer can be an individual or an organization.
 You can create multiple Contacts and Addresses for each Customer.

 > Selling > Customer
--- a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -30,6 +30,6 @@ Image](https://erpnext.com/download)

 ### 4\. Install ERPNext on your Unix/Linux/Mac machine

-If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/frappe-bench).
+If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).

 {next}
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -2,7 +2,7 @@

 In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.

-Perm Level for a field can be defined in the [Customize Form](docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
+Perm Level for a field can be defined in the [Customize Form]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).

 <img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">

--- a/erpnext/docs/user/manual/en/stock/item/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -1,4 +1,4 @@
-Item Price is the record in which you can log sellig and buying rate of an item.
+Item Price is the record in which you can log selling and buying rate of an item.

 There are two ways to reach to new Item Price form.

--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -1,10 +1,9 @@
 #Adding Attachments to Outgoing Messages

-ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext.
+ERPNext has in-built file manager. Click [here]({{docs_base_url}}/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext.

-If you have some files attached in your transaction (say Purchase Order), which needs to be emailed with Purchase Order details. When click on Email option, at the end of the Communication dialog box, you will find all the attachments listed with check-box option. You should check files which needs to be emailed as an attachment to recipient.
-
-![Emailing Attachments]({{docs_base_url}}/assets/img/articles/$SGrab_422.png)
+If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it.

+<img alt="Emailing Attachments" class="screenshot" src="{{docs_base_url}}/assets/img/articles/email-file-attachment.gif">

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
@@ -0,0 +1,36 @@
+#Adding File as a Attachment
+
+ERPNext allows to attach files with documents. User with a read permission on particular document will also be able to access files attached with it.
+
+###Attach New File
+
+There are several ways to attach file to the document.
+
+####From Browser
+
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-1.gif">
+
+####By drag and drop
+
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-2.gif">
+
+Click on Attach to browse and select the file.
+
+####Link
+
+If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file.
+
+<img alt="Sales Order Select File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-3.gif">
+
+`For hosted users, limit of 5 MB is applied on file size.`
+
+To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it.
+
+####File Manager
+
+Check following link to learn how files are managed in ERPNext.
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4-osLW3E_Rk" frameborder="0" allowfullscreen></iframe>
+
+
+<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -0,0 +1,25 @@
+#Bulk Rename
+
+Using renaming tool, you can to rectify/change multiple document ids at once. This tool is only accessible to the User who has System Manager role assigned.
+
+###Rename Tool
+
+You can rename ids of upto 500 records at a time. Following are step to bulk rename bulk records. Let's assume we are renaming Item Codes for the existing items.
+
+#### Step 1: Open Excel File
+
+In a spreadsheet file, enter old Item IDs in the first column, and new Item Ids in the second column. Save spreadsheet file in a CSV format.
+
+<img alt="Data File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-docs-1.png">
+
+#### Step 2: Upload Data File
+
+To upload data file go to,
+
+`Setup > Data > Rename Tool`
+
+Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
+
+![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) 
+
+<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -1,27 +1,23 @@
 #Checking Link Between Documents

-Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document.
+Links option shows one document is linked to which other documents. Check Menu for the Links options.

-![linked with icon]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png)
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-1.gif">

 ####Scenario

-If you need to check which Delivery Note and Sales Invoice has been created against Sales Order, you should open Sales Order document, and click on Linked With in it.
-
-![Sales Order Links]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png)
-
-Since Sales Order is a centralize transaction, using linked-with option in the Sales Order, you can track complete deal, like billing done, purchases made, manufacturing development against this particular order.
+If you need that against Sales Order, which Delivery Note and Sales Invoice has been created, you should open Sales Order document, and check Links. Same way, you can also check Purchase Order, and find which Purchase Receipt and Purchase Ivoice is linked with it.

 ####How It Works?

-When you check Linked With in for a Sales Order, it lists all the record where this Sales Order ID is updated. It will not show documents where this Sales Order Id is entered as text, and not in the link field.
+When you check Links for a Sales Order, it lists all the record where this Sales Order ID is linked. When Delivery Note is created against Sales Order, then Sales Order link is updated in the Delivery Note Item table.

 ####Backward Links

-If I check Linked With in the Delivery Note, will it list Sales Order created before this delivery  note?
+If I check Links in the Purchase Receipt, will it list Purchase Order from which this Purchase Receipt was created?

-Linked With function works only for the forward linkages. For the backward linkages, you should check current document itself. In the Delivery Note, you can check Item table to see which Sales Order it is linked with.
+Links only shows forward linkages. For the backward links, you should check current document itself. In the Purchase Receipt Item table table, you can check which Purchase Order it is linked to.

-![Linked With Backward]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png)
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-2.gif">

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -1,27 +1,29 @@
 #Delete Submitted Document

-ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions.
+To be able to delete Submitted document, you should first Cancel. Once canceled, you can delete that document from Menu or from the List View of that Document Type.

-To delete any document from system you should cancel all linked documents. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against that Sales Order. Then you should cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order. If payment entry was also made against Sales Invoice, then you should first Cancel and Delete that Journal Voucher, and then come to Sales Invoice.
+If document which needs to be deleted is also linked to other documents, then you should first Cancel document those document as well. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against it. Then you should first cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order.
+
+Delete option is only visible to user having related permission. From Role Permission Manager, you can control and define Delete permission and Role for each Document Type.

 Following are step to delete submitted documents.

-####1. Cancel Document
+####Step 1: Cancel Document

-To be able to delete Submitted document, it must be cancelled first. After document is cancelled, you will find option to delete it.
+You will find option to Cancel in the submitted document. If document is at draft stage, it can delete directly. Also if document is not submittable, but only save, it can be deleted directly.

-![Cancel Sales Order]({{docs_base_url}}/assets/img/articles/Selection_064.png)
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-1.png">

-####2. Delete Document
+####Step 2: Delete Document

-After cancellation, go to File menu and click on Delete option.
+After cancellation, go to Menu and click on Delete.

-![Cancel Sales Order]({{docs_base_url}}/assets/img/articles/Selection_066.png)
+<img alt="Delete Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-2.png">

-#### Deleting from List
+####Step 3: Deleting from List

-For bulk deletion, you can select multiple Cancelled records and delete them at once from the list.
+For bulk deletion, you can select multiple Cancelled records and delete at once from the List View.

-![Cancel Sales Order List]({{docs_base_url}}/assets/img/articles/Selection_069.png)
+<img alt="Delete Doc from List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-3.gif">

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -1,17 +1,15 @@
 #Duplicate a Record

-ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster.
+Duplicate feature helps you to copy values of existing document into new document.

 ####Scenario

-An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you can open previous order, and Copy it to create new order faster. On copying, details of the previous transaction will be updated in the new form. You can make changes where needed and submit the transaction.
+An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you should open previous order, and Duplciate it to create new order faster. On Duplicating, values of the previous transaction will be updated in a new document. You can make changes where needed and submit the document.

 You will find Copy option under:

-File > Copy
+`Menu > Copy`

-![Copy]({{docs_base_url}}/assets/img/articles/Order Copy.png)
-
-When Copy function is executed, values are mapped field-by-field from existing to new form.
+<img alt="Duplicate" class="screenshot" src="{{docs_base_url}}/assets/img/articles/duplicate.gif">

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -1,11 +1,11 @@
-adding-attachments-to-outgoing-messages
+adding-attachment-to-outgoing-messages
 check-link-between-documents
 delete-submitted-document
 duplicate-record
-managing-attachments
+adding-file-as-a-attachment
 merging-documents
-rename-tool
+bulk-rename
 renaming-documents
-search-filters
+search-filter
 tree-master-renaming
 pos-view
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
@@ -1,20 +0,0 @@
-#Adding Attachments in a Documents
-
-ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured.
-
-Open to attach file is at the footer of a form.
-
-![Sales Order File Attachment]({{docs_base_url}}/assets/img/articles/$SGrab_406.png)
-
-Click on Attach to browse and select the file.
-
-![Sales Order Select File]({{docs_base_url}}/assets/img/articles/$SGrab_407.png)
-
-If you maintain separate server for the files, or use online service like Dropbox, you can provide link of a particular file in the document in ERPNext.
-
-![Sales Order File Link]({{docs_base_url}}/assets/img/articles/$SGrab_408.png)
-
-`For hosted users, limit of 1 MB is applied on file size.`
-
-To ensure there are not many files attached against the document, which can lead to your system slowing down, you can set limit as how many files can be attached against particular document. Click [here](https://erpnext.com/kb/customize/increase-max-attachments) to learn more about it.
-<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,32 +1,31 @@
 #Merging Documents

-Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext. 
+For a document, of you have two records which are identical, and meant for common purpose, you can merge them into one record.

-Following are step to merge document in existing document. Let's assume we are merging Account Ledger.
+Following are step to merge documents. Let's assume we are merging two Accounts.

-#### 1: Go to Chart of Account
+#### Step 1: Go to Chart of Account

-`Accounts > Setup > Chart of Accounts`
+`Accounts > Documents > Chart of Accounts`

-#### 2: Go to Account 
+#### Step 2: Go to Account 

-Click on Rename option of that account, which you want to merge in existing account.
+For an Account to be merge, click on "Rename" option.

-#### 3: Merge Account
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">

-Enter existing account name in New Name field and check Mark on "Merge with existing" option. Then press 'Rename' button to merge.
+#### Step 3: Merge Account

-![Account]({{docs_base_url}}/assets/img/articles/Selection_043.png)
+In the New Name field, enter another account name with which this account will be merged. Check "Merge with existing" option. Then press 'Rename' button to merge.

 Following is how merged account will appear in the Chart of Account master.

-![New Account]({{docs_base_url}}/assets/img/articles/Selection_044.png)
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">

-###Effect of Merging 
+###Effect of Merging

-Merging document affects existing transaction where this record is selected. As well as it will affected on existing document balance.
-
-<div class="well"> Note: You can't merge Group into Ledger documents. As well as Ledger into Group documents. Also this feature is applicable for few documents only.</div>
+After Account is merged, new name is updated in the existing transactions where old account was selected.

+<div class="well"> Note: Group Account cannot be merged into Child Account and vice versa.</div>

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
@@ -1,37 +0,0 @@
-#Rename Tool
-
-ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role.
-
-There are two ways you can rename records in your account. You can follow the approach based on how many records needs to be renamed.
-
-###Rename Record via Rename Tool
-
-Using this tool you can correct/rectify primary ids of 500 records at a time.
-
-Following are step to rename bulk records in ERPNext. Let's assume we are renaming Item Codes for existing Items.
-
-#### Step 1: Open Excel File
-
-In new excel file enter old Item Ids in one column and enter new Item Ids in exact next column. Then save data file in .csv format.
-
-![Data File]({{docs_base_url}}/assets/img/articles/Selection_018ef32b6.png)
-
-#### Step 2: Upload Data File
-
-To upload data file go to,
-
-`Setup > Data > Rename Tool`
-
-Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
-
-![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) 
-
-Following are the renamed Item Codes.
-
-![New Name]({{docs_base_url}}/assets/img/articles/Selection_019bf0547.png)
-
-###Rename Individual Document
-
-Click [here](https://erpnext.com/kb/tools/renaming-documents) for detailed steps on how to rename document one by one.
-
-<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -1,24 +1,14 @@
-#Renaming Documents
+#Renaming a Document

-ERPNext has Renaming feature which allows you to correct primary id of a record. 
-	
-Following are step to rename document in ERPNext. Let's assume we are renaming Item Code for existing Item.
+Using Renaming feature, you can change ID of a master documents like Item, Warehouse, Accounts etc. Following are the steps to rename Item Code. Following same steps, you can rename other masters as well.
 
 #### 1. Go to Item

-`Stock > Documents > Item List > (Open Item)`
+`Stock > Documents > Item List > (Open Item to be renamed)`

-Open Item for which Item Code needs to be renamed.
+#### 2. Rename

-#### 2. Go to File
-
-![Item]({{docs_base_url}}/assets/img/articles/Selection_013.png)
-
-#### 3. Rename
-
-Enter desired Item Code, and click on "Rename".
-
-![Renamed Item]({{docs_base_url}}/assets/img/articles/Selection_0149d98bf.png)
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-a-doc.gif">

 ###Effect of Renaming

@@ -26,8 +16,8 @@ Renaming document affects existing transaction where this record is selected. Co

 ###See Also

-1. [Bulk Renaming](https://erpnext.com/kb/tools/rename-tool)
-2. [Document Merging](https://erpnext.com/kb/tools/merging-documents)
+1. [Bulk Renaming]({{docs_base_url}}/user/manual/en/using-erpnext/articles/bulk-rename.html)
+2. [Document Merging]({{docs_base_url}}/user/manual/en/using-erpnext/articles/merging-documents.html)

 **List of Renamable Documents**

--- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
@@ -0,0 +1,35 @@
+#Search Filter
+
+Search Filter option allow user to filter records based on value in the specific field of that document. Search Filters are available on the List View of Document Type and in the Report Builder.
+
+Each filter option has three fields.
+
+#### Field
+
+Select field of the document based on which you wish to filter records.
+
+<img alt="Search Filter Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-field.gif">
+
+
+#### Based On
+
+With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
+
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-based-on.gif">
+
+#### Value
+
+A value should be entered in this field based on while records will be filtered. After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
+
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-result.png">
+
+
+You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it.
+
+#### Ready Filters
+
+From the list views, you can also apply filters by clicking on the Status field.
+
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-auto.gif">
+
+<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
@@ -1,39 +0,0 @@
-#Search Filters
-
-Search Filter option allows user to filter records based on value in the specific fields of that form.
-
-Search Filter option is available on the List View page of transactions.
-
-![Filter in List]({{docs_base_url}}/assets/img/articles/$SGrab_323.png)
-
-Each filter option has three fields to select value in.
-
-#### Field
-
-Select field of the form based on which you wish to filter records.
-
-![Filter Field]({{docs_base_url}}/assets/img/articles/$SGrab_327.png)
-
-#### Based On
-
-With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
-
-![Filter Based On]({{docs_base_url}}/assets/img/articles/$SGrab_328.png)
-
-#### Value
-
-A value should be entered in this field based on while records will be filtered.
-
-![Filter Value]({{docs_base_url}}/assets/img/articles/$SGrab_329.png)
-
-After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
-
-![Filter Result]({{docs_base_url}}/assets/img/articles/$SGrab_330.png)
- 
-On the transactions, Document Status - Not Equal To - Cancelled is applied by default. With this, Cancelled transactions are hidden from the list. 
-
-![Default filter]({{docs_base_url}}/assets/img/articles/$SGrab_331.png)
-
-You can apply multiple filters on a list of transactions one-by-one. To remove specific filter, just click on cancelled (X) sign ahead of it.
-
-<!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -1,29 +1,23 @@
 #Tree Master Renaming

-There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext.
+There are various master which are maintained in tree structure. Click [here]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext.

-Following are the steps to be followed for renaming Account/Ledger ID, master which is maintained in tree structure. These steps will be applicable for renaming any master which is maintained in tree structure.
+Following are the steps to be followed for renaming ID of a master which is maintained in tree structure. Let's rename an Account for the instance.

 #### Step 1: Go to Chart of Account

 `Accounts > Setup > Chart of Accounts`

-#### Step 2: Go to Account 
+#### Step 2: Go to Account

-Expand Chart of Accounts and click on that account which you want to rename. When you click on that account, you will find Rename option.
+When click on the Account, you will find Rename option.

-![Account]({{docs_base_url}}/assets/img/articles/Selection_028.png)
+<img alt="Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account.png">

 #### Step 2: Rename Account

-On clicking Rename option, dialog box will give you field to enter New Name for this Account. You should enter new name for the Account/Ledger and click on "Rename" button. On clicking Rename button, existing account will be renamed.
-
-![Account]({{docs_base_url}}/assets/img/articles/Selection_029.png)
-
-Following is how renamed account will appear in the Chart of Account master.
-
-![New Account]({{docs_base_url}}/assets/img/articles/Selection_030.png)
-  
+On clicking Rename, you will get field to enter New Name. After entering new name for the Account, click on the "Rename" button.

+<img alt="Renamed Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account-2.gif">

 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/using-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -7,3 +7,4 @@ assignment
 tags
 articles
 pos-view
+multilingual_print_format
--- a/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
@@ -0,0 +1,50 @@
+####What is Multlingual Print Format?
+
+User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
+
+####How does it work?
+Set print language for customer, supplier on their respective form.
+
+`Selling -> Customer -> Customer List -> Click on New`
+
+Here user has set default language for customer Adalbert as <b>deutsch</b>.
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/set_customer_default_lang.png" class="screenshot">
+
+`Buying -> Supplier -> Supplier List -> Click on New`
+
+Here user has set default language for supplier Piero as <b>Italiano</b>.
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/set_supplier_default_lang.png" class="screenshot">
+
+When user click on print icon on the document, system will load the print preview in their default language.
+
+Customer quotation standard print preview in customer's default language.
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/customer_quotation.png" class="screenshot">
+
+Supplier quotation standard print preview in supplier's default language.
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/supplier_quotation.png" class="screenshot">
+
+####What to do if want to print with another language?
+
+User can have option to select alternate language on print view.
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/alternate_language.png" class="screenshot">
+
+
+####Custom Translation
+
+User can set their custom translations using translation form. For example user want to set description of the product in customer's language(Italiano). For that create new translation with language as Italiano, enter source data and Translated information.
+
+`Setup -> Settings -> Translation List -> Click on New`
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/translation.png" class="screenshot">
+
+The translation is applied when user select language as Italiano on supplier quotation's print prieview.
+
+<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/custom_translation.png" class="screenshot">
+
+
+
+
--- a/erpnext/docs/user/manual/es/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/es/accounts/accounting-entries.md
@@ -0,0 +1,73 @@
+<!---
+WORK IN PROGRESS
+-->
+
+El concepto de contabilidad se explica con el siguiente ejemplo: Se toma a 
+"Tea Stall" como compañía y se observa como registrar entradas contables
+para el negocio. 
+
+  * Mama (El propietario de Tea-stall) invierte $25000 para iniciar el negocio.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-1.png)
+
+__Análisis:__ Mama invierte 25000 en la compañía, con la esperanza de obtener alguna
+ganancia. En otras palabras, la compañía es responsable del pago de $25000 a mama en 
+el futuro. Así, la cuenta "Mama" es una cuenta de pasivo y es un crédito. El balance de
+efectivo de la compañía se incrementa debido a la inversión, "Caja" es un activo de
+la compañía y debe ser debitado.
+
+  * La compañía necesita equipos (Estufa, tetera, pocillos, etc) y materias primas (te, 
+  azucar, leche, etc) de inmediato. Decide comprar en una tienda cercana "Super Bazaar"
+  que pertenece a un amigo y le concede cierto crédito. Los equipos cuestan 2800 y las
+  materias primas valen 2200. La compañía paga 2000 de un total de 5000.
+  
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-2.png)
+
+__Análisis:__ Los equipos son "Activos Fijos" (porque tienen una larga vida útil) de la
+compañía y las materias primas son "Activos corrientes" (porque son usados en la 
+operación diaria del negocio). Entonces, "Equipos" y "Existencias disponibles" deben
+ser debitadas para incrementar su valor. La compañía pagó 2000, entonces la cuenta
+"Caja" debe ser reducida en dicha cantidad, es decir debe ser crédito. Y dado que la
+compañía tiene la obligación de pagar 3000 a "Super Bazaar", dicha cuenta debe tener
+un crédito de 3000.
+
+
+  * Mama (quien está pendiente de todas las entradas)decide anotar las ventas al finalizar
+  cada día, de tal manera que pueda analizar las ventas diarias. Al finaliza el primer
+  día, Tea Stall vende 325 tazas de té, lo cual da una venta neta de RS. 1575. El propietario
+  registra feliz su primer día de ventas.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-3.png)
+
+__Análisis:__ Los ingresos han sido anotados en la cuenta "Ventas de Té", la cual se 
+debita para incrementar el valor y la misma cantidad se acredita de la cuenta
+"Caja". Digamos, para hacer 325 tazas de té cuestan Rs 800, entonces la 
+cuenta "Existencias disponibles" debe ser reducidas (crédito) en 800 y el gasto
+debe ser registado en la cuenta "Costos de bienes vendidos" en la misma cantidad.
+
+Al finalizar el mes, la compañía paga el arriendo del local (5000) y el salario de
+un empleado (8000), el cual trabajó desde el primer día.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-4.png)
+
+### Registro de ganancias
+
+A medida que avanza el mes, la compañía compra más materias primas para el negocio.
+Después de un mes se anotan las ganancias en el "Libro de Balance" y en el de 
+"Estado de Pérdidas y Ganancias". Ya que las ganacias pertenecen a Mama y no a
+la compañía, se considera que dichas ganacias son una obligación (la compañía tiene
+que pagárselas a Mama). Cuando el Libro de Balance no está balanceado, p.e. el
+débito no es igual al crédito, la ganacia aún no ha sido anotada. Se debe realziar
+la siguiente entrada:
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-5.png)
+
+Explicación: Las ventas y gastos netos son 40000 y 20000 respectivamente.
+Entonces, la compañía tuvo una ganancia de 20000. Para registrar esa entrada,
+la cuenta "Pérdidas y Ganancias" debe ser debitada y la cuenta "Capital"
+debe ser acreditada. El balance neto de caja es 44000 y existe alguna materia
+prima que vale $1000.
+
+**Trabajo en progreso.**
+
+{next}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rushabh Mehta	2c8dc1d273	Merge branch 'develop'	2016-03-03 13:02:23 +05:30
Rushabh Mehta	a8d04b11c3	bumped to version 6.24.2	2016-03-03 13:32:23 +06:00
Rushabh Mehta	756e518bc1	[fix] recurring	2016-03-03 13:00:30 +05:30
Rushabh Mehta	c72267b98b	Merge pull request #4919 from agusputra/patch-24 Update item-price.md	2016-03-03 11:30:01 +05:30
Rushabh Mehta	526f042bb7	Merge pull request #4915 from jayala/patch-1 Update concepts-and-terms.md	2016-03-03 11:29:54 +05:30
Rushabh Mehta	a289ab75bf	Merge branch 'develop'	2016-03-03 11:27:42 +05:30
Rushabh Mehta	14b83cf391	bumped to version 6.24.1	2016-03-03 11:57:42 +06:00
Rushabh Mehta	d627af2c97	[translations]	2016-03-03 11:25:46 +05:30
Rushabh Mehta	fe3f78b0f6	Merge branch 'develop'	2016-03-03 11:05:22 +05:30
Rushabh Mehta	cf6b786950	bumped to version 6.24.0	2016-03-03 11:35:22 +06:00
Rushabh Mehta	a12eb686a5	[change-log] 6.24.0	2016-03-03 11:03:38 +05:30
Rushabh Mehta	07263462f6	[minor] add translated get_formatted	2016-03-03 10:48:45 +05:30
Rushabh Mehta	69cfab8559	[fix] [patch] recurring	2016-03-03 10:37:45 +05:30
Agus Syahputra	32362f14f4	Update item-price.md	2016-03-03 08:03:59 +07:00
Jesús Ayala	18bfad5a66	Update concepts-and-terms.md	2016-03-02 10:05:45 -03:00
Rushabh Mehta	5839a8d7f0	[fixes] usability cleanup of recurring document and added explicit submit_on_creation	2016-03-02 17:51:52 +05:30
Rushabh Mehta	f1ad694356	Merge pull request #4912 from ShashaQin/patch-31 minor improvement on item query	2016-03-02 16:19:21 +05:30
Rushabh Mehta	aac4dcedc8	[fix] print language and contact_email fields and removed translations	2016-03-02 15:45:09 +05:30
Rushabh Mehta	b0f0aaf5b1	[minor] added chart of accounts, cost centers buttons on Company	2016-03-02 13:08:40 +05:30
Rushabh Mehta	fe6eadfe22	[cleanup] job opening and job applicant	2016-03-02 12:53:19 +05:30
ShashaQin	425ab6bb1e	Update queries.py	2016-03-02 13:07:58 +08:00
Rushabh Mehta	cbed331047	Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test Multilingual print format test	2016-03-01 17:10:50 +05:30
rohitwaghchaure	4151e3dc92	[enhancement] Multi-lingual print format	2016-03-01 16:33:08 +05:30
Rushabh Mehta	6020e9ceb3	Merge pull request #4906 from smorele/doc_fixes fixe broken links	2016-03-01 16:15:56 +05:30
Rushabh Mehta	5b9d6494a6	Merge pull request #4900 from rmehta/minor-fixes [minor] fix notification for material request, splash icon, cleanup project form layout	2016-03-01 16:15:25 +05:30
Rushabh Mehta	e670525c55	Merge pull request #4899 from nabinhait/seriailized_stock_valuation Seriailized stock valuation	2016-03-01 16:13:09 +05:30
Rushabh Mehta	39a6f804bf	Merge pull request #4871 from ShashaQin/patch-27 Improvements about recurring documents	2016-03-01 16:06:33 +05:30
Rushabh Mehta	ddeb576d52	Merge pull request #4849 from rasos/patch-1 Create at_austria_chart_Einheitskontenrahmen.json	2016-03-01 16:05:13 +05:30
smorele	0a58d9e0f4	fixe broken links	2016-03-01 09:53:23 +01:00
Rushabh Mehta	7bdd9979aa	Merge pull request #4905 from KanchanChauhan/web-forms [fix] added web form fixtures	2016-03-01 11:42:40 +05:30
Kanchan Chauhan	1f3d5b7ee9	[fix] added web form fixtures	2016-03-01 11:33:49 +05:30
Rushabh Mehta	45fd073094	Merge pull request #4897 from agusputra/patch-23 Update withdrawing-salary-from-owners-equity-account.md	2016-02-29 17:35:18 +05:30
Rushabh Mehta	980a00d9d7	Merge pull request #4892 from agusputra/patch-22 Update update-stock-option-in-sales-invoice.md	2016-02-29 17:34:54 +05:30
Rushabh Mehta	95ffe3bc7b	[docs] added work-in-progress for Spanish manual	2016-02-29 17:22:25 +05:30
paulocoronado	18d465dc0d	Adding WORK IN PROGRESS	2016-02-29 17:22:25 +05:30
paulocoronado	23ef60a467	work in progress Spanish Transalation	2016-02-29 17:22:24 +05:30
paulocoronado	8f6b1e0549	Páginas de inicio de la traducción al español. First commit of Spanish translation	2016-02-29 17:22:24 +05:30
Rushabh Mehta	ae7dc31d14	Merge pull request #4846 from KanchanChauhan/job-applicant Added feature to allow people to apply for job from website	2016-02-29 17:22:01 +05:30
Rushabh Mehta	aabefe4b7c	Merge branch 'develop'	2016-02-29 14:50:54 +05:30
Rushabh Mehta	6fa497c87a	bumped to version 6.23.7	2016-02-29 15:20:54 +06:00
Rushabh Mehta	a4decc2c59	[minor] [test] fix for leap year	2016-02-29 14:44:20 +05:30
Rushabh Mehta	f1083c9a74	[minor] fix messages in material request	2016-02-29 14:38:25 +05:30
Rushabh Mehta	e1f68b9904	Merge pull request #4901 from nabinhait/time_log_overlap_fix [fix] Time Log overlap validation and test cases	2016-02-29 14:16:59 +05:30
Nabin Hait	94a1f3eb90	[fix] Time Log overlap validation and test cases	2016-02-29 13:15:27 +05:30
Nabin Hait	5a4c7d3b62	[patch] repost valuation rate for serialized items	2016-02-29 12:07:42 +05:30
Nabin Hait	2620bf402f	[fix] Stock Valuation for serialized items	2016-02-29 12:07:42 +05:30
Agus Syahputra	1b28f58829	Update withdrawing-salary-from-owners-equity-account.md	2016-02-29 08:04:02 +07:00
Agus Syahputra	034fcb3410	Update update-stock-option-in-sales-invoice.md	2016-02-28 11:49:00 +07:00
Rushabh Mehta	4403853828	[minor] fix notification for material request, splash icon, cleanup project form layout	2016-02-27 16:24:34 +05:30
ShashaQin	8d1dea6aad	Update recurring_document.py	2016-02-27 14:00:58 +08:00
Nabin Hait	f34e63123f	Merge pull request #4877 from agusputra/patch-18 Update period-closing-voucher.md	2016-02-27 10:11:20 +05:30
Nabin Hait	598c9c4679	Merge pull request #4884 from umairsy/feb-2nd updated manual	2016-02-27 10:10:34 +05:30
Nabin Hait	2174790545	Merge pull request #4886 from saurabh6790/add_projected_qty_on_quotation [fixes] set projected qty in Quotaion Item table	2016-02-27 10:04:20 +05:30
Nabin Hait	f9103b1b0b	Merge pull request #4887 from sbkolate/patch-3 enable uom in BOM Table View	2016-02-27 10:02:59 +05:30
Nabin Hait	e0cc597f70	Merge pull request #4888 from agusputra/patch-19 Update freeze-accounting-entries.md	2016-02-27 10:02:24 +05:30
Nabin Hait	ab40cd8d08	Merge pull request #4889 from agusputra/patch-21 Update managing-transactions-in-multiple-currency.md	2016-02-27 10:02:10 +05:30
Agus Syahputra	8fa6f79f7e	Update managing-transactions-in-multiple-currency.md	2016-02-27 07:22:50 +07:00
Agus Syahputra	f7face6384	Update freeze-accounting-entries.md	2016-02-27 07:08:20 +07:00
Anand Doshi	3ef8d066b9	Merge branch 'develop'	2016-02-26 20:58:26 +05:30
Anand Doshi	18e988e4ce	bumped to version 6.23.6	2016-02-26 21:28:26 +06:00
Anand Doshi	7b52dc9f32	[hotfix] added back comment_feed_communication patch	2016-02-26 20:51:33 +05:30
sbkolate	a897882434	enable uom in BOM Table View reference https://discuss.erpnext.com/t/uom-in-item-tables/10733/4	2016-02-26 19:32:11 +05:30
Saurabh	cc7132763f	[fixes] set projected qty in Quotaion Item table	2016-02-26 18:33:53 +05:30
Nabin Hait	593bfddb74	Merge branch 'develop'	2016-02-26 17:34:46 +05:30
Nabin Hait	658b3260c2	bumped to version 6.23.5	2016-02-26 18:04:46 +06:00
Nabin Hait	6c30972931	Merge pull request #4883 from nabinhait/time_log_fix [fix] Time log overlap validation	2016-02-26 17:33:11 +05:30
Umair Sayyed	d1029b54c2	updated manual	2016-02-26 17:32:44 +05:30
Nabin Hait	56f7fa66ad	[fix] Time log overlap validation	2016-02-26 17:19:11 +05:30
Nabin Hait	bdf0f0a08d	[fix] Show debit note button in purchase invoice	2016-02-26 16:26:28 +05:30
Nabin Hait	8f810c55d2	Merge branch 'develop'	2016-02-26 15:21:02 +05:30
Nabin Hait	eb0c08f328	bumped to version 6.23.4	2016-02-26 15:51:02 +06:00
Nabin Hait	c37c7ed5c6	Merge pull request #4881 from nabinhait/develop [fix] Show credit note button in sales invoice	2016-02-26 15:18:52 +05:30
Nabin Hait	0f6eac3b35	[fix] Show credit note button in sales invoice	2016-02-26 13:01:32 +05:30
Agus Syahputra	91bd4ce3e1	Update period-closing-voucher.md	2016-02-26 07:45:14 +07:00
ShashaQin	ed71e6cea6	Update test_recurring_document.py	2016-02-25 15:47:25 +08:00
ShashaQin	5afca21571	Update test_recurring_document.py	2016-02-25 15:21:14 +08:00
ShashaQin	6071ddc3dd	Update recurring_document.py	2016-02-25 11:25:24 +08:00
ShashaQin	73c71f9dd5	Update sales_order.json	2016-02-25 11:22:27 +08:00
ShashaQin	2f0a14bda0	Update purchase_order.json	2016-02-25 11:19:56 +08:00
ShashaQin	ae629ad29f	Update purchase_invoice.json	2016-02-25 11:17:13 +08:00
ShashaQin	02a38e8b5e	Update sales_invoice.json Add 'Notify by Email' check box and set next_date can be changed by user	2016-02-25 11:13:19 +08:00
saurabh	64ec677cf7	deleted extra doctype	2016-02-24 01:07:49 +05:30
saurabh	42d5d8390d	Resolved conflicts	2016-02-23 13:15:02 +05:30
saurabh	fb71f32ebf	conflicts resolved	2016-02-23 02:26:37 +05:30
saurabh	2e2dd0fb42	Documentation of multilingual print format and minor fixes	2016-02-23 02:17:04 +05:30
rohit waghchaure	da321b44cb	removed translator	2016-02-23 02:17:04 +05:30
saurabh	9364f35a2c	fixed issue of stock_uom translator	2016-02-23 02:17:04 +05:30
saurabh	724b4b17a5	changed method to set code of language	2016-02-23 02:17:03 +05:30
saurabh	fbcf44657c	test case for translation doctype	2016-02-23 02:17:03 +05:30
saurabh	c422c23813	import method to load all languages in language field on customer form	2016-02-23 02:17:03 +05:30
saurabh	f703198082	replaced methd	2016-02-23 02:17:03 +05:30
saurabh	ca3e7152d6	removed add fetch method	2016-02-23 02:17:03 +05:30
saurabh	8e49951821	fetch customer or supplier language and set on sales and purchase flow's form	2016-02-23 02:17:03 +05:30
saurabh	65820ed013	added new field language for users	2016-02-23 02:17:03 +05:30
saurabh	533a0f6527	created new file	2016-02-23 02:17:03 +05:30
saurabh	60def66644	added translator into print format	2016-02-23 02:17:02 +05:30
saurabh	24358db7bf	changed fieldname from print_language to language	2016-02-23 02:17:02 +05:30
saurabh	648fd33576	removed languages filled methods, added this methods into new file	2016-02-23 02:17:02 +05:30
saurabh	5265aa43e4	added add_fetch method	2016-02-23 02:17:02 +05:30
saurabh	4db3b3cf1e	removed add_fetch method	2016-02-23 02:17:02 +05:30
saurabh	29d77be648	pulled languages into the field print language	2016-02-23 02:17:02 +05:30
saurabh	cc7c9e4d0f	on selection of supplier pulled default print language	2016-02-23 02:17:02 +05:30
saurabh	b1efceccd4	added field print languages	2016-02-23 02:17:02 +05:30
Roland	ed2849adf9	Create at_austria_chart_Einheitskontenrahmen.json Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.	2016-02-22 09:26:54 +01:00
Kanchan Chauhan	49c4aa6ce3	Minor fix	2016-02-19 17:36:52 +05:30
Kanchan Chauhan	2e8cc89e34	Added webform for Job Opening	2016-02-19 17:31:13 +05:30
rohit waghchaure	ff321763cf	removed translator	2016-02-19 12:02:02 +05:30
saurabh	5a265408a3	fixed issue of stock_uom translator	2016-02-19 11:46:29 +05:30
saurabh	c26c6c368c	changed method to set code of language	2016-02-19 11:46:29 +05:30
saurabh	f1949781d6	test case for translation doctype	2016-02-19 11:46:29 +05:30
saurabh	755fefbfd4	import method to load all languages in language field on customer form	2016-02-19 11:46:29 +05:30
saurabh	3c2a10bf9f	replaced methd	2016-02-19 11:46:28 +05:30
saurabh	49c9746816	removed add fetch method	2016-02-19 11:46:28 +05:30
saurabh	c2dae35966	fetch customer or supplier language and set on sales and purchase flow's form	2016-02-19 11:46:28 +05:30
saurabh	a1c3ea2f86	added new field language for users	2016-02-19 11:46:28 +05:30
saurabh	3dcd4f3682	created new file	2016-02-19 11:46:28 +05:30
saurabh	a6f57e1c4b	added translator into print format	2016-02-19 11:46:28 +05:30
saurabh	2192ffe5af	changed fieldname from print_language to language	2016-02-19 11:46:28 +05:30
saurabh	6b6977a090	removed languages filled methods, added this methods into new file	2016-02-19 11:46:28 +05:30
saurabh	c14f2c29b9	added add_fetch method	2016-02-19 11:46:27 +05:30
saurabh	5d45176a1d	removed add_fetch method	2016-02-19 11:46:27 +05:30
saurabh	b4079095fb	pulled languages into the field print language	2016-02-19 11:46:27 +05:30
saurabh	3ec7649bae	on selection of supplier pulled default print language	2016-02-19 11:46:27 +05:30
saurabh	844cb5c810	added field print languages	2016-02-19 11:46:27 +05:30