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

235 Commits

Author SHA1 Message Date
Rushabh Mehta
8f2b8afcb7 [fix] gl entry report if not filtered 2015-09-24 15:03:53 +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
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
83dd3e14e5 [fix] Gross Profit report should not include return entries 2015-09-09 10:37:04 +05:30
Nabin Hait
4d62d7867e [report] Bank Reconciliation Statement in account currency 2015-09-04 13:26:45 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
699751c531 [report] Accounts Receivable / Payable in multi currency 2015-08-31 17:02:04 +05:30
Nabin Hait
06b15bfd63 [report] General Ledger in multi currency 2015-08-31 15:39:03 +05:30
Nabin Hait
1901ca5a45 [fix] Fixed gross profit report due to removal of designation field from Sales Team table 2015-08-31 12:02:50 +05:30
Nabin Hait
3a990d946d [fix] In general ledger report, consider cost center in group by voucher 2015-08-24 17:21:01 +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
Anand Doshi
e116cb596c [hotfix] [report] payment period based on invoice date 2015-08-13 17:25:20 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Anand Doshi
ba9dbb1b09 [minor] removed Link/DocType in Payment Period Based on Invoice Date 2015-08-03 11:05:45 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Anand Doshi
14859faf17 [minor] Accounts Payable Report Type='Script Report' 2015-07-24 17:30:39 +05:30
Nabin Hait
f666535223 [fix] gross profit report 2015-07-23 17:08:44 +05:30
Rushabh Mehta
fec61fe33e [minor] fix report type for Accounts Payable 2015-07-23 10:39:13 +05:30
Nabin Hait
e2b8ccf1bb [report] Letter Head option in General Ledger report 2015-07-21 12:02:36 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Rushabh Mehta
f3b0b95b15 [fix] [filter] for general ledger 2015-07-13 10:24:25 +05:30
Rushabh Mehta
fc3d87181a [fix] cart and general leger report 2015-07-10 10:11:07 +05:30
Nabin Hait
885c70984d [fix] Always show Sales invoice in Gross profit report 2015-07-02 14:09:49 +05:30
Nabin Hait
be496bc91c [fix] Trial Balance opening 2015-06-18 10:33:20 +05:30
Nabin Hait
59f063e5c3 [fix] opening balance in general ledger report 2015-06-18 10:33:20 +05:30
Nabin Hait
e91025c0aa [fix] Opening balance in trial balance and general ledger based on is_opening 2015-06-17 15:35:06 +05:30
Nabin Hait
1ac9f2f50d [fix] Opening balance in trial balance and general ledger based on is_opening 2015-06-17 15:09:40 +05:30
Nabin Hait
a123638d37 [fix][report] Payment period based on invoice date 2015-06-16 15:21:00 +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
909f0c38f1 [report][enhancement] Payment period based on invoice date: show party columns and filter based on party 2015-06-09 18:42:52 +05:30
Nabin Hait
0b18a2d347 Reset values in tools like Payment Tool 2015-06-05 12:01:29 +05:30
Nabin Hait
352187bee6 purchase register fix 2015-06-03 12:06:19 +05:30
Nabin Hait
5359f2651a [fix] sales register report 2015-06-03 11:24:37 +05:30
Nabin Hait
8908543a9c In standard print format, item name will now honour 'Print Hide' property 2015-06-01 14:01:56 +05:30
Nabin Hait
6ee8c545e3 [fix] gross profit report 2015-05-29 10:39:09 +05:30
Nabin Hait
5b8db3729c [fix] General ledger print format 2015-05-27 13:02:59 +05:30
Nabin Hait
d4c8dc2915 multiple minor fixes 2015-05-26 16:32:30 +05:30
Nabin Hait
f61f76ba45 [fix] gross profit report 2015-05-25 14:13:03 +05:30
Nabin Hait
4c924bb76c totals etc should not be clickable 2015-05-21 13:38:03 +05:30
Rushabh Mehta
555fa4fbc2 [fix] totals etc should not be clickable 2015-05-20 17:21:53 +05:30
Pratik Vyas
803e998e9d Fix merge mistakes 2015-05-19 13:08:54 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Nabin Hait
0a705fe582 gross profit report fix 2015-05-19 11:12:06 +05:30
Nabin Hait
b45d4e0e16 In general ledger report opening amount is purely based on posting date 2015-05-12 17:40:14 +05:30
Nabin Hait
4b9b92ba2f minor fix in report 2015-05-12 15:12:30 +05:30
Nabin Hait
a0b1124d6f minor fix in report 2015-05-06 11:59:43 +05:30
Anand Doshi
e6ac87e86f Gross Profit Report: Company filter should be reqd 2015-04-30 15:33:31 -07:00
Nabin Hait
2db8dc922a fixed trial balance related to showing zero balance 2015-04-29 18:39:33 +05:30
Nabin Hait
6e59aca394 [enhancement] sort root accounts as assets, liability, equity, income, expense 2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6 fixed trial balance related to showing zero balance 2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab [enhancement] sort root accounts as assets, liability, equty, income, expense 2015-04-29 12:26:15 +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
Nabin Hait
5c7f0bcb32 Party filter and columns in general ledger report 2015-04-20 17:13:53 +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
Rushabh Mehta
9e6812cfab Merge pull request #3108 from BhupeshGupta/fix_bank_reports 
Add/Fix Bank Reports Filters
 2015-04-17 14:17:22 +05:30
