Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,843 Commits 3 Branches 0 Tags 1 GiB
9c893e320d
Commit Graph

1227 Commits

Author SHA1 Message Date
casesolved-co-uk
d5256b60d4 fix: lint 2021-05-13 12:53:11 +00:00
casesolved-co-uk
6998786055 fix: use correct fiscal year function in testing 2021-05-13 12:53:11 +00:00
casesolved-co-uk
cf5b57bfac fix: only load data for tests that need it 2021-05-13 12:53:11 +00:00
casesolved-co-uk
68a31d3d0d fix: fiscal year error 2021-05-13 12:53:11 +00:00
casesolved-co-uk
75ebfbdaf3 fix: fiscal year test case issue 2021-05-13 12:53:11 +00:00
casesolved-co-uk
89fcdf3226 fix: exclude rounding GL Entries from invoice tax lines 2021-05-13 12:53:11 +00:00
casesolved-co-uk
06e31e5d7d fix: Test data for empty db 2021-05-13 12:53:11 +00:00
casesolved-co-uk
391dc45964 chore: fix sider 2021-05-13 12:53:11 +00:00
casesolved-co-uk
7555f5f613 fix: add to workspace and fix lint 2021-05-13 12:53:11 +00:00
casesolved-co-uk
77ffa6b1f6 feat: add test case for report output 2021-05-13 12:53:11 +00:00
casesolved-co-uk
2cb0da8780 fix: rewrite to allow referring to existing sections and reduce to single amount column 2021-05-13 12:53:10 +00:00
casesolved-co-uk
1c37390899 fix: Change & simplify query to cater for zero rate tax entries 2021-05-13 12:53:10 +00:00
casesolved-co-uk
442a0de094 fix: finalise query, fix bugs, put Add Columns back 2021-05-13 12:53:10 +00:00
casesolved-co-uk
ece00287ea Refactor for Journal Entries (payroll) 2021-05-13 12:53:10 +00:00
casesolved-co-uk
3027cc7da6 fix: minor bug and tidy 2021-05-13 12:53:10 +00:00
casesolved-co-uk
5d9217ab29 fix: minor bugs and improvements 2021-05-13 12:53:10 +00:00
casesolved-co-uk
8e413651c2 fix: major refactor to monkey-patch into the QueryReport class 2021-05-13 12:53:10 +00:00
casesolved-co-uk
dba4b3cd13 feat: add run mode, add tests, various fixes 2021-05-13 12:53:10 +00:00
Richard Case
ef8ab135c9 develop: progress tax detail report 2021-05-13 12:53:10 +00:00
casesolved-co-uk
a5d47f70b8 Fleshed out report setup functionality 2021-05-13 12:53:10 +00:00
casesolved-co-uk
3503598735 Initial commit of Tax Detail report and report builder 2021-05-13 12:53:10 +00:00
Deepesh Garg
8e748f8451 fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 15:21:51 +05:30
Deepesh Garg
95e05fbdac fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 14:59:28 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report (#25593) 
* feat(pos): consider POS reserved stock in stock projected qty report

* chore: remove unwanted string formats
 2021-05-07 13:37:42 +05:30
Deepesh Garg
00e00e4e90
fix: Report summary showing inflated values when values are accumulated in Group Company (#25577) 
* fix: Report summary showing inflated values when values are accumullated in Group Company

* fix: Remove extra space

* fix: Translate strings

* fix: Remove unintended changes
 2021-05-07 12:16:44 +05:30
Saqib
384f4b5b7e
fix: can't open general ledger from consolidated financial report (#25542) 2021-05-04 12:33:49 +05:30
Saqib
076020643d
fix: empty payment term column in accounts receivable report (#25556) 2021-05-04 12:26:49 +05:30
Afshan
6d3305c446 fix: added total column 2021-04-21 15:34:58 +05:30
Rohit Waghchaure
cb6494876f feat: purchase receipt creation from purchase invoice 2021-04-10 10:49:30 +05:30
Afshan
c42318ec24 chores: clean up 2021-04-09 17:44:30 +05:30
Afshan
31b5dfe9ee feat: Dimension-wise Accounts Balance Report 2021-04-09 16:52:14 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix 2021-03-10 16:35:59 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report 
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.

Related issue: ISS-20-21-10217
 2021-03-10 15:23:48 +05:30
Afshan
e314b8b209
fix: general ledger report (#24770) 2021-03-09 20:31:57 +05:30
Afshan
1002e36c53 fix: removed unused import 2021-03-08 14:39:19 +05:30
Afshan
fa932e2a3e fix: sending proper arguments for report 2021-03-08 14:36:40 +05:30
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report 2021-03-04 09:21:25 +04:00
rohitwaghchaure
164ffac4ef fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580) 
Fixed conflicts
 2021-02-12 17:33:07 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports (#24462) 
* fix: dynamic links for reports

* fix: revert changes for payment period report

* fix: link doctypes
 2021-02-11 20:11:06 +05:30
Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report (#24483) 2021-02-05 23:35:47 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error 2021-01-19 10:44:49 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
pateljannat
6bec696396 fix: item_group fallback 2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd fix: handled invoices with no item_code 2021-01-18 15:27:40 +05:30
Anuja P
47b42e6441 fix: Translation fixes 2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf fix:Payment Period based on invoice date report fix/refactor 2021-01-14 20:58:34 +05:30
Afshan
91e3c07d77 fix: assest depreciation ledger 2020-12-28 19:42:46 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch (#24109) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-12-11 13:28:23 +05:30
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Rucha Mahabal
fa950662b9 fix: import statement 2020-12-08 12:32:19 +05:30
Rucha Mahabal
db0bbfac97 feat(reports): get item details from Item doctype instead of the Transaction 2020-12-08 12:20:07 +05:30
marination
724e16bca1 chore: Use JSON style response and use ORM 
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
 2020-11-30 12:55:30 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports (#23835) 2020-11-09 20:20:05 +05:30
marination
28dd90f3dc Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return 2020-11-02 15:16:31 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents (#23747) 2020-10-28 17:08:47 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return 2020-10-27 15:34:51 +05:30
Nabin Hait
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 (#23718) 2020-10-24 22:00:32 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return 2020-10-13 16:57:11 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters 
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.

https://github.com/frappe/erpnext/issues/23613
 2020-10-13 08:18:59 +03:00
Saqib
ebbe285872
feat: (report) POS Register (#23313) 
* feat: pos register report

* feat: group by fields in pos register

* chore: add paid amount column

* fix: (minor) remove redundant group by label
 2020-10-12 17:02:31 +05:30
rohitwaghchaure
3c77a4697b
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report 
fix: currency symbol in profit and loss report
 2020-10-03 10:32:00 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py 2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493 fix: currency symbol in profit and loss report 2020-09-30 17:44:35 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance 
fix(Accounts): Add Currency filter in Trial Balance report
 2020-09-30 13:16:16 +05:30
Abhishek Balam
001e7e9df9 fix: remove default value 2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0 fix: add currency select to Trial Balance 2020-09-30 01:32:42 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Afshan
8be51e22c4 fix: escape apostrophe in cost centre and project if exist 2020-09-23 14:52:36 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return 2020-09-22 15:39:25 +05:30
Anurag Mishra
170ecdc76e fix: No handlefor Cost centers in Accounts Receivable 2020-09-18 13:26:46 +05:30
marination
efb211af6d chore: Fix Received/Delivered Items to Billed Logic 2020-09-09 16:24:11 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent 
fix proposed by Andriesvn in bug report

closes #22180
 2020-09-08 00:27:57 +01:00
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total 
feat: enable total row in Gross Profit Report
 2020-09-02 12:18:41 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters 
fix: General Ledger filter validation
 2020-09-01 17:53:32 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Syed Mujeer Hashmi
b23840bf7b fix: Filter out cancelled entries in customer ledger summary 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-08-29 23:09:18 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
Marica
e7fabb10e1
Merge branch 'develop' into general-ledger-filters 2020-08-27 11:59:01 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report 2020-08-24 20:23:19 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Rohit Waghchaure
310ade7282 profit and loss report not working 2020-08-18 16:07:24 +05:30
Glen Whitney
b2604d1f77 fix(General Ledger): include Accounting Dimension columns in report 
Prior to this commit, custom Accounting Dimensions are not
  (by default) shown or even considered in generating a General
  Ledger report. Moreover, as they are not considered, they are
  not used to distinguish GL Entry lines in the same voucher
  with the same Account when the "Group By" value is
  "Group by Voucher (Consolidated)". This situation leads to
  lines with different values for the accounting dimension
  to be ganged together in the General Ledger view of a Journal
  entry, making the entry difficult for an accountant to read.

  This commit alleviates the problem by adding a checkbox
  to control whether Accounting Dimension columns are considered
  in the General Ledger report. When they are considered, they
  are displayed and also included in the key that distinguishes
  lines in the "Group by Voucher (Consolidated)" mode.

  Resolves #23033.
 2020-08-17 20:43:56 +00:00
marination
eb241c6c42 fix: General Ledger filter validation 2020-08-17 12:57:56 +05:30
Anupam K
b3bd780d46 fix: codasy dix 2020-08-13 17:07:15 +05:30
prssanna
bfb219612e feat: enable total row in Gross Profit Report 2020-08-13 11:34:05 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports (#22888) 2020-08-03 20:41:25 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Anupam K
8718daa11e Adding formatter in budget variance report 2020-07-25 23:56:11 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report (#22616) 
* fix: buying price for non stock item in gross profit report

* fix: refactor query
 2020-07-24 09:49:17 +05:30
Shivam Mishra
f59d927f73 feat: update summary items 2020-07-23 17:02:32 +05:30