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

39489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
0a937dc050 fix: show Exit Questionnaire button only to the users with write access 
- fix linter issues
 2021-12-07 13:04:23 +05:30
Rucha Mahabal
3230741cde fix: email summary 2021-12-06 10:08:51 +05:30
Rucha Mahabal
b69e0d2c63 feat: default Notification - a day before Exit Interview 2021-12-05 22:28:22 +05:30
Rucha Mahabal
1c09439d03 chore: update HR workspace 2021-12-05 22:06:19 +05:30
Rucha Mahabal
3437f568be feat: Employee Exits report 2021-12-05 21:55:13 +05:30
Rucha Mahabal
d67536cc8d feat: update Exit Interview date in employee master on submission 2021-12-05 19:55:25 +05:30
Rucha Mahabal
e30187f246 feat: bulk questionnaire sending 2021-12-05 19:32:33 +05:30
Rucha Mahabal
09fdfed163 fix: make Exit Interview submittable 2021-12-05 18:28:23 +05:30
Rucha Mahabal
1347187a30 feat: track status and final decision (Retained/Exit Confirmed) 2021-12-05 17:20:39 +05:30
Rucha Mahabal
235b707417 feat: add default Exit Questionnaire email template 2021-12-05 17:06:29 +05:30
Rucha Mahabal
7412accf6d feat: sending Exit Questionnaire 2021-12-05 17:02:19 +05:30
Rucha Mahabal
36a2d8ee0d feat: Exit Interview 2021-12-05 14:42:27 +05:30
Rucha Mahabal
0ef42d1000
fix(patch): create only component type field instead of running the whole setup (#28734) 2021-12-05 12:44:20 +05:30
rohitwaghchaure
fc4e6a2bed
Merge pull request #28710 from noahjacob/calc_outgoing_stock_entry 
fix: incorrect outgoing rates when material_consumption enabled
 2021-12-04 12:34:33 +05:30
Ankush Menat
ba5a7ffd60 fix: weird item sorting by idx 2021-12-03 19:08:06 +05:30
Ankush Menat
5caf411be3 fix: remove autocommit from item rename 2021-12-03 18:47:53 +05:30
Ankush Menat
72dbc3d6b8 fix!: dont allow renaming warehouse primary key 2021-12-03 18:47:53 +05:30
Noah Jacob
35346de162 test: added tests for manufacture stock entry when material_consumption is enabled 2021-12-03 17:21:49 +05:30
Saqib
7511a9ed31
fix(ksa): qrcode for invoices with special chars (#28715) 2021-12-03 16:13:44 +05:30
Deepesh Garg
a8f283bb20
Merge pull request #28708 from deepeshgarg007/ksa_qr_invoice_total 
fix: Invoice amount in KSA E Invoice QR Code
 2021-12-03 15:18:15 +05:30
Noah Jacob
7f3e6d149a fix: incorrect outgoing rates when material_consumption enabled 2021-12-03 15:11:18 +05:30
Ankush Menat
cef84c25a7 refactor: simplify the way SLEs are submitted 2021-12-03 14:51:25 +05:30
Ankush Menat
97060c45e9 refactor: replace misleading variable name 2021-12-03 14:51:25 +05:30
Deepesh Garg
f2ffddf059 fix: Invocie amount in KSA E Invoice QR Code 2021-12-03 14:32:52 +05:30
Deepesh Garg
c339240250
Merge pull request #28698 from frappe/mergify/bp/develop/pr-28654 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
 2021-12-03 14:26:43 +05:30
Rucha Mahabal
0b1808e1ee
fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) 2021-12-03 11:46:14 +05:30
Saqib
9c60c45acf
fix: Create Depreciation Schedules for existing Assets accurately (#28675) 2021-12-03 11:30:47 +05:30
Saqib
7314aee394
fix: qrcode image name for invoices with special chars (#28699) 2021-12-03 11:29:51 +05:30
Deepesh Garg
35e2bd89c0 fix: India utils code cleanup 
(cherry picked from commit 56c626adbfbd04e7e9063f6500ec380f7bfb3da4)
 2021-12-03 04:12:43 +00:00
Deepesh Garg
f12be3001d fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 
(cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)
 2021-12-03 04:12:42 +00:00
Deepesh Garg
0991ec9a7f
Merge pull request #28693 from frappe/mergify/bp/develop/pr-28627 
fix: Paid invoices showing in AR/AP report (backport #28627)
 2021-12-03 09:33:19 +05:30
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
 2021-12-02 13:44:27 +00:00
Ankush Menat
a37c99a23d
fix: dont requeue repost immediately and clear progress (#28684) 2021-12-02 14:51:04 +05:30
Saqib
fa42cf796b
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 12:13:12 +05:30
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Ganga Manoj
9bc28210c9
fix: Make buttons translatable (#28679) 2021-12-02 11:31:38 +05:30
Saqib
38cbaa3168
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 11:20:49 +05:30
Deepesh Garg
322c700eb9
Merge pull request #28533 from GangaManoj/product-bundle-fixes 
fix: misc minor Product Bundle fixes
 2021-12-02 09:20:40 +05:30
GangaManoj
828769ca70 fix: Remove unnecessary variable 2021-12-02 01:09:15 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
GangaManoj
774ac852c9 fix: Test if depreciation schedules are set up properly for existing assets 2021-12-01 22:51:55 +05:30
GangaManoj
de002005ac fix: Modify has_pro_rata() to include existing assets 2021-12-01 22:51:08 +05:30
GangaManoj
5c3d4caeda fix: Create Depreciation Schedules properly for existing Assets 2021-12-01 21:48:47 +05:30
GangaManoj
22cc8d2246 fix: Fix depreciation_amount calculation 2021-12-01 21:46:09 +05:30
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests (#28667) 2021-12-01 17:31:17 +05:30
Ankush Menat
445966ab80
test: timeout certain tests in work order to avoid stuck tests (#28666) 
[skip ci]
 2021-12-01 16:34:05 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm (#28390) 2021-12-01 12:14:06 +05:30
Saqib
01d8b8519f
fix: cannot load company form (#28535) 2021-12-01 12:11:30 +05:30
Sagar Vora
ab280f7142
fix: update modified timestamp for delivery note #28657 
fix: update `modified` timestamp for delivery note
 2021-12-01 11:01:49 +05:30
GangaManoj
a473e1dbe9 fix: Add item to packing list 2021-12-01 01:29:35 +05:30