Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,380 Commits 3 Branches 0 Tags 1 GiB
96909b6c3b
Commit Graph

234 Commits

Author SHA1 Message Date
Nabin Hait
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +05:30
Rohit Waghchaure
7aee809571 fix: If finance book filter is not set then show all the entries 2019-04-16 19:35:18 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Nabin Hait
51d08786dc fix: Show Sales Person in AR/AP print is optional 2019-04-01 16:24:23 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +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
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +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
deepeshgarg007
ff1078f271 fix(minor): fetch payment terms if voucher nos are available 2019-01-21 09:43:56 +05:30
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
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
Rushabh Mehta
5d11abb0a2 fix(escaping): accounts_receivable.py 2018-12-24 16:03:24 +05:30
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
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
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
deepeshgarg007
5dbb9f5312 Accounts receivable summary print fix 2018-11-23 19:54:08 +05:30
deepeshgarg007
7bc6f3843a Fix for accounts Receivable Summary Showing zero values 2018-11-13 16:54:54 +05:30
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
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
77b60928bf
Merge branch 'master' into staging-fixes 2018-10-17 09:39:31 +00:00
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
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
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
Saurabh
75d90b9d8f a[resolved] merge-conflicts 2018-09-20 13:28:23 +05:30
rohitwaghchaure
550fc695f1 [Fix] Precision issue in the accounts receivable report (#15440) 2018-09-19 19:03:40 +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
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +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
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
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
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
Zarrar
80ff296e97 data not filled in acc. receivable report for some field fix (#14546) 2018-06-17 11:21:10 +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
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
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
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
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
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
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
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
Nabin Hait
7570774ebe Merge branch 'master' into develop 2018-02-23 16:49:43 +05:30
rohitwaghchaure
dd0fc1084e [Fix] PDC amount, PDC print layout issue (#13062) 2018-02-23 16:20:46 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
rohitwaghchaure
6e7e70c977 Added PDC from journal entry in AR report (#12844) 2018-02-12 11:55:07 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
rohitwaghchaure
d36ac27f94
Update accounts_receivable.py 2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708
Update accounts_receivable.py 2018-01-29 12:34:19 +05:30
Aditya Duggal
2136a7bded Resolves Issue #12630 -Added Filters to AR 
- Added Territory Filter to AR report
- Added Sales partner filter
- Added Sales person filter
-Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column
-Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.
 2018-01-24 18:16:08 +05:30
Nabin Hait
6b89644ca7 Payment terms filter in AR report 2018-01-09 15:39:35 +05:30
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms (#12117) 
* Reverted gl entry splitting based on payment terms

* changed modified date
 2017-12-21 11:37:18 +05:30
Saurabh
ed4191ec5b [fix] merge-conflicts 2017-11-22 18:01:56 +05:30
rohitwaghchaure
179e0c1d8d Added party name in accounts receivable/payable report (#11656) 2017-11-20 11:18:55 +05:30
tunde
ffa659fd2c Merge branch 'develop' into payment-terms 2017-11-14 09:59:45 +01:00
Prateeksha Singh
6b26e391b8 use the new frappe charts :D (#11391) 2017-10-31 12:58:48 +05:30
tunde
09ce68ec19 Merge branch 'develop' into payment-terms 2017-10-19 17:47:31 +01:00
Prateeksha Singh
bfb108d722 Replace c3 (#11112) 
* [charts] replace in asset.js

* replace in reports
 2017-10-17 12:03:02 +05:30
tunde
a19ea6e2f3 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms 2017-08-29 15:26:50 +01:00
Nabin Hait
bf4a974124 IMproved print format for AR/AP report (#10528) 2017-08-25 12:10:49 +05:30
Nabin Hait
9275969b51 Payment Terms: doctypes, schedule, payments and more 
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months

fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
 2017-08-20 16:51:29 +01:00
rohitwaghchaure
bedb486c55 [Fix] Multi letter head showing in the print (#9644) 2017-07-06 14:50:38 +05:30
mbauskar
f9e2bf1ab4 fixed merge conflicts 2017-06-15 13:42:47 +05:30
rohitwaghchaure
4c0f9dac94 Total amount not showing for credit note column in the print (#9278) 2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6 [minor] fixed Cannot read property 'default_letter_head' of undefined (#9268) 2017-06-14 12:52:13 +05:30