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

41846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sagar Sharma
77ffcd3aed
fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set (#29681) 
* chore: make allow zero valuation rate readonly if s_warehouse is set

* fix: setting the checkbox to zero whenever the source warehouse is set

* fix: remove allow_on_submit and refresh trigger

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-26 11:25:02 +05:30
Rushabh Mehta
1e7df5d0c2 fix(minor): student attendance tool query fix 2022-02-26 11:07:44 +05:30
hrzzz
16de29a3cb fix(translation) - correction for translation 2022-02-25 16:56:23 -03:00
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997) 2022-02-25 23:01:32 +05:30
Deepesh Garg
4f46394399 fix: Add parent to department 2022-02-25 21:18:22 +05:30
Deepesh Garg
3e573e9838 fix: Condition 2022-02-25 17:18:53 +05:30
Deepesh Garg
36c76c4035 fix: Failing setup wizard test 2022-02-25 17:15:57 +05:30
Subin Tom
f1f3e035a6 Merge branch 'exotel-fixes' of https://github.com/nemesis189/erpnext into exotel-fixes 2022-02-25 16:59:35 +05:30
Deepesh Garg
fe2ced7bee fix: Regional print format addition 2022-02-25 16:57:59 +05:30
Subin Tom
5b79496f05 fix: call type doctype, fixes 2022-02-25 16:52:25 +05:30
Marica
e8e9bc4daa
Merge pull request #29733 from dj12djdjs/fix-user-unique-cart 
fix(e-commerce): Unique Shopping Cart Per Logged In User
 2022-02-25 16:35:14 +05:30
Deepesh Garg
5464ba6430
Merge branch 'develop' into psoa_account_filter 2022-02-25 15:55:06 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check 
fix: Make abbreviation limit to 10
 2022-02-25 15:52:51 +05:30
Saqib Ansari
dd566a68f1
Merge pull request #29991 from nextchamp-saqib/fix-pos-mop 
fix(pos): minor fixes
 2022-02-25 15:35:24 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Saqib Ansari
69c34cd7ae fix(pos): mode of payment disappears after save 2022-02-25 14:36:29 +05:30
Subin Tom
a91fb88929
fix: sider fixes 2022-02-25 13:45:26 +05:30
Subin Tom
00b0f10100 fix: added type of call select field, additional status for agent rejecting call 2022-02-25 13:38:57 +05:30
marination
d3b0ca30c6 fix: Get MRs that are yet to be received but fully ordered in Report 
- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)
 2022-02-25 12:10:11 +05:30
Subin Tom
fd20713bd7 fix: added field to show called group, user_id 2022-02-25 12:01:53 +05:30
Devin Slauenwhite
a1ae7fcbc8 fix: show fail message 2022-02-24 16:36:30 -05:00
Rucha Mahabal
04b9091821
fix: web form deletion 2022-02-24 18:10:29 +05:30
Rucha Mahabal
761e528ba3
fix: deprecation warning 2022-02-24 17:57:39 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit 2022-02-24 17:03:52 +05:30
Deepesh Garg
cbb5ffb6fe fix: Multi-currency bank reconciliation fixes 2022-02-24 15:58:12 +05:30