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

39623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
c5fcbeff7a fix: reset_expected_response_and_resolution on hold 2021-12-14 18:45:27 +05:30
Saqib
4984513597
Merge pull request #28677 from GangaManoj/fix-adjust-asset-value 
fix: Fix 'Adjust Asset Value' button
 2021-12-13 21:51:09 +05:30
Saqib
ce80585d51
fix: Clear Depreciation Schedule before modification (#28507) 2021-12-13 21:49:43 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company 2021-12-13 20:13:53 +05:30
Ankush Menat
a388096c03
Merge pull request #28839 from ankush/migration_hashes 
fix: remove migration hashes from doctypes
 2021-12-13 11:27:27 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Rucha Mahabal
6fa66a4d81
feat(HR): Exit Interview and Employee Exits Report (#28741) 
* feat: Exit Interview

* feat: sending Exit Questionnaire

* feat: add default Exit Questionnaire email template

* feat: track status and final decision (Retained/Exit Confirmed)

* fix: make Exit Interview submittable

* feat: bulk questionnaire sending

* feat: update Exit Interview date in employee master on submission

* feat: Employee Exits report

* chore: update HR workspace

* feat: default Notification - a day before Exit Interview

* fix: email summary

* fix: show Exit Questionnaire button only to the users with write access

- fix linter issues

* test: Exit Interview

* chore: fix report column widths

* test: Employee Exits Report

* fix: tests and sider issues

* fix: missing import

* fix: tests

- specify sorting order in employee exits query

- rollback after work order tests
 2021-12-12 23:43:11 +05:30
Rucha Mahabal
bb97309e2e fix: tests 
- specify sorting order in employee exits query

- rollback after work order tests
 2021-12-12 23:20:04 +05:30
Rucha Mahabal
e93694d0ab fix: missing import 2021-12-12 23:02:44 +05:30
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview 2021-12-12 22:13:11 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date 
fix: Ageing in AR/AP report for advances
 2021-12-12 17:27:21 +05:30
Deepesh Garg
a6fba7f128
Merge pull request #28764 from deepeshgarg007/tds_report_fixes 
fix: TDS Monthly payable report
 2021-12-12 17:11:58 +05:30
Himanshu
624481be6f
feat(buying): quotation number in supplier quotation (#28420) 2021-12-11 11:51:59 +00:00
Ankush Menat
fe597cdd3b chore: remove unused issue tempaltes 
[skip ci]
 2021-12-10 18:33:58 +05:30
Ankush Menat
fcb614d1b7 chore: correct form format for issues 2021-12-10 18:23:24 +05:30
Ankush Menat
bf48f17600 chore: new and improved bug report form 
[skip ci]
 2021-12-10 18:17:21 +05:30
Ankush Menat
ffa3d45c42 chore: update stale rules and apply on issues 
[skip ci]
 2021-12-10 18:17:21 +05:30
rohitwaghchaure
e715dea4c7
Merge pull request #28815 from ankush/frozen_repost 
fix: validate pending reposts before freezing stock/account
 2021-12-10 17:11:29 +05:30
Ankush Menat
75bc404cbe test: stock frozen validation 2021-12-10 12:39:38 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Noah Jacob
f1c0190f02
feat: added QI link in Job Card Dashboard (#28643) 2021-12-09 20:21:17 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
c64d5028b4
fix: deduplicate after finishing the repost (#28803) 
Not really a bug but avoids potential of prematurely skipping something
if failure occurs and failure isn't resolved.
 2021-12-09 13:45:44 +05:30
Michael Köller
f043f59324
fix: wrong german translation of abbreviation PAN 
Wrong german translation of abbreviation: PAN
 2021-12-09 11:31:25 +05:30
Deepesh Garg
121f8ae865
Merge pull request #28776 from rtdany10/ksa-vat-updates 
feat(Regional): KSA E-Invoing optimizations and POS support
 2021-12-08 22:32:24 +05:30
Ganga Manoj
51c707a0ce
Merge branch 'develop' into fix-adjust-asset-value 2021-12-08 19:20:23 +05:30
Ganga Manoj
539cba1b15
Merge branch 'develop' into fix-clear-depr-schedule 2021-12-08 19:19:33 +05:30
Ankush Menat
96a019ec49 test: add multi-batch negative qty test 2021-12-08 15:52:40 +05:30
Ankush Menat
f0152d03a4 test: simplfy test and expect specific exception 2021-12-08 15:52:40 +05:30
Ankush Menat
9c90b7a40d refactor: remove redundant batch qty validation 
This check was only checking total sum, which is problamatic when making
backdated entries that can cause intermediate values to go negative
while overall values stay positive.
 2021-12-08 15:52:40 +05:30
Ankush Menat
5eba57528c fix: check future negative stock for batches 
batch's ledger is only maintained in form of `actual_qty` on batch's
SLEs. To validate if batch has any negative qty in future, cumulative
total of `actual_qty` is required to ensure it never goes negative.
 2021-12-08 15:52:40 +05:30
18alantom
1cbeba5f1d test: check execution of illegal stock entry seq 2021-12-08 15:52:40 +05:30
aaronmenezes
90b98440e2
fix: Maintenence Visit -Purpose (item ) tables is not visible on submitted or saved entries (#28792) 2021-12-08 14:48:19 +05:30
Deepesh Garg
5983ddf65b
Merge pull request #28790 from frappe/mergify/bp/develop/pr-28786 
fix: Error on Invoice generation (backport #28786)
 2021-12-08 14:14:26 +05:30
Deepesh Garg
d5380dd716 fix: Error on Invoice generation 
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
 2021-12-08 08:42:29 +00:00
Dany Robert
4a316550f4 chore: POS invoice format changes 2021-12-08 07:25:41 +00:00
Deepesh Garg
948b67b744
Merge branch 'develop' into ksa-vat-updates 2021-12-08 09:38:11 +05:30
Dany Robert
3e97492da4
fix: replace frappe.get_all 2021-12-08 08:03:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method 2021-12-08 07:53:45 +05:30
Dany Robert
ca85094728
chore: switch to frappe.db.set_value 2021-12-08 07:52:06 +05:30
Rucha Mahabal
dcbf0c9eca fix: tests and sider issues 2021-12-07 23:40:10 +05:30
Deepesh Garg
9a644f645c
Merge pull request #28779 from frappe/mergify/bp/develop/pr-28777 
fix: Error on creating invoice (backport #28777)
 2021-12-07 22:24:13 +05:30
Deepesh Garg
cb21dff882 fix: Error on creating invoice 
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
 2021-12-07 16:51:02 +00:00
Dany Robert
15373f1b2d
fix: intendation error 2021-12-07 18:34:34 +05:30
Dany Robert
45fce5a64b
chore: linters 2021-12-07 18:29:16 +05:30
Dany Robert
2df641eb54
feat(Regional): rename qr field and disable print formats 2021-12-07 18:13:35 +05:30
Dany Robert
9c68d8e35c
Merge branch 'frappe:develop' into ksa-vat-updates 2021-12-07 18:10:26 +05:30
Dany Robert
a0aeacee8e fix: reload doc 2021-12-07 12:39:39 +00:00
Dany Robert
bb3119cd1f feat(Regional): enable KSA print formats on setup 2021-12-07 11:05:41 +00:00
Dany Robert
293d981af9 feat(Regional): POS Invoice format for KSA 2021-12-07 11:03:22 +00:00