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

1477 Commits

Author SHA1 Message Date
Nihantra C. Patel
e2b4ae13fa fix: Set filter condition and spell in AR 2022-09-12 14:09:42 +05:30
Deepesh Garg
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit 
feat: two new filters for gross profit
 2022-09-04 15:56:54 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues 2022-09-04 13:15:59 +05:30
ruthra kumar
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report 
fix: key error on consolidated financial report
 2022-09-02 16:13:19 +05:30
ruthra kumar
6e8395cccd fix: key error on consolidated financial report 
accounts with same name but different account number will throw key
error on consolidated report
 2022-09-02 09:55:24 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger 
refactor: readd remarks field to payment ledger
 2022-08-29 19:48:36 +05:30
ruthra kumar
5782c4469a refactor: re-add remarks field to payment ledger and AR/AP report 2022-08-29 15:59:37 +05:30
ruthra kumar
6aa8fd0f7b fix: restrict party types to Supplier/Customer for AR/AP report 2022-08-25 15:50:06 +05:30
ruthra kumar
e5b04d54ff fix: display amount in account currency if party is supplied 2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po 
fix: include payment against PO in AR/AP report
 2022-08-25 09:40:45 +05:30
ruthra kumar
36f5883dda test: payments against so/po will show up as outstanding amount 
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
 2022-08-24 13:59:42 +05:30
ruthra kumar
fdd167cac1 fix: include payment against PO in AR/AP report 2022-08-24 12:24:55 +05:30
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate 
fix: incorrect buying amount in Gross Profit rpt
 2022-08-18 16:08:19 +05:30
