Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,350 Commits 3 Branches 0 Tags 1 GiB
07e5786e1b
Commit Graph

152 Commits

Author SHA1 Message Date
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
rohitwaghchaure
1b2b4a626f [Fix] Accounts receivable report showing wrong currency for total amount against the customer (#9276) 2017-06-14 12:32:52 +05:30
Saurabh
797f2030f8 Merge branch 'master' into develop 2017-06-13 15:20:13 +05:30
Ashwini Save
7f14f28099 Account Receivable - Credit Note column added to print format. (#9230) 
* Account Receivable - Credit Note column added to print Format.

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column
 2017-06-13 11:18:39 +05:30
Nabin Hait
a128b21baa Fixed merge conflict 2017-06-07 12:17:17 +05:30
Nabin Hait
17378e8a29 Added a new column for Credit/Debit Note in AR/AP report (#9123) 2017-06-07 11:56:53 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Nabin Hait
e3c122d8c4 AR report: filter based on customer group and credit days based on field. Fixed #8214 2017-04-24 19:06:07 +05:30
Rohit Waghchaure
dd70fbfdae [fix] Letter head not showing in the report 2017-04-24 18:57:51 +05:30
Rohit Waghchaure
611a70a12a changes in the report roles 2017-03-06 16:36:46 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Kanchan Chauhan
f4832cf2b9 [Enhancement] Summary link on Accounts Payable and Accounts Receivable 2017-01-03 16:29:41 +05:30
Rushabh Mehta
24f658d633 [fix] [minor] accounts receivable not translated (#6943) 2016-11-16 11:13:46 +05:30
Rohit Waghchaure
387c2846aa [Report] Company not found in the filter for making auto email report 2016-11-10 19:13:20 +05:30
Nabin Hait
5fd5a77750 Fixed version conflict 2016-10-03 14:13:50 +05:30
Nabin Hait
b498eb5f9e Minor fix AR/AP 2016-10-01 15:51:59 +05:30
Rohit Waghchaure
c1a3e379d8 [Fixed] Accounts receivable concat issue 2016-09-30 13:18:06 +05:30
Nabin Hait
80499bb657 Fixed merge conflict 2016-09-29 14:18:53 +05:30
Nabin Hait
f1d2fd2436 [fix] Accounts Receivable report if negative write off in invoice 2016-09-29 13:03:10 +05:30
Nabin Hait
706612bcd4 Fixed version conflict 2016-09-26 18:11:56 +05:30
pawan
09f1ee637e [fix] #6371 2016-09-23 17:19:54 +05:30
Nabin Hait
15b26d8b1a Fixed merge conflicts 2016-09-02 14:29:57 +05:30
Nabin Hait
13b37c6346 Default letter head in report printing based on selected company 2016-09-02 11:25:42 +05:30
Neil Trini Lasrado
067245933e Fixed Demo 2016-08-25 18:31:42 +05:30
Nabin Hait
50f8262ac7 Currency fix in reports 2016-08-18 16:14:23 +05:30
Nabin Hait
c30c342bdf [fix] Label for ageing cols in AR/AP report 2016-08-08 11:47:13 +05:30
Nabin Hait
0014aa9c26 [fix] Charts in report 2016-05-27 12:21:36 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55 Pie chart for ageing analysis in accounts receivale/payable 2016-05-26 15:26:01 +05:30
Nabin Hait
f945e10cce Currency column in AR/AP and sales/purchase register report 2016-04-11 11:56:57 +05:30
Umair Sayyed
8cbc076dc2 fixes in the Account Receivale print format - with Nabin 2016-03-17 15:12:31 +05:30
Nabin Hait
f853a92676 Fixes in AR/AP Print Format 2016-03-15 16:10:15 +05:30
Nabin Hait
226a101119 [fix] Currency symbol based on account/company currency, not based on Global Defaults 2016-01-12 11:56:40 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
fc9031924e [fix] Field type of Age field converted to Int 2015-10-12 15:47:07 +05:30
Rushabh Mehta
83c0899c83 [fix] [minor] default ranges for demo 2015-10-02 11:31:37 +05:30
Nabin Hait
44bd3b2601 [fix] Fetch gl entries in receivable/payable report only if party mentioned 2015-09-25 10:33:51 +05:30
Nabin Hait
262ac09305 [fix] Currency symbol fixed in Accounts receivable/payable report #4020 2015-09-17 13:24:14 +05:30
Anand Doshi
979326b0b1 minor fixes in multi-currency 2015-09-11 16:33:45 +05:30
Nabin Hait
699751c531 [report] Accounts Receivable / Payable in multi currency 2015-08-31 17:02:04 +05:30
Rushabh Mehta
da24698cf7 [minor] in ap, ar renamed label for date as 'as on date' as it was confusing 2015-08-24 14:31:07 +05:30
Nabin Hait
810041cbe3 [fix] Fixed error due to performance upgrade cleanup 2015-06-15 10:20:11 +05:30
Nabin Hait
6b01abe9ad [report][performance] Speed increased by approx 10 times in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement 2015-06-14 20:59:28 +05:30
Nabin Hait
47e5c764c3 [fix] accounts payable report 2015-04-28 16:45:32 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Rushabh Mehta
92b253dceb Update accounts_receivable.py 2015-04-18 12:13:57 +05:30
Nabin Hait
4743cbe002 issue fixed in accounts receivable report 2015-04-17 15:55:19 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
015fa7a1d1 [fix] escape quote in Accounts Receivable 2015-01-08 18:26:53 +05:30
Nabin Hait
d57b57a21d Minor fix in accounts receivable report 2014-12-09 11:56:13 +05:30
ankitjavalkarwork
c41a0e2e38 Add print formats for Acc. Receivable/Payable and Summary reports 2014-12-02 15:13:36 +05:30
Nabin Hait
7dbcee87af AR/AP report cleanup 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f [#1379] Add Accounts Receivable Summary Report 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63 Commonify AR and AP reports 2014-10-30 15:54:39 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
ankitjavalkarwork
ff231b5e62 Allow advance JV payments in Accounts Receivable/Payable 2014-10-10 13:13:39 +05:30
ankitjavalkarwork
437af5b031 [fix][#1808] Allow configurable AR/AP ageing dates 2014-10-07 11:32:21 +05:30
Nabin Hait
cb8e255f0f Dynamic link for voucher no in AR/AP report 2014-10-06 13:14:22 +05:30
Nabin Hait
76030540cb Accounts Receivable/Payable report based on party 2014-10-06 13:14:02 +05:30
Aditya Duggal
a2c9d35efb Added the dynamic link field. 2014-09-29 17:44:28 +05:30
Aditya Duggal
4c058f4056 Added the dynamic link and removed the link column 2014-09-29 17:41:19 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Nabin Hait
ea4aa04cc4 Search query for account cleanup 2014-05-30 11:22:11 +05:30
Anand Doshi
69a2c25ca5 Fixed set_query 2014-04-25 18:35:45 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30
Nabin Hait
73083dc960 Fix related to user_default 2014-03-21 11:26:08 +05:30
Nabin Hait
49a6f0754e Removed debit_or_credit field 2014-03-21 11:22:38 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
8ae051cb39 fixed conflict 2014-02-14 13:42:41 +05:30
Nabin Hait
574c7e7c63 item related cleanup 2014-02-06 15:51:01 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
 2014-01-24 21:44:36 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30