Commit Graph

31972 Commits

Author SHA1 Message Date
Deepesh Garg
54c993fb75 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into tax_fetch_quote_v12 2020-09-29 18:47:01 +05:30
marination
2949d1c355 fix: Check only Read and Write Permission in Update Items 2020-09-29 18:29:00 +05:30
marination
3fdabe75d3 fix: Check only Read and Write Permission in Update Items 2020-09-29 18:26:40 +05:30
rohitwaghchaure
103866a367 Merge pull request #23451 from rohitwaghchaure/display-item-name-instead-of-code
fix: display item name instead of item code in offline POS
2020-09-29 13:01:37 +05:30
Rohit Waghchaure
8ba98a52a0 fix: display item name instead of item code in POS 2020-09-29 13:00:00 +05:30
rohitwaghchaure
c7ef8000ac Update stock_ageing.py 2020-09-28 16:00:48 +05:30
prssanna
031502e64c fix: longer timeout for company replace abbreviation 2020-09-28 13:34:24 +05:30
Oliver Liu
572ee8b152 include item_code in query result 2020-09-28 02:24:31 +02:00
Saurabh
24e5a6172a Merge branch 'v12-pre-release' into version-12 v12.12.0 2020-09-25 11:47:15 +05:30
Saurabh
c7689d8796 bumped to version 12.12.0 2020-09-25 12:07:15 +05:50
Nabin Hait
5e7bfa37ef chore: Added change log for v12.12.0 (#23435) 2020-09-25 10:07:07 +05:30
Rohit Waghchaure
560f513d69 fix: stock ageing report 2020-09-25 01:12:31 +05:30
rohitwaghchaure
968cb60010 Merge pull request #23430 from prssanna/mr-stock-uom
fix: set stock UOM in item while creating material request from stock entry
2020-09-24 20:05:20 +05:30
prssanna
92c1f38c33 fix: set stock uom in tem while creating material request from stock entry 2020-09-24 17:08:22 +05:30
Anurag Mishra
257927a18b fix:dash board for pre-release test (#23428) 2020-09-24 16:32:39 +05:30
Anurag Mishra
1caab44c29 fix:dash board for pre-release test (#23426) 2020-09-24 15:43:18 +05:30
Saqib
0847f257e6 chore: make asset movement transaction date match with purchase date & time (#23425) 2020-09-24 15:09:48 +05:30
Saqib
b61361f942 chore: make asset movement transaction date match with purchase date & time (#23424) 2020-09-24 15:08:52 +05:30
Marica
e45aeab291 fix: Check Company in Payment Entry before selecting values (#23421) 2020-09-24 12:07:49 +05:30
Marica
abd4b04cd9 fix: Check Company in Payment Entry before selecting values (#23420) 2020-09-24 12:07:43 +05:30
rohitwaghchaure
d7bce62c60 Merge pull request #23414 from rohitwaghchaure/book-loss-amount-in-cogs-pre-release
refactor: book loss amount in the COGS instead of stock received but not billed
2020-09-23 20:32:27 +05:30
Rohit Waghchaure
4220f1e759 refactor: book loss amount in the COGS instead of stock received but not billed 2020-09-23 20:30:26 +05:30
rohitwaghchaure
8699e82290 Merge pull request #23411 from anupamvs/leave-application-status-v12-hotfix
fix: leave application status fix
2020-09-23 20:28:40 +05:30
rohitwaghchaure
5100410e10 Merge pull request #23412 from rohitwaghchaure/book-loss-amount-in-cogs
refactor: book loss amount in the COGS instead of stock received but not billed
2020-09-23 20:28:21 +05:30
Rohit Waghchaure
9e3764ab62 refactor: book loss amount in the COGS instead of stock received but not billed 2020-09-23 19:35:49 +05:30
Anupam
f31e358df9 fix: leave application status fix 2020-09-23 19:14:31 +05:30
rohitwaghchaure
76fdc9faaa Merge pull request #23391 from anupamvs/leave-application-status-fix
fix: leave application status fix
2020-09-23 19:06:17 +05:30
Anupam
960229793b fix: conflict resolved 2020-09-23 18:58:38 +05:30
Anupam
ecfc4b3fd4 fix: review changes 2020-09-23 18:53:40 +05:30
Prssanna Desai
2984f42e2b fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23405) 2020-09-23 17:16:59 +05:30
Saqib
7d9dd8601a fix: failed workflow condition error message in update items (#23394) 2020-09-23 13:01:58 +05:30
Saqib
aad4bea366 fix: failed workflow condition error message in update items (#23392) 2020-09-23 13:01:30 +05:30
rohitwaghchaure
4a154098cc Merge pull request #23404 from rohitwaghchaure/download-required-materials-not-working-pre
fix: Download Required Materials not working for production plan
2020-09-23 01:32:42 +05:30
Rohit Waghchaure
0d4fb93d71 fix: Download Required Materials not working for production plan 2020-09-23 01:31:03 +05:30
rohitwaghchaure
07b1737351 Merge pull request #23396 from anupamvs/batch-wise-filter-v12
fix: adding filters validation Batch-Wise Balance History
2020-09-23 00:58:11 +05:30
rohitwaghchaure
6dc1b423bd Merge pull request #23399 from prssanna/supplier-scorecard-perm
fix: ignore permission while creating Supplier Scorecard Period in Supplier Scorecard
2020-09-23 00:57:52 +05:30
rohitwaghchaure
5a34e2db97 Merge pull request #23403 from rohitwaghchaure/download-required-materials-not-working
fix: Download Required Materials not working for production plan
2020-09-23 00:56:58 +05:30
Anupam Kumar
134b0fd18b Merge branch 'version-12-hotfix' into quality-procedure 2020-09-23 00:38:58 +05:30
Rohit Waghchaure
b948cf204c fix: Download Required Materials not working for production plan 2020-09-22 19:47:33 +05:30
Afshan
38000aacc5 fix: warehouse address filtered based on warehouse (#23381)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-22 16:51:58 +05:30
prssanna
a78cd20e31 fix: ignore permission while creating supplier scorecard period in supplier scorecard 2020-09-22 15:04:03 +05:30
Anupam
9a7e433a9d fix: quality procedure parent 2020-09-22 14:34:48 +05:30
Anupam
ba271317c7 fix: adding filters validation Batch-Wise Balance History 2020-09-22 13:45:15 +05:30
rohitwaghchaure
d12c99fda9 Merge pull request #23389 from rohitwaghchaure/fixed-subcontract-issue-for-bacthed-raw-material
fix: incorrect consumed qty if raw material with batch
2020-09-22 11:54:46 +05:30
Anupam
d5a33f4604 fix: leave application status fix 2020-09-22 11:29:17 +05:30
rohitwaghchaure
14175a2f47 Merge pull request #23390 from rohitwaghchaure/fixed-subcontract-issue-for-bacthed-raw-material-pre
fix: incorrect consumed qty if raw material with batch
2020-09-22 10:51:46 +05:30
Rohit Waghchaure
be97f1fe7c fix: incorrect consumed qty if raw material with batch 2020-09-22 10:50:23 +05:30
Rohit Waghchaure
b53a84b07f fix: incorrect consumed qty if raw material with batch 2020-09-22 10:36:52 +05:30
rohitwaghchaure
8a776fdad4 Merge pull request #23378 from rohitwaghchaure/online-pos-print-not-working-pre
fix: online pos print not working
2020-09-22 10:30:53 +05:30
rohitwaghchaure
59a4150428 Merge pull request #23377 from rohitwaghchaure/online-pos-print-not-working
fix: online pos print not working
2020-09-22 10:29:12 +05:30