1017 Commits

Author SHA1 Message Date
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