Marica
|
c5739957de
|
Merge branch 'develop' into patch-7
|
2021-03-30 18:07:32 +05:30 |
|
Deepesh Garg
|
6be78db62c
|
Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta
feat: Normal rounding for GST Taxes
|
2021-03-30 17:01:45 +05:30 |
|
Anurag Mishra
|
679177f9e0
|
Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix
fix: Employee profile pic upload access for erpnext user
|
2021-03-30 14:32:21 +05:30 |
|
Hussain Nagaria
|
2b85a81a1c
|
feat: Add filters to front end
|
2021-03-30 13:57:44 +05:30 |
|
Rucha Mahabal
|
469ef122aa
|
Merge pull request #25059 from ruchamahabal/non-profit-fixes
fix: Non Profit fixes
|
2021-03-30 12:44:55 +05:30 |
|
Rucha Mahabal
|
30f67c3f57
|
fix: add filters to account link fields in Non Profit Settings (#25060)
- fetch memberships ordered by date in certificate
|
2021-03-30 12:39:56 +05:30 |
|
Rucha Mahabal
|
04c0296558
|
fix: add filters to account link fields in Non Profit Settings
- fetch memberships ordered by date in certificate
|
2021-03-30 12:30:40 +05:30 |
|
Hussain Nagaria
|
b7f2ba1556
|
feat: Add Report boilerplate
|
2021-03-30 12:19:16 +05:30 |
|
Anupam Kumar
|
9be11afbde
|
feat: price margin in buying (#25058)
|
2021-03-30 12:09:46 +05:30 |
|
Rucha Mahabal
|
a54eecb230
|
fix: membership renewal validation (#24963)
|
2021-03-30 12:02:52 +05:30 |
|
Rucha Mahabal
|
146cbb10f8
|
fix: calculate 80g certificate amount on validate for memberships (#24925)
|
2021-03-30 12:02:28 +05:30 |
|
Rucha Mahabal
|
5f4a2bfc61
|
fix(Non Profit): Membership and Donation API fixes (#24900)
* fix: Donation fixes
- differentiate between subscription payment and payment
- issue with donation amount
* fix: existing membership validation
* fix: ignore subscription payments while capturing donations
|
2021-03-30 12:02:09 +05:30 |
|
Rucha Mahabal
|
170d2efd35
|
fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013)
|
2021-03-30 11:02:46 +05:30 |
|
Sagar Vora
|
7f43c051df
|
fix(Italy): setup, validations, optimisations
|
2021-03-29 21:18:26 +05:30 |
|
Deepesh Garg
|
f954ec7c78
|
fix: Add patch for GST category field in Delivery Note
|
2021-03-29 20:31:11 +05:30 |
|
Sagar Vora
|
ba76f87e44
|
fix(Italy): setup, validations, optimisations (#25054)
* fix(Italy): setup, validations, optimisations
* fix: remove unused import
|
2021-03-29 20:18:45 +05:30 |
|
Deepesh Garg
|
29997414ad
|
fix: Add GST category field in Dellivery Note
|
2021-03-29 19:49:52 +05:30 |
|
Deepesh Garg
|
237033704f
|
fix: Add test case
|
2021-03-29 16:42:59 +05:30 |
|
Deepesh Garg
|
c2548ddc75
|
feat: Normal rounding for GST Taxes
|
2021-03-29 16:42:47 +05:30 |
|
Saurabh
|
7366b5d3eb
|
Merge branch 'version-13-beta-pre-release' into version-13-beta
|
2021-03-28 15:54:56 +05:30 |
|
Saurabh
|
ceb026c5ab
|
bumped to version 13.0.0-beta.14
|
2021-03-28 16:14:56 +05:50 |
|
rohitwaghchaure
|
b38ea0cc8b
|
fix: patch (#25014)
* fix: patch
* fix: pricing_rule test cases
|
2021-03-28 15:51:32 +05:30 |
|
Sagar Vora
|
5c907fa7f0
|
test: make Stock Entry to avoid NegativeStockError (#25044)
|
2021-03-27 20:30:26 +05:30 |
|
rohitwaghchaure
|
f4901b4f22
|
Merge pull request #25034 from anupamvs/naming-pre-release
fix: unable to submit stock entry
|
2021-03-27 19:50:06 +05:30 |
|
Walstan Baptista
|
ee822a9dcd
|
test: use different product attribute value; cleanup (#25043)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
|
2021-03-27 19:42:25 +05:30 |
|
Raffael Meyer
|
1bbc8008eb
|
Merge branch 'develop' into improve_taxes_setup
|
2021-03-27 15:02:58 +01:00 |
|
Anupam
|
d429138dcc
|
fix: added flag for dont_fetch_price_list_rate in transaction
|
2021-03-27 19:31:23 +05:30 |
|
Walstan Baptista
|
d6c7d8e631
|
test: reset session user if test errors in test_sle (#25042)
|
2021-03-27 18:30:07 +05:30 |
|
Sagar Vora
|
868c0bf45b
|
perf: reduce no of queries for checking if future sl entry exists (#24881)
|
2021-03-27 16:10:20 +05:30 |
|
walstanb
|
ab673d9e4b
|
fix: minor changes
|
2021-03-27 12:54:49 +05:30 |
|
walstanb
|
225c64a1ad
|
test: sets is_purchase_item while item creation
|
2021-03-27 12:54:49 +05:30 |
|
walstanb
|
52403c537b
|
fix: check if gst account exists before appending
|
2021-03-27 12:54:49 +05:30 |
|
walstanb
|
9826ac4602
|
test: reset session user if test errors
|
2021-03-27 12:54:49 +05:30 |
|
walstanb
|
98dcf8a1fd
|
fix: type casting for None type value
|
2021-03-27 12:54:49 +05:30 |
|
rohitwaghchaure
|
6c7f029597
|
Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release
fix: ams integration breaks when error raised
|
2021-03-27 09:59:51 +05:30 |
|
Anupam
|
4adaf7ed2e
|
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release
|
2021-03-27 00:56:48 +05:30 |
|
Anupam
|
5d994d8aa1
|
fix: unable to submit stock entry
|
2021-03-27 00:54:19 +05:30 |
|
Anupam
|
096da429ed
|
fix: unable to submit stock entry
|
2021-03-27 00:45:31 +05:30 |
|
rohitwaghchaure
|
d5759bab11
|
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
feat: recursive pricing rule
|
2021-03-26 19:10:10 +05:30 |
|
rohitwaghchaure
|
e825d2ab51
|
Merge pull request #25027 from rohitwaghchaure/feat-recursice-pricing-rule-pre
Feat recursice pricing rule pre
|
2021-03-26 19:09:39 +05:30 |
|
Rohit Waghchaure
|
256b9c7bf9
|
fix: total weight not set for free items
|
2021-03-26 19:05:46 +05:30 |
|
Rohit Waghchaure
|
0486276789
|
fix: don't club same free item
|
2021-03-26 19:05:45 +05:30 |
|
Rohit Waghchaure
|
fce552b811
|
fix: nonetype object has no attribute options
|
2021-03-26 19:05:45 +05:30 |
|
Rohit Waghchaure
|
cd8422a840
|
feat: recursive product discount
|
2021-03-26 19:05:43 +05:30 |
|
rohitwaghchaure
|
2c191c105f
|
Merge pull request #25026 from ruchamahabal/production-raw-material-enhancements-v13
feat(Production Plan): Enhancements in Material Request Plan Item
|
2021-03-26 18:59:34 +05:30 |
|
rohitwaghchaure
|
86628ea287
|
Merge pull request #25025 from ruchamahabal/production-raw-material-enhancements
feat(Production Plan): Enhancements in Material Request Plan Item
|
2021-03-26 18:59:23 +05:30 |
|
Rucha Mahabal
|
44853da7c2
|
feat: Show Required Qty as per BOM in Material Request Items
|
2021-03-26 18:55:16 +05:30 |
|
Rucha Mahabal
|
4cd68cdecb
|
feat: Add more fields to raw material download
|
2021-03-26 18:55:08 +05:30 |
|
Rucha Mahabal
|
d74ff72527
|
fix: Ordered and Reserved Qty for Production not getting fetched in Items
|
2021-03-26 18:55:00 +05:30 |
|
Rucha Mahabal
|
28a885a3a9
|
feat: show ordered and reserved qty in Material Request Plan Item table
|
2021-03-26 18:54:51 +05:30 |
|