Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait 2013-07-11 12:34:43 +05:30
commit d9fd9f567e
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -52,7 +52,6 @@ class DocType(BuyingController):
self.pr_required() self.pr_required()
self.check_active_purchase_items() self.check_active_purchase_items()
self.check_conversion_rate() self.check_conversion_rate()
self.validate_bill_no_date()
self.validate_bill_no() self.validate_bill_no()
self.validate_credit_acc() self.validate_credit_acc()
self.clear_unallocated_advances("Purchase Invoice Advance", "advance_allocation_details") self.clear_unallocated_advances("Purchase Invoice Advance", "advance_allocation_details")
@ -160,10 +159,6 @@ class DocType(BuyingController):
else: else:
if not self.doc.remarks: if not self.doc.remarks:
self.doc.remarks = "No 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): def validate_credit_acc(self):
acc = sql("select debit_or_credit, is_pl_account from tabAccount where name = %s", acc = sql("select debit_or_credit, is_pl_account from tabAccount where name = %s",

2
home/page/latest_updates/latest_updates.js
View File

@ -21,7 +21,7 @@ wn.pages['latest-updates'].onload = function(wrapper) {
var $tbody = $('<table class="table table-bordered"><tbody></tbody></table>') var $tbody = $('<table class="table table-bordered"><tbody></tbody></table>')
.appendTo(parent).find("tbody"); .appendTo(parent).find("tbody");
$.each(r.message, function(i, log) { $.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, log.message = log.message.replace(/(\[[^\]]*\])/g,
function(match, p1, offset, string) { function(match, p1, offset, string) {
match = match.toLowerCase(); match = match.toLowerCase();

6
public/js/startup.css
View File

@ -19,12 +19,6 @@ span, div, td, input, textarea, button, select {
text-align: center; 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 { .expiry-info {
margin-top: 40px; margin-top: 40px;
margin-bottom: -40px; margin-bottom: -40px;