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

6617 Commits

Author SHA1 Message Date
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30 fix(General Ledger): Implement multi-account selection 2021-06-14 13:22:44 +05:30
Deepesh Garg
856484aeb0 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2 feat: add Inactive status to Employee 2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba feat: add Inactive status to Employee 2021-06-12 13:33:21 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
48f2839079 fix: Sort account balances by account name 2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
a5c3427293 fix: Sort account balances by account name 2021-06-10 18:09:49 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card 
fix: Only display GST card in Accounting Workspace if it's in India
 2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1 fix: GL Entry ordering 2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab fix: Only display GST card in Accounting Workspace if it's in India 2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6 fix: Update einvoice json test 2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb fix: Failing test case 2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry (#25766) 2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos (#25822) 2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db fix: Test case 2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207 fix: Debug tests 2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162 fix: Debug test 2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 
fix(pos): multiple pos issues
 2021-06-06 11:25:29 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
48036b4bab fix: invoices can alter profit and loss of a closed year 2021-06-04 09:54:34 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882) 
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
 2021-06-01 12:15:58 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-31 19:49:03 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount (#25868) 2021-05-31 09:56:49 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report (#25884) 2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset 
fix(plaid): cannot reset plaid link for a bank account
 2021-05-29 20:05:25 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Saqib Ansari
05386ff12f chore: remove unwanted method 2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3 fix: reset plaid link button 2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623 fix(plaid): cannot reset plaid link for a bank account 2021-05-28 11:36:24 +05:30
Suraj Shetty
96542c3d04 style: Fix sider issues 2021-05-28 09:10:34 +05:30
Suraj Shetty
a891d6eed2 fix: allow_zero_valuation_rate for rejected qty 2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d test: Fix test dependency 2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67 test: Fix dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Deepesh Garg
a150645b57 fix: Remove GL Entry from print 2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca fix: Split GL Entry 2021-05-27 20:09:45 +05:30
Deepesh Garg
740c68d075 fix: Debug Test 2021-05-27 17:43:53 +05:30
Anuja P
753e5894de fix: ageing error in PSOA 2021-05-27 17:33:22 +05:30
Anuja P
bb0a40b995 fix: ageing error in PSOA 2021-05-27 17:15:47 +05:30
Deepesh Garg
ea18230274 fix: Update GL Entry ordering 2021-05-27 16:40:37 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes 
fix(ux): fix unstranslated text in msgprint/throw
 2021-05-26 14:12:36 +05:30
Deepesh Garg
5e27c7dae2 fix: Add non group filter for account 2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1 fix: Update TDS rate for test 2021-05-25 22:03:50 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Deepesh Garg
55a3fb57dd fix: Linting Issues 2021-05-25 17:40:06 +05:30
Deepesh Garg
6f84cee6fe fix: Uncommentt test 2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
c9da1fc568 chore: Test case for adance TDS allocation 2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4 fix: Allocate advance taxes only for payment entry 2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67 fix: Test Cases 2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c fix: TDS report cleanup 2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613 fix: TDS against Purhase Orders 2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818 feat: Tax deduction against advance payments 2021-05-25 17:17:40 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13 
fix: Ignore rounding diff while importing JV using data import
 2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice 
fix: removed serial no validation for sales invoice
 2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13 
fix: Cashflow mapper not showing data
 2021-05-24 20:40:07 +05:30
Deepesh Garg
25112244ed fix: Ignore rounding diff while importig JV using data import 2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format 
fix: Process Statement of Accounts formatting
 2021-05-24 19:55:21 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing (#25813) 2021-05-24 18:22:03 +05:30
Nabin Hait
9b912b6adc Merge branch 'version-13' into develop 2021-05-24 16:45:27 +05:30
Saqib
6368c976c7 fix: expected amount in pos closing payments table (#25737) 2021-05-24 16:44:38 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript 2021-05-23 13:39:09 +05:30
Rucha Mahabal
59961f70ee refactor: timesheet 2021-05-22 10:21:04 +05:30
Suraj Shetty
3e6cc5037b fix: Remove unnecessary code 2021-05-21 17:37:19 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one (#25760) 2021-05-21 16:32:56 +05:30
Anuja P
605ea044f3 fix: update process SOA format 2021-05-21 11:24:33 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor 
refactor: timesheet
 2021-05-20 23:43:19 +05:30
Rucha Mahabal
a7d0dbb085 fix: calculate total billing amount on fetching timesheets 
- show timesheet billing amounts in doc currency
 2021-05-20 23:02:11 +05:30
Deepesh Garg
42e0692a81
Merge pull request #25704 from CaseSolvedUK/workspace-onlyfor-v13 
fix: filter for Indian workspace card
 2021-05-20 17:10:29 +05:30
Deepesh Garg
9de1a45185
Merge pull request #25699 from Anuja-pawar/fix_process_statement_report 
fix: Process Statement of Accounts formatting
 2021-05-19 19:21:43 +05:30
Saqib Ansari
f79ef5d8cf fix: missing cost center message on creating gl entries 2021-05-19 13:04:44 +05:30
Deepesh Garg
d15d0d8568
Merge pull request #25254 from CaseSolvedUK/taxdetail-v13 
feat: Tax Detail Report
 2021-05-18 22:45:29 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table (#25737) 2021-05-18 18:39:35 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name 
fix: escape company name
 2021-05-18 16:35:19 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Ankush Menat
b6783b158f
chore: translation fixes 2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue 2021-05-17 17:06:41 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
casesolved-co-uk
6ab46e288f fix: workspace formatting due to manual edit and filter tweaks 2021-05-13 12:56:02 +00:00
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
casesolved-co-uk
aca8c34c4d fix: filter for Indian workspace card 2021-05-13 12:11:41 +00:00
Mohammad Hasnain Mohsin Rajan
e85770fe3f
fix: bank statement import via google sheet (#25676) 
* fix: google sheet bank statement import

* fix: quotes

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: add translation

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: grammar

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* fix: remove comment

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-05-13 17:33:18 +05:30
Mohammad Hasnain Mohsin Rajan
7c6de1a8ac
fix: bank statement import via google sheet (#25677) 
* fix: change links in workspace

* fix: google sheet bank statement import

* chore: quotes

* fix: capitalization

* fix: typo

* chore: add translation
 2021-05-13 17:28:49 +05:30
Anuja Pawar
b28889c6f7
Merge branch 'develop' into fix_process_statement_report 2021-05-13 16:23:06 +05:30
Deepesh Garg
8e748f8451 fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 15:21:51 +05:30
Anuja P
e90a2a346b fix: update new changes 2021-05-13 15:15:47 +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
Anuja P
554c91d638 fix: solved conflicts 2021-05-13 14:48:38 +05:30
Anuja P
ab1ae418cc fix: Process SOA enhancement 2021-05-13 14:26:27 +05:30
Suraj Shetty
75909f061c
Merge branch 'develop' into parallel-distributed-testing 2021-05-12 18:14:49 +05:30
rohitwaghchaure
4fbabb4132
Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:40:23 +05:30