ruthra kumar
967dd398e7 fix: incorrect buying amount in Gross Profit rpt 2022-08-17 16:21:03 +05:30
hrzzz
3ef551872a fix: remove spaces and order import 2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77 feat: two new filters for gross profit 2022-08-15 09:14:23 -03:00
Akash Krishna
32b30bc5de
Tds report (#31801) 
* fix: TDS Computation Summary Report not loading, too many values to unpack
 2022-08-09 17:41:02 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… (#31756) 
fix: formatter getting error to show sales invoice group or print report.

1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')

2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')

i fixed both errors and all working perfectly.
 2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter (#31763) 2022-08-03 11:16:59 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report 
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
 2022-07-27 08:26:16 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation 2022-07-20 14:22:27 +05:30
Deepesh Garg
a6ff4db2ec
fix: Supplier details in TDS monthly report (#31599) 2022-07-19 10:14:44 +05:30
Rucha Mahabal
cd9a01be5f test: Loan entries in Bank Reco Statement report 2022-07-11 11:57:25 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation 2022-06-29 12:35:51 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note 
fix: 'attribute error' on AR/AP report with delivery note filter
 2022-06-29 08:06:34 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Rucha Mahabal
2b255bdddb fix: Bank Statement loan amount query 2022-06-27 19:18:13 +05:30
ruthra kumar
3cd34ebab6 fix: 'attribute error' on AR/AP report with delivery note filter 2022-06-27 17:29:25 +05:30
Deepesh Garg
6acd0325be fix: General Ledger and TB opening entries mismatch issues 2022-06-24 21:45:05 +05:30
Rucha Mahabal
eac58abcc5 chore: Remove HR related reports from other modules 
- Project Profitability report: Projects

- Employee Hours Utilization Based on Timesheet: Projects

- Unpaid Expense Claims: Accounts
 2022-06-23 20:50:55 +05:30
Rucha Mahabal
f6fbcc99a3 chore: Removed payroll dependencies from Loan Management, moved to hrms app 
- Salary Slip Loan dt moved to hrms, removed from erpnext app

- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup

- fixed references to salary slip loan fields
 2022-06-21 18:13:01 +05:30
Nihantra C. Patel
0097a2b60c
Update bank_clearance_summary.py 2022-06-17 18:35:11 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Solufyin
0410752fcf
Merge branch 'frappe:develop' into solufy_rec_pay_report 2022-06-13 13:20:41 +05:30
Deepesh Garg
ea276a7b86
Merge branch 'develop' into refactor_ar/ap_report 2022-06-13 12:34:47 +05:30
ruthra kumar
3018756482 refactor: remove 'show remarks' 2022-06-13 10:56:33 +05:30
ruthra kumar
71521b6550 refactor: unit test for AR/AP report 2022-06-13 10:56:33 +05:30
ruthra kumar
cd9d70d6ee refactor: show advance payments in AR/AP report 2022-06-13 10:56:33 +05:30
ruthra kumar
dfe3082596 refactor: AR/AP will use payment ledger 2022-06-13 10:56:30 +05:30
Deepesh Garg
9562c28408
Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule 
feat: two new groupby mode on gross profit: Monthly, Payment Term
 2022-06-10 12:52:35 +05:30
Deepesh Garg
a2f34d74f3
Merge pull request #31225 from vishdha/fix_date_range_print 
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
 2022-06-10 10:52:53 +05:30
Deepesh Garg
43bf327f9b
Merge pull request #31216 from sunhoww/patch-4 
fix: Trial Balance failing to ignore Finance Book
 2022-06-09 20:34:33 +05:30
Sun Howwrongbum
ee2949aa3f
fix: typo in sql condition 2022-06-09 19:28:59 +05:30
Deepesh Garg
b9dbb36d0e chore: Linting Issues 2022-06-09 18:58:04 +05:30
Marica
60968419e7
Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report 
fix: misaligned columns in print format of AR/AP report
 2022-06-09 17:35:21 +05:30
ruthra kumar
bbaa14af16 fix: misaligned columns in print format of AR/AP report 2022-06-09 15:14:44 +05:30
Nihantra C. Patel
43b0f2efe6 [DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports. 2022-06-08 17:36:42 +05:30
Ankush Menat
f830b57fd4 test: sales register report with conditions 2022-06-07 15:23:32 +05:30
Vishal Dhayagude
934cb97d90
Merge branch 'develop' into fix_date_range_print 2022-06-06 21:34:14 +05:30
Deepesh Garg
fe5b9e8bbb
Merge branch 'develop' into patch-4 2022-06-06 16:45:20 +05:30
vishdha
53774e0f52 chore: minor change in fetching start and end date 2022-06-06 16:00:56 +05:30
vishdha
3513d54c0a fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year 2022-06-06 16:00:56 +05:30
Ankush Menat
c3219ebad1 fix(Sales Register): incorrect query with dimensions 
If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.

e.g. `item_group = (child1, child2)` instead of `in` query.

fix: don't add default filter if they are part of dimensions to be
added.
 2022-06-06 12:39:12 +05:30
Deepesh Garg
a200e7e1fb fix: Remove redundant query 2022-06-05 11:16:12 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book 2022-06-01 20:20:16 +05:30
hrzzz
c4af63ad98 feat: two new groupby mode: Monthly, Payment Term 2022-05-31 10:46:56 -03:00
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries 
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
 2022-05-31 15:25:09 +12:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report (#31039) 
fix: Chart data for monthly periodicity in Cash Flow report
 2022-05-25 19:39:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries 2022-05-25 18:50:54 +05:30
Deepesh Garg
9e4a36089e chore: Linting Issues 2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31 chore: Linting Issues 2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7 fix: Loan Doc query in Bank Reconciliation Statement 2022-05-25 17:58:30 +05:30
Rohit Waghchaure
69be22ba7c fix: select multiple values for accounting dimenssion 2022-05-14 17:19:34 +05:30
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register (#30922) 2022-05-09 15:14:57 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated 
fix: Consider party and party type as well in group by consolidated view
 2022-05-06 13:10:00 +05:30
Deepesh Garg
c2d52a1ac0 fix: Consider paryt and party type as well in group by consolidated view 2022-05-04 15:59:24 +05:30
Deepesh Garg
e8d6eb207d fix: Ignore loan repayments made from salary slip 
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
 2022-05-04 04:15:07 +00:00
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Sagar Vora
3b4754f3f6 fix: define tax_columns below consistency 2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Saqib Ansari
5408980223 Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:31:54 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Saqib Ansari
5450542fdb fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 2022-03-25 16:44:37 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary (#30345) 
* fix: wrong values for report and get change amout based on payment TYPE.

* charcase for select field.

* fix: linter check erros

* fix: linters errors

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 11:39:15 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary (#30264) 2022-03-21 16:57:27 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query 
fix: custom cash flow mapper doesn't show any data
 2022-03-21 10:32:42 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284 
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)
 2022-03-18 17:36:59 +05:30
Saqib Ansari
00bfee97c7 refactor: convert raw sql to frappe.qb 2022-03-18 14:31:30 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation 
fix: Validate income/expense account in sales and purchase invoice
 2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284 2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928 fix: Test case 2022-03-17 18:00:39 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error 
fix: Error in bank reconciliation statement
 2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca fix: Remove comments 
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
 2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003 fix: Clean and fixes in Dimension-wise Accounts Balance Report 
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
 2022-03-17 11:57:50 +00:00
Saqib Ansari
119273e633 fix: custom cash flow mapper doesn't show any data 2022-03-17 14:47:50 +05:30
Deepesh Garg
fbcb413d96 fix: Error in bank reco statement 2022-03-15 18:20:11 +05:30
Saqib Ansari
12d99ed69a test: foreign_account_balance_after_exchange_rate_revaluation 2022-03-15 17:56:42 +05:30
Saqib Ansari
83a5fae591 fix: incorrect debit credit amount in presentation currency 2022-03-14 20:14:46 +05:30
Deepesh Garg
6308e1be91 fix: Do not consider cancelled entries 2022-03-13 18:13:12 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 16:56:49 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount 
fix: Total Credit amount in TDS Payable monthly report
 2022-02-21 15:33:58 +05:30
Deepesh Garg
a82cf7214e fix: Total Credit amount in TDS Payable monthly report 2022-02-21 13:58:56 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 12:34:14 +05:30