bhupeshg2
3f59615555 switch to tabs 2015-04-15 22:29:45 +05:30
bhupeshg2
e2e973f7be Add reqd to bank clearance aummary report 
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
 2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf [hotfix] [report] Received Items to be Billed 2015-04-14 11:56:42 -04:00
Rushabh Mehta
20bcf6aeff [fixes] print_hide on stock uom and gross profit 2015-04-13 15:31:24 +05:30
Rushabh Mehta
b4c4351513 [report] fix via error report 2015-04-13 11:30:10 +05:30
Anand Doshi
0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop 
Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py
 2015-04-06 13:21:07 +05:30
Anand Doshi
6208c49859 Added Company field in various Query Reports 2015-03-30 15:21:20 +05:30
Nabin Hait
7057970c0c purchase order items to be billed report 2015-03-26 11:05:13 +05:30
Nabin Hait
53450b08b0 Fixes in general ledger report 2015-03-24 13:13:25 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Nabin Hait
851c745fdf Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0 2015-02-26 12:32:04 +05:30
Nabin Hait
79ffc2b3a7 fix in financial statements 2015-02-25 18:32:25 +05:30
Nabin Hait
82e3e25cdb fixes for base_rate, base_amount, tax_amount: mass search and replace 2015-02-24 10:02:28 +05:30
Rushabh Mehta
e8a37949cf [issue fixes] + added fixtures for item attribute and operation 2015-02-20 20:10:11 +05:30
Nabin Hait
5690be103c Replaced renamed total fields in code files 2015-02-12 16:09:11 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Nabin Hait
1dc8ff5220 item-wise tax distribution if amount entered in actual 2015-02-04 18:06:59 +05:30
Anand Doshi
b942cb86ae [minor] auto-create Fiscal Year, loading, general ledger 2015-01-19 15:59:45 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +05:30
Anand Doshi
015fa7a1d1 [fix] escape quote in Accounts Receivable 2015-01-08 18:26:53 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
abfc72ded4 Merge pull request #2450 from ankitjavalkarwork/fix2363 
Add print formats for Acc. Receivable/Payable and Summary reports
 2014-12-11 17:40:54 +05:30
Nabin Hait
d57b57a21d Minor fix in accounts receivable report 2014-12-09 11:56:13 +05:30
ankitjavalkarwork
35db282765 Fix gross_profit.py, commonify and add elementwise grouping to report 2014-12-04 13:08:42 +05:30
Rushabh Mehta
ec9db4b799 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
ankitjavalkarwork
c41a0e2e38 Add print formats for Acc. Receivable/Payable and Summary reports 2014-12-02 15:13:36 +05:30
ankitjavalkarwork
bd8a8b9bd7 [#2230] Add Totals row to Gross Profit report 2014-11-10 12:36:43 +05:30
ankitjavalkarwork
e6e65b0907 [#2362] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report 2014-11-04 14:40:33 +05:30
Nabin Hait
e6370860a0 accounts receivable summary report cleanup 2014-10-30 15:54:40 +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
Nabin Hait
b70712dbba Voucher dynamic link in general ledger report 2014-10-07 11:32:54 +05:30
ankitjavalkarwork
437af5b031 [fix][#1808] Allow configurable AR/AP ageing dates 2014-10-07 11:32:21 +05:30
Nabin Hait
894a1b539a Dynamic link in general ledger and stock ledger report 2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f Dynamic link for voucher no in AR/AP report 2014-10-06 13:14:22 +05:30