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

39694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
96ef88d935
test: remove commits from tests (#27939) 
* test: remove commits from tests in selling module

* test: remove commits from manufacturing module

* test: remove commits from accounts module tests

* test: remove commits from controller tests

* test: keep commits in accounting dimension test

* Revert "test: remove commits from controller tests"

This reverts commit f5cfbee5da844f8b2bffeee907ac602754f16ff4.

* Revert "test: remove commits from accounts module tests"

This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.
 2021-12-14 17:36:35 +05:30
Ankush Menat
66960cf050
fix: remove set only once from valuation method (#28876) 2021-12-14 17:12:46 +05:30
Ankush Menat
80f1a8c645
fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation
 2021-12-14 17:02:42 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30
aaronmenezes
304aa44feb
fix: Nonstock item showing in Itemwise Recommended Reorder Level report (#28873) 2021-12-14 15:18:03 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet 
fix: incorrect amount based on payment days in timesheet salary slip
 2021-12-14 14:57:21 +05:30
Ankush Menat
7fd06108bf
fix: reorder patch to fix custom field options (#28866) 2021-12-14 13:03:53 +05:30
Deepesh Garg
6749d8e6c9
Merge pull request #28832 from deepeshgarg007/ksa_e_invoice_patch_fix 
fix: KSA QR field rename patch
 2021-12-14 12:47:58 +05:30
Noah Jacob
cc8c0595e2
fix(UX): hide RM table(Job Card) if material transfer is against work order (#28746) 2021-12-14 12:20:04 +05:30
Noah Jacob
db46257a3b
feat: added required_date field to set date in child table (#28432) 
* feat: added required_date field to set date in child table

* fix: dont refresh full table

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-14 12:12:33 +05:30
Ankush Menat
534c64abcd
fix: packing slip incorrect item value (#28862) 2021-12-14 11:55:09 +05:30
Saqib
ae71b704ff
Merge pull request #28783 from nextchamp-saqib/hsn-wise-summary-report-fix 
fix: hsn-wise summary is incorrect if an invoice has repeated item code
 2021-12-13 22:39:32 +05:30
Saqib Ansari
2137e56947 revert: "fix: expected value after useful life validation" 2021-12-13 22:34:54 +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 Ansari
6a239c8ea3 test: test_hsn_summary_for_invoice_with_duplicate_items 2021-12-13 20:58:35 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company 2021-12-13 20:13:53 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding 2021-12-13 17:51:38 +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
Saqib Ansari
e74739a677 fix: hsn-wise summary is incorrect if an invoice has repeated item code 2021-12-12 19:53:33 +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
Deepesh Garg
14d03a9446 fix: KSA QR field rename patch 2021-12-12 12:55:30 +05:30
Himanshu
624481be6f
feat(buying): quotation number in supplier quotation (#28420) 2021-12-11 11:51:59 +00:00
ruthra
c3453cd73c feat: Deferred Revenue and Expense report 
- show deferred revenue and expense with actual and expected postings
 - unit tests added
 2021-12-10 19:30:43 +05:30
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