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

Merge pull request #22184 from deepeshgarg007/item-wise-report-export

Browse Source 
fix: Item-wise sales and purchase register export
This commit is contained in:
Deepesh Garg 2020-06-10 18:48:35 +05:30 committed by GitHub
commit 6e0d6bd74c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -265,13 +265,6 @@ def get_columns(additional_table_columns, filters):
'fieldtype': 'Currency',
'options': 'currency',
'width': 100
},
{
'fieldname': 'currency',
'label': _('Currency'),
'fieldtype': 'Currency',
'width': 80,
'hidden': 1
}
]

16
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -223,7 +223,7 @@ def get_columns(additional_table_columns, filters):
}
]
if filters.get('group_by') != 'Terriotory':
if filters.get('group_by') != 'Territory':
columns.extend([
{
'label': _("Territory"),
@ -304,13 +304,6 @@ def get_columns(additional_table_columns, filters):
'fieldtype': 'Currency',
'options': 'currency',
'width': 100
},
{
'fieldname': 'currency',
'label': _('Currency'),
'fieldtype': 'Currency',
'width': 80,
'hidden': 1
}
]
@ -536,6 +529,13 @@ def get_tax_accounts(item_list, columns, company_currency,
'fieldtype': 'Currency',
'options': 'currency',
'width': 100
},
{
'fieldname': 'currency',
'label': _('Currency'),
'fieldtype': 'Currency',
'width': 80,
'hidden': 1
}
]