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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2017-04-12 19:00:52 +05:30
commit 17c675547d
10 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -38,6 +38,14 @@ The ERPNext code is licensed as GNU General Public License (v3) and the Document
---
## Contributing
1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Pull-Request-Guidelines)
1. [Translations](https://translate.erpnext.com)
1. [Chart of Accounts](https://charts.erpnext.com)
---
## Logo and Trademark
The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
__version__ = '8.0.9'
__version__ = '8.0.10'
def get_default_company(user=None):
'''Get default company for user'''

3
erpnext/accounts/doctype/sales_invoice/pos.py
View File

@ -296,9 +296,9 @@ def make_invoice(doc_list={}, email_queue_list={}, customers_list={}):
if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
validate_records(doc)
si_doc = frappe.new_doc('Sales Invoice')
si_doc.due_date = doc.get('posting_date')
si_doc.offline_pos_name = name
si_doc.update(doc)
si_doc.due_date = doc.get('posting_date')
submit_invoice(si_doc, name, doc)
name_list.append(name)
else:
@ -404,4 +404,5 @@ def save_invoice(e, si_doc, name):
if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
si_doc.docstatus = 0
si_doc.flags.ignore_mandatory = True
si_doc.due_date = si_doc.posting_date
si_doc.insert()

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -7,7 +7,7 @@
"beta": 0,
"creation": "2013-05-24 19:29:05",
"custom": 0,
"default_print_format": "Sample Print",
"default_print_format": "",
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
@ -4417,8 +4417,8 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2017-04-10 12:03:47.510384",
"modified_by": "Administrator",
"modified": "2017-04-12 15:11:45.931485",
"modified_by": "faris@erpnext.com",
"module": "Accounts",
"name": "Sales Invoice",
"owner": "Administrator",

2
erpnext/controllers/selling_controller.py
View File

@ -203,7 +203,7 @@ class SellingController(StockController):
if p.parent_detail_docname == d.name and p.parent_item == d.item_code:
# the packing details table's qty is already multiplied with parent's qty
il.append(frappe._dict({
'warehouse': p.warehouse,
'warehouse': p.warehouse or d.warehouse,
'item_code': p.item_code,
'qty': flt(p.qty),
'uom': p.uom,

2
erpnext/controllers/website_list_for_contact.py
View File

@ -18,7 +18,7 @@ def get_list_context(context=None):
"get_list": get_transaction_list
}
def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20):
def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="modified"):
from frappe.www.list import get_list
user = frappe.session.user
key = None

2
erpnext/projects/doctype/project/project.py
View File

@ -214,7 +214,7 @@ def get_timeline_data(doctype, name):
and docstatus < 2
group by date(from_time)''', name))
def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20):
def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
return frappe.db.sql('''select distinct project.*
from tabProject project, `tabProject User` project_user
where

2
erpnext/schools/doctype/fees/fees.py
View File

@ -18,7 +18,7 @@ class Fees(Document):
self.total_amount += d.amount
self.outstanding_amount = self.total_amount
def get_fee_list(doctype, txt, filters, limit_start, limit_page_length=20):
def get_fee_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
user = frappe.session.user
student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
if student:

14
erpnext/templates/includes/projects/project_search_box.html
View File

@ -1,19 +1,19 @@
<div class="project-search text-muted pull-right">
<input type="text" id="project-search" placeholder="Quick Search">
<i class="octicon octicon-search"></i>
<input type="text" id="project-search" placeholder="Quick Search">
<i class="octicon octicon-search"></i>
</div>
<div class="clearfix pull-right" style="width:300px;">
<h4 class="project-search-results pull-left"></h4>
<p class="pull-right">
<a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted clear" title="Clear Search" ></a>
</p>
<h4 class="project-search-results pull-left"></h4>
<p class="pull-right">
<a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted clear" title="Clear Search" ></a>
</p>
</div>
<script>
frappe.ready(function() {
if(get_url_arg("q")){
var txt = get_url_arg("q");
$(".project-search-results").html("Search results for : " + txt);
$(".project-search-results").html("Search results for : " + encodeURIComponent(txt));
$(".clear").toggle(true);
}
var thread = null;

2
erpnext/templates/pages/product_search.html
View File

@ -10,7 +10,7 @@
<script>
frappe.ready(function() {
var txt = get_url_arg("search");
$(".search-results").html("{{ _('Search results for') }}: " + txt);
$(".search-results").html("{{ _('Search results for') }}: " + encodeURIComponent(txt));
window.search = txt;
window.start = 0;
window.get_product_list();