Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,017 Commits 3 Branches 0 Tags 1 GiB
17b1f5f256
Commit Graph

40017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
17b1f5f256 test: employee advance status 2022-01-18 18:35:25 +05:30
Rucha Mahabal
85be0d22d4 fix: employee advance status update on return via additional salary 2022-01-18 14:38:16 +05:30
Rucha Mahabal
0843d43885 fix(Expense Claim): validate advances after setting totals 2022-01-18 14:37:45 +05:30
Rucha Mahabal
bf30932de0 patch: Employee Advance return statuses 2022-01-18 14:36:38 +05:30
Rucha Mahabal
e04b3aaf7a feat(Employee Advance): add 'Returned' and 'Partly Claimed and Returned' status 2022-01-18 14:36:22 +05:30
Marica
dbda10e092
Merge pull request #28987 from ankush/fix/srvaluation 
fix: incorrect serial no valuation
 2022-01-17 16:55:21 +05:30
Rucha Mahabal
6aac8de53e
feat(UX): Option to exclude holidays while marking monthly attendance (#29185) 2022-01-17 16:28:46 +05:30
Deepesh Garg
6bea91e9fe
Merge pull request #29182 from ruthra-kumar/project_in_purchase_invoice 
fix: get project from PO into payment entry
 2022-01-17 15:04:03 +05:30
Deepesh Garg
09172002e7 fix: Linting issues 2022-01-17 15:01:17 +05:30
Rucha Mahabal
b07c1f3bf1
feat: add link to leave application in leave notification (#29316) 2022-01-17 14:37:25 +05:30
Ankush Menat
3db8d908dc
Merge pull request #29278 from shariquerik/update-workspace-json 
fix: Updating public workspace json based on new design
 2022-01-17 13:25:16 +05:30
rohitwaghchaure
9088984481
Merge pull request #29304 from ankush/fix/zero_valued_reposts 
fix: dont update sle values from get_gl_entries
 2022-01-17 11:59:17 +05:30
Anupam Kumar
4d48035828
fix: show work order progress bar even it is closed (#29312) 2022-01-17 11:49:57 +05:30
Ankush Menat
66bf21f143
fix(patch): sle.serial_no = "\n" causes incorrect queue (#29306) 
This happens due to old data.
 2022-01-16 20:45:59 +05:30
Ankush Menat
82ea958730
fix: ignore cancelled SLEs (#29303) 2022-01-16 20:19:04 +05:30
Ankush Menat
5d27a7672e test: serial no valuation test case 2022-01-16 17:54:12 +05:30
Ankush Menat
0272397e54 test: make sure zero incoming rate is maintained while consuming 2022-01-16 13:24:40 +05:30
Ankush Menat
b0cf6195e9
fix: only add stock queue if FIFO (#29302) 2022-01-16 13:02:23 +05:30
Ankush Menat
8f5772463c fix: dont update sle values from get_gl_entries 2022-01-16 12:42:44 +05:30
Ankush Menat
fcc885bc16 fix: get incoming rate only if not return 2022-01-16 12:40:25 +05:30
Ankush Menat
b9642a1036 fix: incorrect incoming rate computation for sr no 2022-01-16 12:39:34 +05:30
Deepesh Garg
1e34300f69
Merge branch 'develop' into project_in_purchase_invoice 2022-01-15 21:00:14 +05:30
Deepesh Garg
3438e1f0c4
Merge pull request #29175 from rtdany10/patch-14 
fix: seperate custom field creation for KSA
 2022-01-15 20:52:57 +05:30
Dany Robert
2b681f04fd
fix: exclude existing serial numbers while auto creating new #29292 
fix: exclude existing serial numbers while auto creating new
 2022-01-15 20:08:11 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv 
fix: Deferred revenue booking for multi currency invoices via JV
 2022-01-15 18:55:41 +05:30
Deepesh Garg
fd922f1617 fix: Remove unwanted test 2022-01-15 18:27:40 +05:30
Deepesh Garg
ae95439c7e
Merge pull request #29208 from deepeshgarg007/nil_exempt_non_gst_gstr_1 
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
 2022-01-14 19:43:40 +05:30
Saqib Ansari
1d976655f5
refactor: exclude submittable doctype from SLA (#29286) 2022-01-14 18:46:52 +05:30
Saqib Ansari
cc88b31f1f test: remove sla if no active sla found 2022-01-14 18:17:40 +05:30
Saqib Ansari
b31679b6ef fix: customer filter while fetching active sla 2022-01-14 16:31:48 +05:30
Saqib Ansari
0bfbfa3719 fix: reset sla if no active sla found 2022-01-14 16:13:17 +05:30
Saqib Ansari
a68fc546e7 refactor: do not allow submittable doctypes for SLA 2022-01-14 15:35:40 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields (#29287) 2022-01-14 14:59:58 +05:30
Deepesh Garg
b9b4c9aff7
Merge pull request #29270 from nextchamp-saqib/change-fieldtype 
fix: threshold fields shows incorrect currency
 2022-01-14 14:50:45 +05:30
Chillar Anand
39eb4e040c
fix(healthcare): Remove custom fields related to healthcare (#29129) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-14 12:37:32 +05:30
Saqib Ansari
a9ab157198 fix: remove dashboard showing only issue count 2022-01-14 11:42:34 +05:30
Deepesh Garg
08f26de3df fix: Remove comment 2022-01-13 23:05:27 +05:30
Deepesh Garg
1846dbfb4d Merge branch 'develop' of https://github.com/frappe/erpnext into nil_exempt_non_gst_gstr_1 2022-01-13 22:40:20 +05:30
Deepesh Garg
55c445cd37 fix: JSON for nil/exempt and non gst 2022-01-13 22:39:57 +05:30
rohitwaghchaure
388293dbea
Merge pull request #29280 from rohitwaghchaure/company-filter-issue-for-default-account 
fix: accounts are coming from different company in the dropdown
 2022-01-13 21:11:55 +05:30
Shariq Ansari
dd56bf205a fix: fixed card for buying workspace 2022-01-13 20:19:49 +05:30
Shariq Ansari
469bddcadf fix: minor fix 2022-01-13 19:50:26 +05:30
Deepesh Garg
24bb1e8987 fix: Test case 2022-01-13 19:44:26 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Ankush Menat
be0a4412d3 chore: update label rules 2022-01-13 17:19:59 +05:30
Marica
343f517740
Merge pull request #29271 from marination/allow-multiple-fg-in-repack 
fix: Don't validate FG in repack entry
 2022-01-13 15:27:22 +05:30
marination
c49dff385a test: Check for FinishedGoodError if 0 FG in repack entry 2022-01-13 15:02:59 +05:30
marination
3922a39591 test: Basic test one item repacked into two 
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls
 2022-01-13 14:36:21 +05:30
Rucha Mahabal
3a18e62a9b
fix: filter for leave period in Bulk Leave Policy Assignment (#29272) 
* fix: filter for leave period in Bulk Leave Policy Assignment

* fix: set title for Leave Policy Assignment
 2022-01-13 14:08:11 +05:30
marination
eac7b5d5aa fix: Allow multiple fg in repack entry 2022-01-13 13:44:20 +05:30