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
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
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
Rucha Mahabal
efe2b425b1
feat(Production Plan): Consider Safety Stock in Required Qty Calculation
2021-03-26 18:54:34 +05:30
Saqib
f66aab6d98
fix: e-invoicing option visible even if settings disabled ( #25021 )
2021-03-26 16:40:51 +05:30
Nabin Hait
2a39b74ad2
fix: Fixes on job card and salary slip ( #25011 )
...
* fix: map conversion factor while making stock entry from job card
* fix: fetch additional salary in salary slip
2021-03-26 10:49:39 +05:30
Nabin Hait
d4499277b4
chore: Added change log
2021-03-25 12:18:22 +05:30
Nabin Hait
91026e026f
chore: Added change log
2021-03-25 11:53:07 +05:30
rohitwaghchaure
d7d7df2fdd
Merge pull request #24995 from rohitwaghchaure/incorrect-field-for-company
...
fix: incorrect fieldname
2021-03-24 16:45:41 +05:30
Rohit Waghchaure
244f3eeedc
fix: incorrect fieldname
2021-03-24 16:42:22 +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
Anupam Kumar
5c172044d7
fix: validate_series ( #24987 )
2021-03-23 21:13:06 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report ( #24983 )
2021-03-23 21:11:06 +05:30
Jannat Patel
d7b139182b
fix: serial no trim issue ( #24981 )
...
* fix: serial no trim issue
* fix: sider
2021-03-23 21:09:54 +05:30
Anupam
940c75f8ac
fix: validate_series
2021-03-23 16:54:54 +05:30
Marica
5c7138c86b
Merge pull request #24985 from ankush/allow_zero_valuation_SR_v13b_pr
...
fix: Allow zero valuation in stock reconciliation
2021-03-23 14:58:38 +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
Marica
4ccda9f799
chore: Allow changing Work Stations in WO. ( #24898 )
2021-03-23 10:45:57 +05:30
Deepesh Garg
d1f15b2a88
fix: TDS check getting checked after reload ( #24973 )
2021-03-23 10:45:06 +05:30
Anuja Pawar
c7c921495b
fix: payment reference on adding cost center in PE and Issue Summary Report error fixes ( #24951 )
2021-03-22 11:21:15 +05:30
Rucha Mahabal
dffa647071
fix: membership renewal validation ( #24963 ) ( #24964 )
2021-03-20 22:24:55 +05:30
rohitwaghchaure
98a40d81d5
Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre
...
fix: revert stock balance value calculation
2021-03-19 16:22:51 +05:30
Rohit Waghchaure
67d94ac0cc
fix: revert stock balance value calculation
2021-03-19 16:21:30 +05:30
Deepesh Garg
23af1ed372
Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13
...
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-18 21:21:57 +05:30
Deepesh Garg
b75cbeee4d
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-18 21:20:44 +05:30
Deepesh Garg
a5de22cb8e
Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13
...
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-18 21:02:41 +05:30
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary ( #24907 )
2021-03-17 19:58:56 +05:30
Rucha Mahabal
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships ( #24925 ) ( #24926 )
2021-03-17 19:51:59 +05:30
Deepesh Garg
438d9cad90
fix: Remove print statement
2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13
fix: Group nil exempted and non gst items separately
2021-03-17 18:03:58 +05:30
Deepesh Garg
a5987782bd
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-17 15:49:44 +05:30
Rucha Mahabal
00cce433a5
fix(Non Profit): Membership and Donation API fixes ( #24900 ) ( #24905 )
...
* 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-16 20:52:53 +05:30
Deepesh Garg
65165fcc80
Merge pull request #24894 from deepeshgarg007/add_account_method_v13
...
fix: Add method for regional round off account back
2021-03-16 13:25:24 +05:30
Deepesh Garg
d4a3cf1395
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13
2021-03-16 13:24:33 +05:30
Deepesh Garg
635c480771
fix: Add method for regional round off account back
2021-03-16 13:22:20 +05:30
Marica
3f14aafa67
Merge pull request #24891 from marination/pos-opening-entry-pre-release
...
fix: POS Opening Entry with empty balance detail rows
2021-03-16 12:44:22 +05:30
marination
dd7d71ca2e
fix: POS Opening Entry with empty balance detail rows
2021-03-16 12:05:37 +05:30
Deepesh Garg
7f2e45e0f4
fix: Unequal debit and credit issue on RCM Invoice ( #24838 )
...
* fix: Unequal debit and credit issue on RCM Invoice
* fix: Travis
2021-03-15 18:04:47 +05:30
