Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py
index ca13458..6d18eae 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -52,7 +52,6 @@
self.pr_required()
self.check_active_purchase_items()
self.check_conversion_rate()
- self.validate_bill_no_date()
self.validate_bill_no()
self.validate_credit_acc()
self.clear_unallocated_advances("Purchase Invoice Advance", "advance_allocation_details")
@@ -160,10 +159,6 @@
else:
if not self.doc.remarks:
self.doc.remarks = "No Remarks"
-
- def validate_bill_no_date(self):
- if self.doc.bill_no and not self.doc.bill_date and self.doc.bill_no.lower().strip() not in ['na', 'not applicable', 'none']:
- msgprint(_("Please enter Bill Date"), raise_exception=1)
def validate_credit_acc(self):
acc = sql("select debit_or_credit, is_pl_account from tabAccount where name = %s",
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 60539db..dd96f46 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -21,7 +21,7 @@
var $tbody = $('<table class="table table-bordered"><tbody></tbody></table>')
.appendTo(parent).find("tbody");
$.each(r.message, function(i, log) {
- if(log.message.indexOf("minor")===1 && log.message.indexOf("[")!==-1) {
+ if(log.message.indexOf("minor")===-1 && log.message.indexOf("[")!==-1) {
log.message = log.message.replace(/(\[[^\]]*\])/g,
function(match, p1, offset, string) {
match = match.toLowerCase();
diff --git a/public/js/startup.css b/public/js/startup.css
index a4da59c..2506868 100644
--- a/public/js/startup.css
+++ b/public/js/startup.css
@@ -19,12 +19,6 @@
text-align: center;
}
-/*extra size menus for recent*/
-.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
- min-width: 160px !important;
- max-width: 260px !important;
-}
-
.expiry-info {
margin-top: 40px;
margin-bottom: -40px;