Mangesh-Khairnar
1934a76cd8
feat: Add status field in multiple reports linked with purchase order and sales order creation ( #17107 )
...
* enhancement: add status field in ordered itemd to be delivered
* enhancement: add status field in purchase order itemd to be received
* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
Nabin Hait
e0a9835f30
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix
...
fix(Party Ledger Summary): Show all adjustment entries as columns
2019-04-04 11:45:36 +05:30
Nabin Hait
9ee417888e
Merge pull request #17092 from nabinhait/ar-ap-print
...
fix: Show Sales Person in AR/AP print is optional
2019-04-04 11:02:26 +05:30
deepeshgarg007
5ad7b655cf
fix: Divide by zero exception handling
2019-04-03 09:11:03 +05:30
Nabin Hait
51d08786dc
fix: Show Sales Person in AR/AP print is optional
2019-04-01 16:24:23 +05:30
deepeshgarg007
4092ead41e
fix: fetch account only if available
2019-03-29 16:19:04 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Rohit Waghchaure
9da14747aa
fix: accounts receivable summary
2019-03-29 09:26:40 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Faris Ansari
843b7f6dd5
fix: Reorder Currency column to fix print ( #17008 )
...
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
Rohit Waghchaure
4ed7d035cb
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:37:25 +05:30
Frappe Bot
b07a5d449d
Merge branch 'master' into develop
2019-03-23 07:25:03 +00:00
Saif Ur Rehman
7d1c1aa28f
fix(Party Ledger Summary): Show all adjustment entries as columns
...
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
2019-03-22 17:18:32 +05:00
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix
...
fix: Rounding adjustment in Rounded Total
2019-03-22 12:51:09 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Rohit Waghchaure
a322687897
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:10:08 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
...
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a
fix: advance amount is not calculating properly
2019-03-19 15:06:01 +05:30
Himanshu Warekar
642a5b69f5
fix: change customer to supplier
2019-03-18 21:53:33 +05:30
Himanshu
ac199580af
fix(Customer Ledger): ambiguous error in where clause ( #16914 )
...
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
2019-03-18 15:44:54 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix ( #16935 )
2019-03-17 09:49:24 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
...
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Anurag Mishra
02138b6bfc
fix: gross depends upon now report type
2019-03-04 14:46:28 +05:30
Deepesh Garg
44ff41188d
fix: Selling and buying amount precision fix ( #16764 )
2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7
fix: Print letter head only if checked in Print Settings ( #16789 )
...
Letter head is printed in financial statements even if option is not checked
2019-03-04 12:53:11 +05:30
Anurag Mishra
f3bdeedc68
minor fixes
2019-03-04 12:27:41 +05:30
Frappe Bot
8f0660ab31
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total
...
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
2019-03-01 11:57:06 +05:30
Rohit Waghchaure
c21cda2790
Removed validation for group by voucher in general ledger
2019-02-28 16:20:45 +05:30
Anurag Mishra
a9a1552e32
refactor
2019-02-27 14:10:24 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit
...
fix: Decimal point issue in gross profit print
2019-02-21 18:07:14 +05:30
Rohit Waghchaure
90691dc0d8
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:18:28 +05:30
deepeshgarg007
14ff6bfc32
fix: Decimal point issue in gross profit print
2019-02-21 12:08:32 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Nabin Hait
e4f73929c4
fix: AR/AP report based on account type
2019-02-19 17:11:50 +05:30
Anurag Mishra
61f981ae05
Changes Requested
2019-02-18 11:43:32 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix
2019-02-14 18:37:40 +05:30
Anurag Mishra
4f0fd38209
refractor
2019-02-13 16:46:05 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50
fix: show values in account/party currency based in actual entry, no conversion
2019-02-12 16:41:20 +05:30
Nabin Hait
ab50211e18
fix: show project even if PI is directly created
2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac
Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report
2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc
fix: codacy
2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report
2019-02-11 16:00:28 +05:30
Anurag Mishra
a032f0528e
new report gross-and-net-profit-report
2019-02-11 13:12:44 +05:30
Aditya Hase
2a3c39f38a
fix(py3): Convert dict.values() to list for indexing
2019-02-08 12:02:57 +05:30
Aditya Hase
a86a569787
fix(py3): Convert dict.values() to list for indexing
2019-02-07 22:21:06 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Nabin Hait
3b8623e207
Merge pull request #16491 from adityahase/ar-fix
...
fix(ar-summary): Changes to column list to match recent changes
2019-01-29 11:28:02 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary
...
feat: Party Ledger Summary Report
2019-01-25 11:22:55 +05:30
rohitwaghchaure
7e4cf62a15
Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative
...
Show outward entries in negative for Bank Clearance Summary report
2019-01-24 22:13:40 +05:30
Aditya Hase
a40c43e414
fix(ar-summary): Changes to column list to match recent changes
2019-01-24 19:13:32 +05:30
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Rohit Waghchaure
ddd9136d10
Renamed field and added finance book column in the trial balance simple report
2019-01-22 14:11:57 +05:30
Aditya Hase
d157ae17b7
fix(ar-summary-report): Changes to column list to match recent changes in AR report
2019-01-22 13:37:54 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
deepeshgarg007
ff1078f271
fix(minor): fetch payment terms if voucher nos are available
2019-01-21 09:43:56 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
31d58eac01
fix(Party Ledger Summary): Added Supplier/Customer Name column
2019-01-19 15:28:53 +05:00
Saif Ur Rehman
55566b7f8e
fix(Party Ledger Summary): Codacy fix
2019-01-19 15:12:08 +05:00
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Nabin Hait
873442a55d
Merge branch 'staging-fixes' into Party-Ledger-Summary
2019-01-16 17:52:45 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix
2019-01-16 17:49:22 +05:30
Saif Ur Rehman
fccb1e55ec
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-16 14:36:55 +05:00
Rohit Waghchaure
affeb3dfec
Added on account amount field in Accounts Payable/Receivable Summary
2019-01-15 17:38:31 +05:30
Rohit Waghchaure
1a4c1e11cb
Fix: total invoiced amount in Accounts Receivable Summary report showing blank
2019-01-15 17:01:34 +05:30
Rohit Waghchaure
bdee57ca8d
Added finance book in trial balance and fixed cost center not working issue in trial balance
2019-01-15 15:52:52 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Rohit Waghchaure
df7215dcb2
Added supplier name in the tds report
2019-01-15 14:48:06 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
deepeshgarg007
720020319f
fix(Codacy): removed unused variable
2019-01-09 21:56:45 +05:30
deepeshgarg007
c039f70496
Test Cases for
...
account balance report
2019-01-09 21:56:45 +05:30
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
Rohit Waghchaure
701c762a68
Show outward entries in negative for Bank Clearance Summary report
2019-01-09 14:21:03 +05:30
Nabin Hait
142d8aa973
Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt
...
fix: negative amount showing in the bank clearance summary report
2019-01-08 20:25:26 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Nabin Hait
4e3e784691
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
...
perf: Customer contact column in accounts receivable report
2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc
fix: Divide by zero exception fix in item wise purchase register ( #16247 )
...
* Do not prepare row if stock quantity is not available
* Update item_wise_purchase_register.py
2019-01-08 08:34:28 +05:30
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
...
fix: replaced str to cstr in genral ledger report
2019-01-07 14:28:27 +05:30
Sagar Vora
fbadb19d93
Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
2019-01-07 13:55:43 +05:30
Rohit Waghchaure
ed6725172d
Replaced str to cstr in genral ledger report
2019-01-06 20:07:18 +05:30
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
deepeshgarg007
eabf260706
fix :Test cases for accounts receivable report
2019-01-04 12:34:28 +05:30
deepeshgarg007
9de81cda77
Added Customer contact column in accounts Receivable
2019-01-04 10:54:24 +05:30
Rohit Waghchaure
1ff1fc4725
[Fix] Negative amount showing in the bank clearance summary
2019-01-02 17:56:08 +05:30
Saif Ur Rehman
016f29f09b
fix: error due to passing None in scrub
2019-01-02 16:22:22 +05:00
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
Saif Ur Rehman
fac6b59627
Exclude opening invoices in Gross Profit Report
2019-01-01 16:33:22 +05:00
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction
...
[Fix] Filter cancelled and draft payments in sales payment summary
2018-12-31 12:02:19 +05:30
Charles-Henri Decultot
e87eb07e16
Correction for Travis
2018-12-27 17:38:57 +00:00
Charles-Henri Decultot
8d71015bf8
Cleanup journal entries
2018-12-27 16:43:26 +00:00
Charles-Henri Decultot
b7339d7dcb
Test travis
2018-12-27 15:30:56 +00:00
Charles-Henri Decultot
43c7bd57e4
Cancel existing payment entries for data integrity in test
2018-12-27 14:43:30 +00:00
Charles-Henri Decultot
641d3e0073
Add own records
2018-12-27 13:43:56 +00:00
Charles-Henri Decultot
0f9c47c242
Remove pricing rule from items
2018-12-27 10:10:18 +00:00
Charles-Henri Decultot
02aa9fb240
Understand Travis
2018-12-27 08:46:29 +00:00
Charles-Henri Decultot
d7777696d7
Corrections for Travis
2018-12-26 14:08:00 +00:00
Charles-Henri Decultot
9c1db688d1
Ignore pricing rule for Travis
2018-12-26 10:33:42 +00:00
Charles-Henri Decultot
899b9b1ea7
Codacy correction
2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25
Remove ununsed variable
2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9
Test cases
2018-12-26 08:36:32 +00:00
Rushabh Mehta
5d11abb0a2
fix(escaping): accounts_receivable.py
2018-12-24 16:03:24 +05:30
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
Charles-Henri Decultot
813485023b
Filter cancelled and draft payments
2018-12-20 14:04:00 +00:00
Nabin Hait
0866b2b75a
Update accounts_receivable.py
2018-12-20 14:11:20 +05:30
deepeshgarg007
b645c2c75e
Rebase using staging-fixes and resolved conflicts
2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc
Added temp variables for outstanding, credit_note_amt instead of function calling
2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af
breaked up code into multiple functions
2018-12-19 18:43:06 +05:30
deepeshgarg007
4ac8fcf4af
Added test case for Accounts receivable report based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a944f88b94
Removed column for pdc date
2018-12-19 18:43:06 +05:30
deepeshgarg007
17544d7ad6
Refactored accounts receivable report for payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
e7a91b9526
Credit note fix
2018-12-19 18:43:06 +05:30
deepeshgarg007
f98adf2be5
Changed columns and added currency conditions
2018-12-19 18:43:06 +05:30
deepeshgarg007
b6c083706a
Allocation of credit note amount and pdc in payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
24f8d3ed0c
Add columns based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a8ab9b5c3d
Accounts Receivable report based on payment terms
2018-12-19 18:43:06 +05:30
Saif Ur Rehman
b53231595d
Using same filter for Sales Person from Accounts Receivable
...
Added Customer/Supplier Ledger Summary in Accounts Module page
2018-12-12 15:46:50 +05:00
Saif Ur Rehman
b07d108bee
feat: Supplier Ledger Summary
2018-12-12 05:45:49 +05:00
Saif Ur Rehman
41236ed0e5
feat: Customer Ledger Summary report
2018-12-12 05:12:20 +05:00
Frappe Bot
fb2fdc4f4e
Merge branch 'staging' into develop
2018-12-11 09:55:01 +00:00
Pawan Mehta
377511165e
Simple Trial Balance ( #16060 )
2018-12-10 21:55:01 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
Saif
b52bd9c093
AR/AP Report Enhancement ( #16175 )
...
* Modified AR/AP print format
* Filter Sales Person based on either Customer or Voucher's assigned Sales Person
* -Added Sales Person column to Accounts Receivable Summary
-Added all filters in AR/AP Summary Report as in AR/AP Report
-Reordered filters for better grouping
-Fixed a bug that customer_name was not unset after removing Customer from filter
2018-12-10 17:56:42 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes
2018-11-28 08:12:48 +00:00
Nabin Hait
f642f86982
Merge branch 'hotfix' into accounts_receivable_summary_print_issue
2018-11-27 17:56:49 +05:30
Rohit Waghchaure
10bcd5113c
[Fix] Accounts receivable summary print is not working
2018-11-27 16:25:35 +05:30
Nabin Hait
212a29ae2c
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
...
[Fix] Not able to view general ledger for purchase invoice
2018-11-26 19:57:24 +05:30
Nabin Hait
25e60f3934
Merge pull request #16044 from ESS-LLP/fix-trial-balance
...
fix: Trial Balance print
2018-11-26 19:56:27 +05:30
deepeshgarg007
5dbb9f5312
Accounts receivable summary print fix
2018-11-23 19:54:08 +05:30
Ranjith
1879e91148
fix: Trial Balance
2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5
Fixed get_buying_amount in Gross Profit report:
...
To handle the case where there may be multiple invoices for a single delivery
2018-11-21 15:32:37 +05:00
Rohit Waghchaure
770a13ebc3
[Fix] Not able to view general ledger for purchase invoice
2018-11-20 13:01:52 +05:30
Frappe Bot
8c7373dfd0
Merge branch 'staging' into develop
2018-11-15 09:45:05 +00:00
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary
...
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Rohit Waghchaure
704796b1cb
Code optimization for consolidated financial statement report
2018-11-15 13:46:18 +05:30
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
