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

6810 Commits

Author SHA1 Message Date
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
rohitwaghchaure
4ec0656f64
Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:39:35 +05:30
Rohit Waghchaure
aaca8335f0 fix: updated modified time to pull new fields 2021-05-12 16:36:25 +05:30
Rohit Waghchaure
9f017a351b fix: updated modified time to pull new fields 2021-05-12 16:35:19 +05:30
Mohammad Hasnain Mohsin Rajan
e7a2fdd81a
fix: change links in workspace (#25674) 2021-05-12 13:02:32 +05:30
Mohammad Hasnain Mohsin Rajan
dd1822ef58
fix: change links in workspace (#25673) 2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin Rajan
af8436d0dc
fix: change links in workspace (#25670) 2021-05-12 13:01:03 +05:30
Deepesh Garg
d2520680bc
fix: Error on applying TDS without party (#25632) 
* fix: Error on applying TDS without party

* fix: Add placeholder value
 2021-05-10 21:17:06 +05:30
Suraj Shetty
b3fadebb41 style: Fix sider issues 2021-05-10 20:49:07 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30