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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-04-13 12:37:23 +05:30
commit 800b214ff3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/all-app.css
View File

@ -334,7 +334,7 @@ div.notice {
div.form-title {
/*background-color: #e0eeff;*/
padding: 5px 19px 15px 19px;
padding: 5px 11px 15px 11px;
margin: -15px -15px 0px -15px;
border-bottom: 1px solid #eee;
}
@ -342,7 +342,7 @@ div.form-title {
div.form-section-head {
margin: 11px -15px 3px -15px;
border-top: 1px solid #ccc;
padding: 11px 23px 0px 23px;
padding: 11px 15px 0px 15px;
}
div.form-layout-row:first-child .form-section-head {

8
erpnext/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2012-04-03 12:49:52',
'creation': '2012-04-11 13:16:55',
'docstatus': 0,
'modified': '2012-04-03 12:49:52',
'modified': '2012-04-13 12:06:15',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -15,13 +15,13 @@
'add_col': u"`tabPurchase Receipt`.`posting_date` AS 'PR Posting Date'",
'add_cond': u"`tabPurchase Invoice Item`.`purchase_receipt` = `tabPurchase Receipt`.`name`\n`tabPurchase Receipt`.`posting_date` >= '%(pr_posting_date)s'\n`tabPurchase Receipt`.`posting_date` <= '%(pr_posting_date1)s'\n`tabPurchase Receipt`.`posting_date` > `tabPurchase Invoice`.`posting_date`",
'add_tab': u'`tabPurchase Receipt`',
'columns': u'Purchase Invoice\x01ID,Purchase Invoice\x01Voucher Date,Purchase Invoice\x01Posting Date,Purchase Invoice\x01Credit To,Purchase Invoice Item\x01Rate,Purchase Invoice Item\x01Qty,Purchase Invoice Item\x01Amount,Purchase Invoice Item\x01Pur Order,Purchase Invoice Item\x01Pur Receipt',
'columns': u'Purchase Invoice\x01ID,Purchase Invoice\x01Posting Date,Purchase Invoice\x01Credit To,Purchase Invoice Item\x01Qty,Purchase Invoice Item\x01Amount,Purchase Invoice Item\x01Pur Order,Purchase Invoice Item\x01Pur Receipt',
'criteria_name': u'Purchase in Transit',
'description': u'List of PR whose posting date is after PV posting date',
'dis_filters': u'`tabPurchase Receipt`.`pr_posting_date`',
'doc_type': u'Purchase Invoice Item',
'doctype': 'Search Criteria',
'filters': u"{'Purchase Invoice\x01Submitted':1,'Purchase Invoice\x01From Posting Date\x01lower':'2009-04-01','Purchase Invoice\x01To Posting Date\x01upper':'2010-01-11','Purchase Invoice\x01Is Opening':'','Purchase Invoice\x01Fiscal Year':'','Purchase Invoice\x01Company':'','Purchase Receipt\x01From PR Posting Date\x01lower':'2009-04-01','Purchase Receipt\x01To PR Posting Date\x01upper':'2010-01-11'}",
'filters': u'{"Purchase Invoice\\u0001Submitted":1,"Purchase Invoice\\u0001Is Opening":[""],"Purchase Invoice\\u0001Fiscal Year":[""]}',
'module': u'Buying',
'name': '__common__',
'page_len': 50,

4
erpnext/setup/doctype/global_defaults/global_defaults.py
View File

@ -56,7 +56,7 @@ class DocType:
# update year start date and year end date from fiscal_year
ysd = webnotes.conn.sql("""select year_start_date from `tabFiscal Year`
where name=%s""", self.doc.fiscal_year)
where name=%s""", self.doc.current_fiscal_year)
ysd = ysd and ysd[0][0] or ''
from webnotes.utils import get_first_day, get_last_day
@ -66,4 +66,4 @@ class DocType:
get_last_day(get_first_day(ysd,0,11)).strftime('%Y-%m-%d'))
def get_defaults(self):
return webnotes.conn.get_defaults()
return webnotes.conn.get_defaults()