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

41921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
5a8c80b153
Merge branch 'develop' into mr-to-order-and-receive-report 2022-03-01 13:01:35 +05:30
marination
ffbb2c8311 fix: Assert False for test that is anticipating an empty table and remove second arg to assertTrue 2022-03-01 12:57:09 +05:30
Deepesh Garg
0542416c47
Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze 
fix: Deferred revenue booking
 2022-03-01 12:41:41 +05:30
marination
25fa6344a6 test: Adjust test as per teardown 
- make tests use multi level bom in WO, as BOM at setup is used
- earlier, an intermediate BOM made in a test would override the BOM at setup
 2022-03-01 12:24:45 +05:30
Deepesh Garg
366120ffee fix: Deferred revenue booking 2022-03-01 11:57:34 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation 2022-03-01 11:49:25 +05:30
Ankush Menat
bbc4710fa3 fix: apply margin on duplicated doc too 2022-03-01 11:48:28 +05:30
Rushabh Mehta
4e2c284be7 fix(minor): nix the ugly banner 2022-03-01 08:52:42 +05:30
Rohit Waghchaure
bda9d09125 bumped to version 14.0.0-beta.2 2022-02-28 21:57:03 +05:30
Deepesh Garg
1191232f02
Merge pull request #29977 from deepeshgarg007/payment_entry_total_taxes 
fix: Total taxes and charges in payment entry for multi-currency payments
 2022-02-28 19:09:39 +05:30
Deepesh Garg
785fcca957 Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes 2022-02-28 18:06:14 +05:30
Deepesh Garg
19fb7ead9f test: Add test case for payment entry taxes 2022-02-28 18:05:58 +05:30
rohitwaghchaure
bbfff1b795
Merge pull request #30015 from rohitwaghchaure/removed-validation-for-zero-qty 
refactor: removed validation to check zero qty
 2022-02-28 17:54:26 +05:30
Marica
789e042f7d
Merge branch 'develop' into prod-plan-sub-items-aggregate 2022-02-28 17:38:29 +05:30
Marica
5fe8c48ba8
Merge branch 'develop' into prod-plan-sub-items-aggregate 2022-02-28 17:38:14 +05:30
Ankush Menat
829c453cb6 test: remove transaction commits from buying module 2022-02-28 17:36:58 +05:30
Rucha Mahabal
3f3b1766c2 test: get leave details for leave application dashboard 2022-02-28 17:30:09 +05:30
Ankush Menat
b0d1e6db54 test(refactor): use FrappeTestCase 2022-02-28 17:23:32 +05:30
marination
292fe370db test: combine sub assembly items and make Production Plan tests atomic 2022-02-28 16:35:20 +05:30
Rucha Mahabal
a58dfecb23 test: fix test test_leave_balance_near_allocaton_expiry 2022-02-28 15:27:24 +05:30
Marica
b8593188f3
Merge branch 'develop' into prod-plan-sub-items-aggregate 2022-02-28 15:08:21 +05:30
Rohit Waghchaure
39d3f20d9b fix: removed validation to check zero qty 2022-02-28 14:29:07 +05:30
Rucha Mahabal
aaa1ae94f2 fix: earned leave policy assignment test 2022-02-28 14:26:49 +05:30
Rucha Mahabal
942511cfff fix: leave application dashboard 
- total leaves allocated considering cancelled leaves

- optional plural for leave category labels

- show dashboard only once from date is set, else it fetches all allocations till date and generates incorrect balance

- change pending leaves to 'Leaves Pending Approval' for better context

- update labels in Salary Slip Leave Details table
 2022-02-28 14:10:23 +05:30
Ankush Menat
1d1203d5ec fix: dont fetch draft/cancelled BOMs 2022-02-28 13:14:16 +05:30
Ankush Menat
3cc47d5ba5 fix: correct fieldname for source warehouse 2022-02-28 13:06:56 +05:30
Ankush Menat
0bed592777 fix: open stock entry instead of submitting from item dashboard 2022-02-28 13:06:56 +05:30
Ankush Menat
88a21ca7d2 fix: only show child warehouses for transfer 2022-02-28 13:06:56 +05:30
Deepesh Garg
0624b7f1ab
Merge pull request #29978 from deepeshgarg007/grant_commission_check 
fix: Commission not applied while making Sales Order from Quotation
 2022-02-28 13:04:18 +05:30
Subin Tom
1ab5b7a811 fix: linter, sider fixes 2022-02-28 12:47:05 +05:30
Deepesh Garg
1b186682ea Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check 2022-02-28 12:42:21 +05:30
Deepesh Garg
4e9a9f35a6 test: add correct test case 2022-02-28 12:41:59 +05:30
Rucha Mahabal
88141d6116 test: Employee Leave Balance Summary 2022-02-28 12:12:52 +05:30
Saqib Ansari
6ca508fd85
Merge pull request #30008 from frappe/mergify/bp/version-14-beta-pre-release/pr-29991 
fix(pos): minor fixes (backport #29991)
 2022-02-28 12:07:12 +05:30
Deepesh Garg
83ad8f9caa
Merge pull request #29928 from deepeshgarg007/psoa_account_filter 
fix: Account filter in PSOA
 2022-02-28 11:41:50 +05:30
Saqib Ansari
d4767b541b fix: merge conflict 2022-02-28 11:36:47 +05:30
Saqib Ansari
823979fbcc fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/selling/page/point_of_sale/pos_payment.js
 2022-02-28 06:05:49 +00:00
Saqib Ansari
c75283265b fix(pos): mode of payment disappears after save 
(cherry picked from commit 69c34cd7ae)
 2022-02-28 06:05:48 +00:00
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-28 11:35:42 +05:30
Rucha Mahabal
85aad52378
Merge pull request #29151 from ChillarAnand/remove-nonprofit 2022-02-28 10:43:20 +05:30
Rucha Mahabal
c7d594984a chore: remove unused imports, sort imports, fix sider 2022-02-28 10:19:16 +05:30
Rucha Mahabal
d14a5c0f64
Merge branch 'develop' into leave-opening-balance 2022-02-28 10:03:38 +05:30
Rucha Mahabal
c050ce49c2 test: employee leave balance report 
- fix expired leaves calculation when filters span across 2 different allocation periods
 2022-02-28 09:58:12 +05:30
Rucha Mahabal
a891c426b5
Merge branch 'develop' into remove-nonprofit 2022-02-28 09:50:45 +05:30
Deepesh Garg
bfa9bfd39f
Merge branch 'develop' into psoa_account_filter 2022-02-28 09:28:26 +05:30
Deepesh Garg
955d5afeff
Merge pull request #29995 from deepeshgarg007/missing_pos_invoice_json 
fix: Regional print format addition
 2022-02-28 09:28:06 +05:30
Deepesh Garg
6a4975f9f1
Merge branch 'develop' into missing_pos_invoice_json 2022-02-28 08:40:48 +05:30
mergify[bot]
96e87fe3c9
fix: validate Work Order qty against Production Plan (#29721) (#30003) 
* fix: validate Work Order qty against Production Plan

* chore: err msg when max_qty is 0

* test: add test for overproduction

* fix: CI

(cherry picked from commit 067ede76ea0851a29e270e150f482368e0afa194)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-02-26 12:54:13 +05:30
Rushabh Mehta
0c7037f004
Merge pull request #30004 from rmehta/student-attendance-fix 
fix(minor): student attendance tool query fix
 2022-02-26 11:34:14 +05:30
Rushabh Mehta
2dabda03af fix(minor): student_attendance_tool.js fix fetching UX 2022-02-26 11:32:54 +05:30