Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.12.3"
+__version__ = "6.12.4"

frappe/docs/current/api/utils/frappe.utils.bench_helper.html

@@ -21,7 +21,7 @@
         <a name="frappe.utils.bench_helper.app_group" href="#frappe.utils.bench_helper.app_group" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		frappe.utils.bench_helper.<b>app_group</b>
-        <i class="text-muted">(ctx, site=False, force=False, verbose=False, profile=False)</i>
+        <i class="text-muted">()</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>

frappe/docs/current/api/utils/frappe.utils.html

@@ -300,7 +300,7 @@
 		frappe.utils.<b>get_formatted_email</b>
         <i class="text-muted">(user)</i>
     </p>
-	<div class="docs-attr-desc"><p>get email id of user formatted as: John Doe <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x6a;o&#104;&#x6e;d&#x6f;&#x65;&#x40;&#101;&#120;&#97;&#109;&#112;&#x6c;&#x65;&#x2e;&#99;&#111;&#x6d;">&#x6a;o&#104;&#x6e;d&#x6f;&#x65;&#x40;&#101;&#120;&#97;&#109;&#112;&#x6c;&#x65;&#x2e;&#99;&#111;&#x6d;</a></p>
+	<div class="docs-attr-desc"><p>get email id of user formatted as: John Doe <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#x6a;&#111;hn&#x64;o&#101;&#x40;&#x65;x&#x61;&#x6d;&#112;l&#101;&#x2e;&#x63;&#111;&#x6d;">&#x6a;&#111;hn&#x64;o&#101;&#x40;&#x65;x&#x61;&#x6d;&#112;l&#101;&#x2e;&#x63;&#111;&#x6d;</a></p>
 </div>
 	<br>
 

frappe/docs/current/index.html

@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.12.2</code>
+			<code>6.12.3</code>
 		</td>
 	</tr>
 </table>

frappe/docs/current/models/email/email_account.html

@@ -158,19 +158,31 @@ Yandex.Mail</pre>
         
         <tr >
             <td>10</td>
-            <td ><code>pop3_server</code></td>
+            <td ><code>use_imap</code></td>
+            <td >
+                Check</td>
+            <td >
+                Use IMAP
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>email_server</code></td>
             <td >
                 Data</td>
             <td >
-                POP3 Server
+                Email Server
                 <p class="text-muted small">
-                    e.g. pop.gmail.com</p>
+                    e.g. pop.gmail.com / imap.gmail.com</p>
             </td>
             <td></td>
         </tr>
         
         <tr >
-            <td>11</td>
+            <td>12</td>
             <td ><code>use_ssl</code></td>
             <td >
                 Check</td>
@@ -182,7 +194,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>12</td>
+            <td>13</td>
             <td ><code>attachment_limit</code></td>
             <td >
                 Int</td>
@@ -195,7 +207,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>13</td>
+            <td>14</td>
             <td ><code>append_to</code></td>
             <td >
                 Link</td>
@@ -217,7 +229,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>15</td>
             <td ><code>default_incoming</code></td>
             <td >
                 Check</td>
@@ -230,7 +242,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr class="info">
-            <td>15</td>
+            <td>16</td>
             <td ><code>section_break_13</code></td>
             <td >
                 Section Break</td>
@@ -242,7 +254,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>17</td>
             <td ><code>notify_if_unreplied</code></td>
             <td >
                 Check</td>
@@ -254,7 +266,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>17</td>
+            <td>18</td>
             <td ><code>unreplied_for_mins</code></td>
             <td >
                 Int</td>
@@ -266,7 +278,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>19</td>
             <td ><code>send_notification_to</code></td>
             <td >
                 Small Text</td>
@@ -279,7 +291,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr class="info">
-            <td>19</td>
+            <td>20</td>
             <td ><code>outgoing_mail_settings</code></td>
             <td >
                 Section Break</td>
@@ -291,7 +303,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>21</td>
             <td ><code>enable_outgoing</code></td>
             <td >
                 Check</td>
@@ -304,7 +316,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>22</td>
             <td ><code>smtp_server</code></td>
             <td >
                 Data</td>
@@ -317,7 +329,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>23</td>
             <td ><code>use_tls</code></td>
             <td >
                 Check</td>
@@ -329,7 +341,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>24</td>
             <td ><code>smtp_port</code></td>
             <td >
                 Data</td>
@@ -342,7 +354,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>24</td>
+            <td>25</td>
             <td ><code>default_outgoing</code></td>
             <td >
                 Check</td>
@@ -355,7 +367,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>25</td>
+            <td>26</td>
             <td ><code>always_use_account_email_id_as_sender</code></td>
             <td >
                 Check</td>
@@ -368,7 +380,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr class="info">
-            <td>26</td>
+            <td>27</td>
             <td ><code>signature_section</code></td>
             <td >
                 Section Break</td>
