nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into perpetual

Browse Source
This commit is contained in:
Nabin Hait
2013-08-02 11:53:00 +05:30
parent 0dd7be14fa a1ad6e14ae
commit bbe1448fca
24 changed files with 149 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/pos_setting/pos_setting.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
"modified": "2013-07-26 11:16:53",
"modified": "2013-08-01 16:50:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -81,7 +81,6 @@
"reqd": 1
},
{
"default": "1",
"doctype": "DocField",
"fieldname": "conversion_rate",
"fieldtype": "Float",

3
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-07-25 16:08:44",
"modified": "2013-08-01 16:49:49",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -223,7 +223,6 @@
"read_only": 0
},
{
"default": "1",
"description": "The rate at which Bill Currency is converted into company's base currency",
"doctype": "DocField",
"fieldname": "conversion_rate",

16
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -93,12 +93,18 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
wn.model.map_current_doc({
method: "stock.doctype.delivery_note.delivery_note.make_sales_invoice",
source_doctype: "Delivery Note",
get_query_filters: {
docstatus: 1,
customer: cur_frm.doc.customer || undefined,
company: cur_frm.doc.company
get_query: function() {
var filters = {
docstatus: 1,
company: cur_frm.doc.company
};
if(cur_frm.doc.customer) filters["customer"] = cur_frm.doc.customer;
return {
query: "controllers.queries.get_delivery_notes_to_be_billed",
filters: filters
};
}
})
});
});
// cur_frm.add_custom_button(wn._("POS View"), function() {

10
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -975,10 +975,12 @@ def make_delivery_note(source_name, target_doclist=None):
bean = webnotes.bean(target)
bean.run_method("onload_post_render")
def update_item(obj, target, source_parent):
target.amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)
target.export_amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)
target.qty = flt(obj.qty) - flt(obj.delivered_qty)
def update_item(source_doc, target_doc, source_parent):
target_doc.amount = (flt(source_doc.qty) - flt(source_doc.delivered_qty)) * \
flt(source_doc.basic_rate)
target_doc.export_amount = (flt(source_doc.qty) - flt(source_doc.delivered_qty)) * \
flt(source_doc.export_rate)
target_doc.qty = flt(source_doc.qty) - flt(source_doc.delivered_qty)
doclist = get_mapped_doclist("Sales Invoice", source_name, {
"Sales Invoice": {

2
accounts/page/voucher_import_tool/voucher_import_tool.js
View File

@@ -33,7 +33,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) {
callback: function(fid, filename, r) {
wrapper.waiting.toggle(false);
$(wrapper).find(".messages").toggle(true).html(
r.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))
r.message.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))
}
});

9
accounts/report/purchase_register/purchase_register.py
View File

@@ -43,7 +43,7 @@ def execute(filters=None):
purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
row = [inv.name, inv.posting_date, inv.supplier_name, inv.credit_to,
row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, inv.credit_to,
account_map.get(inv.credit_to), ", ".join(project_name), inv.bill_no, inv.bill_date,
inv.remarks, ", ".join(purchase_order), ", ".join(purchase_receipt)]
@@ -76,9 +76,10 @@ def execute(filters=None):
def get_columns(invoice_list):
"""return columns based on filters"""
columns = [
"Invoice:Link/Purchase Invoice:120", "Posting Date:Date:80", "Supplier::120",
"Supplier Account:Link/Account:120", "Account Group:LInk/Account:120",
"Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150",
"Invoice:Link/Purchase Invoice:120", "Posting Date:Date:80", "Supplier Id::120",
"Supplier Name::120", "Supplier Account:Link/Account:120",
"Account Group:LInk/Account:120", "Project:Link/Project:80", "Bill No::120",
"Bill Date:Date:80", "Remarks::150",
"Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100"
]
expense_accounts = tax_accounts = expense_columns = tax_columns = []

10
accounts/report/sales_register/sales_register.py
View File

@@ -43,7 +43,7 @@ def execute(filters=None):
sales_order = list(set(invoice_so_dn_map.get(inv.name, {}).get("sales_order", [])))
delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])))
row = [inv.name, inv.posting_date, inv.customer_name, inv.debit_to,
row = [inv.name, inv.posting_date, inv.customer, inv.customer_name, inv.debit_to,
account_map.get(inv.debit_to), customer_map.get(inv.customer), inv.project_name,
inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)]
@@ -76,10 +76,10 @@ def execute(filters=None):
def get_columns(invoice_list):
"""return columns based on filters"""
columns = [
"Invoice:Link/Sales Invoice:120", "Posting Date:Date:80", "Customer::120",
"Customer Account:Link/Account:120", "Account Group:LInk/Account:120",
"Territory:Link/Territory:80", "Project:Link/Project:80",
"Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100"
"Invoice:Link/Sales Invoice:120", "Posting Date:Date:80", "Customer Id::120",
"Customer Name::120", "Customer Account:Link/Account:120", "Account Group:LInk/Account:120",
"Territory:Link/Territory:80", "Project:Link/Project:80", "Remarks::150",
"Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100"
]
income_accounts = tax_accounts = income_columns = tax_columns = []