Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,199 Commits 3 Branches 0 Tags 1 GiB
ff878c0c1d
Commit Graph

809 Commits

Author SHA1 Message Date
Rohit Waghchaure
9d0f90975b [Fix] Consolidated financial statement report currency conversion issue 2018-11-15 12:55:20 +05:30
Rohit Waghchaure
a95697f506 Added currency filter in consolidated financial statement report 2018-11-14 19:55:44 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
deepeshgarg007
7bc6f3843a Fix for accounts Receivable Summary Showing zero values 2018-11-13 16:54:54 +05:30
rohitwaghchaure
ab76ff0836 Added new option group by voucher(consolidated) in the general ledger report (#15957) 2018-11-12 16:58:24 +05:30
Frappe Bot
1ff9c691b7 Merge branch 'staging' into develop 2018-11-09 10:21:07 +00:00
Shreya Shah
3f6eb6b393 fix: If party type is Shareholder, set appropriate name field (#15916) 2018-11-08 11:51:13 +05:30
Shreya Shah
c704630d5f fix: Return default if company not found (#15915) 2018-11-06 17:24:45 +05:30
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop 2018-11-06 11:17:24 +00:00
rohitwaghchaure
9eafe8c23e
Update financial_statements.py 2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3 fix(encoding): Fixed encoding issue in financial statements 2018-11-06 11:48:51 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop 2018-11-05 06:53:27 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes 2018-11-05 06:45:04 +00:00
Zarrar
16d45c8e2e safe encode non ascii characters (#15755) 2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9 fixed divided by zero error (#15885) 2018-11-02 12:19:05 +05:30
Charles-Henri Decultot
a89bce0b6e Encoding correction (#15877) 2018-11-01 13:18:49 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop 2018-10-31 13:51:52 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes 2018-10-31 13:43:12 +00:00
Shreya Shah
0c0e49a421 fix: Fix fieldnames in template (#15860) 2018-10-31 18:00:09 +05:30
Saurabh
6a916943aa fix(P&L): sql query 2018-10-26 13:46:52 +00:00
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop 2018-10-23 08:06:15 +00:00
Ameya Shenoy
a0e533ede5
Merge branch 'master' into staging-fixes 2018-10-22 10:37:14 +00:00
Nabin Hait
91eac5a7cf fix(report): Optimization for financial statements 2018-10-22 15:05:40 +05:30
rohitwaghchaure
e2afbb7abe
Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix 
[For staging-fixes] Fixed PDC data in AR/AP report
 2018-10-17 15:57:28 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
Ameya Shenoy
77b60928bf
Merge branch 'master' into staging-fixes 2018-10-17 09:39:31 +00:00
rohitwaghchaure
b7debc8573
Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix 
Fixed PDC data in AR/AP report
 2018-10-16 11:27:53 +05:30
rohitwaghchaure
a5a926967b
Update accounts_receivable.py 2018-10-16 11:27:23 +05:30
Bibin
7844b79274 [Bug-Fix] accounts_receivable.html (#15688) 
* Update accounts_receivable.html

In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue

* Update accounts_receivable.html
 2018-10-15 18:25:26 +05:30
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop 2018-10-15 12:25:03 +00:00
rohitwaghchaure
0d2a4c6a59 [Fix] TDS Payable Monthly report is not working (#15666) 2018-10-15 11:09:17 +05:30
deepeshgarg007
42510a411f [Bug-Fix]V11 Accounts Receivable print showing zero values (#15667) 
* Bug Fix

* Print report bug fixes
 2018-10-15 11:08:04 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
Saurabh
99c064305f Merge branch 'master' into staging-fixes 2018-10-09 17:55:33 +05:30
Shreya Shah
8a4bcefec4 fix(accounts-receivable): Column values in Print and PDF (#15621) 2018-10-08 18:34:01 +05:30
Shreya Shah
5b34d00bc0 fix(accounts-receivable): Column values in Print and PDF (#15622) 2018-10-08 18:20:51 +05:30
Ameya Shenoy
1d5dc73dfd
Merge branch 'staging' into develop 2018-10-05 09:10:30 +00:00
Shreya Shah
deb9f0e03c
Merge pull request #15594 from shreyashah115/tds-report 
Handle IndexError if no data found
 2018-10-05 14:11:43 +05:30
Shreya
0d7bd43367 Handle IndexError if no data found 2018-10-05 13:22:09 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Rohit Waghchaure
18678696db Fix issue after merging hotfix into staging-fixes 2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes 2018-10-04 09:25:07 +00:00
Shreya
cbb112f2db Fix filter error 2018-10-03 17:37:40 +05:30
deepeshgarg007
719701f2a4 Enhancement in Budget Variance and other reports (#15455) 
* Enhanced Budget Variance report and added filters and columns in other reports

* Update budget_variance_report.js

* Changes in budget variance report

* Spacing in column names
 2018-10-02 12:52:13 +05:30
Zarrar
e4c9ac3961 [Minor] Cash Flow report - custom (#15522) 
* python 2-3 fix for filter

* pass filters while fetching data to financial statement report
 2018-09-30 21:19:01 +05:30
Rohit Waghchaure
ea0ef95539 [Fix] Consolidated Financial Statement report 2018-09-28 17:05:55 +05:30
Suraj Shetty
6ea3de9521 Fix quote issues (#15497) 
* Fix quotes issues

* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
 2018-09-26 18:15:53 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more (#15475) 
* fix(payroll): multiple minor fixes related to salary structure

* Added GSTR-1 and GSTR-2 report in Accounts module page

* delete asset movement records on cancellation of Purchase Receipt

* Update consolidated_financial_statement.py

* minor fix

* minor fix

* add filters on item prices report (#15495)
 2018-09-26 18:01:00 +05:30
rohitwaghchaure
0cf0ebf08b [Refactored] Asset Depreciation Ledger report based on GL entries (#15415) 
* [Refactored] Asset Depreciation Ledger report is based on GL entries

* Provision to make manual JV from the asset if Calculate Depreciation is disabled
 2018-09-26 15:24:49 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Saurabh
75d90b9d8f a[resolved] merge-conflicts 2018-09-20 13:28:23 +05:30
Saif
772dc6e82c Various permission fixes (#15448) 
* Removed test letter head from Consolidated Financial Statement

* Removed incorrect role permissions
 2018-09-20 13:20:17 +05:30
rohitwaghchaure
550fc695f1 [Fix] Precision issue in the accounts receivable report (#15440) 2018-09-19 19:03:40 +05:30
RicardoJohann
267e806d7f added description field and changed to one filter datepicker (#15425) 2018-09-18 10:48:20 +05:30
Zlash65
2619596917 pass filters as parameter 2018-09-13 12:56:04 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Zarrar
8dade79002 return blank if no data found (#15387) 2018-09-12 14:24:23 +05:30
Saif Ur Rehman
423549e084 Fixed PDC data in AR/AP report: 
-Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared
-Get PDC data from submitted documents only
 2018-09-08 15:48:55 +05:00
Nabin Hait
3a342e8d93 fix(report): project filter in financial statement 2018-09-07 14:17:57 +05:30
Zarrar
525a005b78 TDS Monthly report & TDS Computation Summary report (#15204) 
* tds computation report added

* tds computation logic added

* minor changes to commonify code

* tds payable monthly report added

* initial logic for monthly tds calculation added

* added field for supplier type and pan

* changes related to pan and entity type

* date filter fix and cleanup
 2018-09-07 13:27:10 +05:30
Nabin Hait
b479a87031 fix(report): Cost center filters in financial statements and general ledger 2018-09-07 13:17:23 +05:30
Sanjay Kumar
1b49f3a4e7 Allow cost center in entry of balance sheet accounts (#14972) 
* Allow Cost Center In Entry of Balance Sheet Account

* Add parent cost center in get payment entry

* Add Tests for Allow Cost Center In Entry of Balance Sheet Account

* Add tests for cost center wise account and party balance

* set parent cost center in taxes

* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents

* fix Codacy and Travis issue
 2018-09-06 14:39:35 +05:30
Zarrar
2705af488d [Minor] [Staging] POS Profile (#15321) 
* update modified date to load field display_items_in_stock

* stop dialog from popping up if no loyalty program found

* warehouse not used for not is_pos type invoice
 2018-09-05 17:20:07 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Zarrar
93577665f2 [Enhance] Multiselect for Cost Center and Project (#15208) 
* add filter for Cost Center, make CC & Project multiselect field

* update queries according to project/cost_center multiselect

* add multiselect filter for cost_center and project

* update query according to multiselect
 2018-08-27 12:08:53 +05:30
Mario Monroy
fbc3df3247 Fix indentation accounts_receivable.py (#15203) 2018-08-23 11:10:15 +05:30
Bassam Ramadan
1ff2315899 Trial balance and payable accounts reports and sales return fixes (#15000) 
* adding supplier type filter to payable accounts and payable accounts summary reports

adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter

* fix trial balance opening and closing values

the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account

* fix for supplier type filter field on payable accounts reports

rename the supplier type filter field to supplier group in payable
accounts and summary reports

* fix for paid amount in returned sales invoice

the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.

* fixing trial balance values and totals

fixing trial balance opening and closing ( DR - CR ) values and totals
 2018-08-20 17:58:28 +05:30
Saif
e3947296e8 Group by Voucher fix in General Ledger Report (#15169) 
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries

* Group by Voucher show groups with totals at the end of group
 2018-08-20 17:49:29 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report 
[Fix] Consolidated balance sheet report
 2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85 [Fix] Consolidated balance sheet report 2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa rounding off fixes and conversion fix (#15140) 2018-08-14 16:28:14 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
rohitwaghchaure
88b0a1305f Code optimization for accounts receivable report to avoid timeout error (#15114) 
* Code optimization for accounts receivable report to avoid timeout error

* Added index for party_type
 2018-08-14 10:51:13 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
rohitwaghchaure
8f0acf30bf
Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet 
[Fix] 'ascii' codec can't encode error in balance sheet report
 2018-08-07 16:53:21 +05:30
Rohit Waghchaure
9a9974f5c3 [Fix] 'ascii' codec can't encode error in balance sheet report 2018-08-07 16:51:56 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Shreya Shah
f0ef673498 Accounts receivable aging based on supplier due date (#15080) 
* Accounts receivable aging based on supplier due date (#13801)

* Remove spaces
 2018-08-06 14:42:35 +05:30
Rohit Waghchaure
15f52e7b71 [Fix] Incorrect tax amount calculation because of same fieldname in the code 2018-08-06 14:29:34 +05:30
Nabin Hait
eed3d4c1b3 Fixed Merge Conflict 2018-07-31 12:36:16 +05:30
rohitwaghchaure
91d2ace9bb Account no + account name in trial balance and financial statements reports (#15038) 2018-07-30 10:38:51 +05:30
Nabin Hait
fa06ee80e9 Fixed merge conflict 2018-07-27 12:54:00 +05:30
Yaqin Shurrab
cc56ff5c37 Get the correct Summation of Closing Balances (#14990) 
Fix total raw values for Closing Credit and Closing Debit
 2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3 [Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994) 2018-07-27 11:03:53 +05:30
Faris Ansari
5e096df5ae columnDef => column 2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd Return early if filters not initialized 2018-07-20 16:31:01 +05:30
Faris Ansari
5986d59b01 Financial Reports 
- Update formatter for use with DataTable
- Fetch Currency from  filters and fallback to company currency
 2018-07-20 15:11:55 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property 2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707 [fix] format fiscal year docname to proper date before using 🤦 (#14955) 2018-07-18 18:03:27 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba Query report print (#14935) 
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
 2018-07-18 09:28:44 +05:30
rohitwaghchaure
a3e070bc6b [Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914) 2018-07-16 18:11:19 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
bobzz-zone
58236ffc1e Update budget_variance_report.py (#14798) 
Make sure GL Entry only called once in each row
 2018-07-06 10:39:00 +05:30
Nabin Hait
104f62090d Add filters for cost center in Budget Variance report 2018-06-29 12:25:03 +05:30
rohitwaghchaure
67d87e29e3 [Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690) 2018-06-27 11:22:03 +05:30
mnaim-cloude8
56e4346ead To fixed if if no schedule and disposal is NOT within the period. (#14637) 
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.

* Update asset_depreciations_and_balances.py
 2018-06-25 15:05:26 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620) 
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
 2018-06-21 10:53:12 +05:30
Zarrar
80ff296e97 data not filled in acc. receivable report for some field fix (#14546) 2018-06-17 11:21:10 +05:30
rohitwaghchaure
83a2612a18 [Fix] Consolidated Financial Statement report (#14537) 2018-06-15 18:03:50 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
Shreya Shah
3d73a6f7f2 Fetch details from Journal Entry in Accounts Payable report (#14495) 
* Fetch bill_no, bill_date from Journal Entry

* Fix as per suggestion

* Fetch details only if bill_no exists
 2018-06-13 16:33:06 +05:30
Charles-Henri Decultot
a774f3d7a0 POS closing voucher (#14270) 
* POS closing voucher

* Codacy corrections + improvements

* Codacy corrections

* POS Closing Voucher improvements
 2018-06-06 10:22:13 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue 
[Fix] Data not displaying in financial reports
 2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e Fixed data not displaying in financial reports 2018-05-28 15:01:57 +05:30
Shreya Shah
13f39eb821 Display rate on the basis of stock UOM (#14246) 2018-05-28 11:50:28 +05:30
tundebabzy
3eb235a53b Sales Payment Summart Report Improvement (#14243) 
* fix iteritems() takes exactly 1 argument (2 given)

* adds new helper functions

* use new functions to make POS invoices filterable on warehouse and cost center

* more PEP8 fixes
 2018-05-28 10:26:45 +05:30
Achilles Rasquinha
efb731941d ran 2to3, evaluation (#13499) 
* ran 2to3, evaluation

* Update update_gstin.py

* Update accounts_receivable_summary.py
 2018-05-23 11:31:24 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
rohitwaghchaure
742d3e5549 [Fix] General ledger default_currency issue for member party type (#14172) 2018-05-22 09:10:01 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +05:30
Rohit Waghchaure
44fda65b1d [Fix] Company mandatory issue 2018-05-16 23:31:09 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
Shreya
63d14cfac8 Instead of throwing error, just return 2018-05-16 17:30:58 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f Added finance book filtering logic to financial_statements.py 2018-05-09 15:03:40 +05:30
Gaurav Naik
40559d5f5c Added finance book filter logic to ReceivablePayable 2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51 Added finance book filter in accounts_receivable.js 2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f Added finance book filter in accounts_payable.js 2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c Added finance book filter logic in general_ledger.py 2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d Added finance book filter to General Ledger 2018-05-09 14:57:36 +05:30
Zarrar
6f3594b2e4 [Enhance] GL Entry - ability to multiselect party (#13769) 
* change dynamic link to multiselect field and improv

* print based fix

* refactor changes according to multiselect changes
 2018-05-03 19:00:43 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Zarrar
b0a46f397a display customer's name while printing receivable report (#13830) 2018-04-30 19:40:18 +05:30
AravindPranera
805f09a3fe Accounts receivable aging based on supplier due date (#13801) 2018-04-26 18:02:37 +05:30
Nabin Hait
dc75be8b6c Show company column in order in consolidated financial statement 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d [Fix] general ledger group by validation 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c [Fix] Profit and loss statment 2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520 Fixed merge conflict 2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678) 
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
 2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106 Group by party in general ledger report (#13649) 
* Group wise Ledger for Customer and Supplier

* commonify group by fields
 2018-04-26 12:16:18 +05:30
matmyers
742da8cfce removed duplicate keys (#13675) 2018-04-17 12:20:57 +05:30
Faris Ansari
ed34a442a8 Obey currency filter in financial statement prints #pdd (#13648) 2018-04-13 21:34:00 -08:00
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print (#13627) 2018-04-12 17:28:40 +05:30
Nabin Hait
e9638be032 fixed merge conflict 2018-04-06 15:18:27 +05:30
Rohit Waghchaure
3d2b3d37d4 [Fix] Width and margin for account receivable pdc print format 2018-04-04 16:01:33 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements (#13423) 2018-04-02 10:14:32 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Rohit Waghchaure
ace68cd283 [Fix] Alignment and date issue in PDC report 2018-03-28 15:53:29 +05:30
Nabin Hait
6c35822a35 Merge branch 'master' into develop 2018-03-28 10:40:14 +05:30
Shreya Shah
c0201877dd fixed column fieldnames for translations (#13406) 2018-03-27 18:45:42 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374) 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
 2018-03-27 11:29:25 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
Shreya Shah
9bcadf8126 Tax Id in some reports and print formats (#13373) 
* tax-id in sales and purchase registers

* tax-id in general ledger print_format

* tax-id in accounts payable

* tax-id in accounts receivable
 2018-03-23 15:04:37 +05:30