@@ -380,7 +392,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>28</td>
             <td ><code>add_signature</code></td>
             <td >
                 Check</td>
@@ -392,7 +404,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>29</td>
             <td ><code>signature</code></td>
             <td >
                 Text Editor</td>
@@ -404,7 +416,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr class="info">
-            <td>29</td>
+            <td>30</td>
             <td ><code>auto_reply</code></td>
             <td >
                 Section Break</td>
@@ -416,7 +428,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>31</td>
             <td ><code>enable_auto_reply</code></td>
             <td >
                 Check</td>
@@ -428,7 +440,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>32</td>
             <td ><code>auto_reply_message</code></td>
             <td >
                 Text Editor</td>
@@ -441,7 +453,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr class="info">
-            <td>32</td>
+            <td>33</td>
             <td ><code>set_footer</code></td>
             <td >
                 Section Break</td>
@@ -453,7 +465,7 @@ Yandex.Mail</pre>
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>34</td>
             <td ><code>footer</code></td>
             <td >
                 Text Editor</td>

frappe/docs/user/guides/index.txt

@@ -1,5 +1,5 @@
 basics
-app_development
+app-development
 deployment
 reports-and-printing
 portal-development

frappe/geo/country_info.json

@@ -2567,7 +2567,11 @@
  },
  "Venezuela, Bolivarian Republic of": {
   "code": "ve",
-  "number_format": "#,###.##"
+  "number_format": "#.###,##",
+  "currency": "VEF",
+  "currency_symbol": "Bs.",
+  "currency_fraction": "Centimos",
+  "currency_fraction_units": 100
  },
  "Vietnam": {
   "code": "vn",

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.12.3"
+app_version = "6.12.4"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/public/css/docs.css

@@ -515,6 +515,7 @@ p {
 .fake-browser-frame {
   position: relative;
   margin: 24px auto 0px;
+  box-shadow: 0px -6px 100px 1px rgba(0, 0, 0, 0.1);
 }
 .fake-browser-frame::before {
   content: "";
@@ -524,13 +525,13 @@ p {
   left: 0px;
   right: 0px;
   border: 1px solid #d1d8dd;
-  background: #ffffff;
+  background: #f5f7fa;
   border-bottom: none;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
 }
 .fake-browser-frame::after {
-  content: '\f111  \f111  \f111';
+  content: '\f111 \00a0\00a0 \f111 \00a0\00a0 \f111';
   position: absolute;
   color: #d1d8dd;
   top: -15px;
@@ -600,3 +601,6 @@ a.edit:visited {
   color: #454e57;
   font-size: 16px;
 }
+.hero-and-content [data-html-block="hero"] {
+  overflow-y: hidden;
+}

frappe/public/css/website.css

@@ -495,7 +495,7 @@ fieldset {
   padding-bottom: 15px;
 }
 .website-list .result {
-  margin-top: 60px;
+  margin-top: 15px;
 }
 .web-list-item {
   padding: 15px 0px;
@@ -599,6 +599,9 @@ a.active {
   pointer-events: none;
   cursor: default;
 }
+.page-breadcrumbs {
+  padding-top: 20px;
+}
 .page-breadcrumbs .breadcrumb {
   padding: 0px;
   background-color: transparent;

frappe/public/less/docs.less

@@ -285,6 +285,7 @@ p {
 .fake-browser-frame {
 	position: relative;
 	margin: 24px auto 0px;
+	box-shadow: 0px -6px 100px 1px rgba(0, 0, 0, 0.1);
 }
 
 .fake-browser-frame::before {
@@ -295,14 +296,14 @@ p {
 	left: 0px;
 	right: 0px;
 	border: 1px solid #d1d8dd;
- background: #ffffff;
+	background: #f5f7fa;
 	border-bottom: none;
 	border-top-left-radius: 4px;
 	border-top-right-radius: 4px;
 }
 
 .fake-browser-frame::after {
-	content: '\f111  \f111  \f111';
+	content: '\f111 \00a0\00a0 \f111 \00a0\00a0 \f111';
 	position: absolute;
 	color: #d1d8dd;
 	top: -15px;
@@ -388,3 +389,7 @@ a.edit, a.edit:hover, a.edit:focus, a.edit:visited {
 //    width:50%;
 //   }
 // }
+
+.hero-and-content [data-html-block="hero"] {
+	overflow-y: hidden;
+}

frappe/public/less/website.less

@@ -222,7 +222,7 @@ fieldset {
 }
 
 .website-list .result {
-	margin-top: 60px;
+	margin-top: 15px;
 	// border: 1px solid @border-color;
 }
 
@@ -355,6 +355,10 @@ a.active {
 // 	background-color: #ffa;
 // }
 
+.page-breadcrumbs {
+	padding-top: 20px;
+}
+
 .page-breadcrumbs .breadcrumb {
 	padding: 0px;
 	background-color: transparent;

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.12.3"
+version = "6.12.4"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()