nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging perpetual branch into master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-24 14:36:55 +05:30
parent 66adb3c0cf 2b9cfcbe0b
commit 11f41955c9
107 changed files with 2671 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
startup/report_data_map.py
View File

@@ -36,7 +36,6 @@ data_map = {
"GL Entry": {
"columns": ["name", "account", "posting_date", "cost_center", "debit", "credit",
"is_opening", "company", "voucher_type", "voucher_no", "remarks"],
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
"order_by": "posting_date, account",
"links": {
"account": ["Account", "name"],
@@ -81,7 +80,6 @@ data_map = {
"columns": ["name", "posting_date", "posting_time", "item_code", "warehouse",
"actual_qty as qty", "voucher_type", "voucher_no", "project",
"ifnull(incoming_rate,0) as incoming_rate", "stock_uom", "serial_no"],
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
"order_by": "posting_date, posting_time, name",
"links": {
"item_code": ["Item", "name"],