Rohit Waghchaure
825850a58f
fix: not able to save material request
2021-03-31 23:55:06 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7
2021-03-31 22:23:23 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin
...
fix: Update Bin via Update Item on Purchase/Sales Order
2021-03-31 22:21:41 +05:30
Deepesh Garg
9f7bb14ea1
fix: Remove console
2021-03-31 20:01:00 +05:30
Anuja P
a1d0932093
fix: suggested changes
2021-03-31 19:59:28 +05:30
Deepesh Garg
2d86eb3ab1
fix: Hide serial and batch selector in Stock Entry
2021-03-31 19:57:50 +05:30
Anuja P
fb9ce3f37b
fix: Picked Qty conversion from Stock Qty to item Qty in DN
2021-03-31 19:26:42 +05:30
Prssanna Desai
9920d4062c
Merge pull request #25103 from prssanna/redesign-fixes-v13
2021-03-31 19:02:10 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta
...
feat: price margin in buying
2021-03-31 18:38:58 +05:30
Anupam
ad520e08ba
feat: price margin in buying
2021-03-31 18:31:12 +05:30
prssanna
bcd63f04da
style: missing semicolon
2021-03-31 18:26:52 +05:30
prssanna
5cdb1cb7a9
fix: item variant dialog dropdown issue
2021-03-31 18:26:45 +05:30
Jannat Patel
c814aab0b6
fix: delivery note print error ( #25081 )
2021-03-31 16:24:31 +05:30
Jannat Patel
11e9ae3841
fix: delivery note print error ( #25080 )
2021-03-31 16:24:08 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7
2021-03-31 16:04:24 +05:30
Saqib
4d0939de8d
feat: introduce parameter group in quality inspection ( #25094 )
...
* feat: introduce parameter group in quality inspection
* chore: make parameter group optional
2021-03-31 15:51:48 +05:30
rohitwaghchaure
e353c84aa5
Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop
...
fix: can't multiply sequence by non-int of type 'float'
2021-03-31 15:31:50 +05:30
rohitwaghchaure
968885af26
Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request
...
fix: can't multiply sequence by non-int of type 'float'
2021-03-31 15:31:30 +05:30
Rohit Waghchaure
1bc53a32bf
fix: can't multiply sequence by non-int of type 'float'
2021-03-31 15:30:42 +05:30
Rohit Waghchaure
94c145f3c3
fix: can't multiply sequence by non-int of type 'float'
2021-03-31 15:28:26 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists ( #25064 )
2021-03-31 12:44:03 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Anupam
41229ba705
fix: unable to submit stock entry
2021-03-31 02:32:25 +05:30
marination
a5de6c779b
fix: Cleaned up and fixed validation and bin updation on deletion
...
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
2021-03-31 02:03:26 +05:30
marination
0673f558c1
fix: Cleaned up and fixed validation and bin updation on deletion
...
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
2021-03-31 01:42:18 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying ( #25058 )
2021-03-30 12:09:46 +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
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
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
Rohit Waghchaure
256b9c7bf9
fix: total weight not set for free items
2021-03-26 19:05:46 +05:30
Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items ( #24885 )
2021-03-26 14:40:15 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field
2021-03-25 12:15:58 +05:30
Rohit Waghchaure
244f3eeedc
fix: incorrect fieldname
2021-03-24 16:42:22 +05:30
Anurag Mishra
4217a4b1ff
Merge branch 'develop' into item-dashboard-fixes
2021-03-24 15:35:33 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning
2021-03-24 15:12:04 +05:30
rohitwaghchaure
3c490088c4
Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre
...
fix: repost not completed backdated transactions
2021-03-24 12:38:42 +05:30
Rohit Waghchaure
9165327cf6
fix: repost not completed backdated transactions
2021-03-24 11:32:26 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions ( #24980 )
2021-03-24 11:30:53 +05:30
Ankush Menat
2ba198576c
fix: set valuation rate for customer items to zero
...
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
2021-03-23 14:03:09 +05:30
Ankush Menat
2a391298a7
test: customer item in stock reconciliation
2021-03-23 14:03:00 +05:30
Ankush Menat
6a534ea82b
fix: Allow zero valuation in stock reconciliation
...
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.
Related issue: ISS-20-21-10248
2021-03-23 14:02:52 +05:30
Ankush Menat
e76ecb8f74
fix: set valuation rate for customer items to zero
...
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
2021-03-23 13:01:21 +05:30
Ankush Menat
714b780868
test: customer item in stock reconciliation
2021-03-23 12:43:02 +05:30
Ankush Menat
762d6e38f7
fix: Allow zero valuation in stock reconciliation
...
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.
Related issue: ISS-20-21-10248
2021-03-23 11:18:04 +05:30
Rohit Waghchaure
bde159a77d
fix: total weight not set for free items
2021-03-22 23:36:48 +05:30
Anupam
661b1e59c1
Merge branch 'develop' of https://github.com/frappe/erpnext into planning
2021-03-22 11:48:11 +05:30
