nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,358 Commits 400 Branches 1,698 Tags
6783fc808b1c76c35dc94e417543da0112fae0b3
Commit Graph

38358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Slauenwhite
6783fc808b Merge remote-tracking branch 'upstream/version-13-hotfix' into fix-ecommerce-selling-price-with-rule 2021-12-22 20:58:34 -05:00
Devin Slauenwhite
bcc436e63e fix(test): e-commerce fetch logged-in user item price. 2021-12-22 20:20:57 -05:00
Devin Slauenwhite
7eafc9ffe8 test: e-commerce customer pricing rule 2021-12-22 13:11:02 -05:00
Marica
808e40cc4d Merge pull request #28985 from marination/item-card-group-links 
fix: Convert Item links to Website Item links in `Item Card Group` template data
 2021-12-22 13:53:25 +05:30
Marica
2777b501b5 Merge branch 'version-13-hotfix' into item-card-group-links 2021-12-22 13:25:18 +05:30
marination
a6e7b43f0b fix: Faulty 'continue' not setting value in db 2021-12-22 13:23:00 +05:30
marination
ffdaa849fb fix: Code cleanup 2021-12-22 12:26:43 +05:30
marination
85abb95df6 fix: Sider 2021-12-22 12:24:09 +05:30
mergify[bot]
dd01c0e854 fix: Currency fix for cost field in subscription plan (#28821) (#28898) 
(cherry picked from commit be103ab8e6)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-12-22 10:43:00 +05:30
Devin Slauenwhite
de697a7aee Merge remote-tracking branch 'upstream/version-13-hotfix' into version-13-hotfix 2021-12-21 11:24:53 -05:00
mergify[bot]
b59df1118e fix: missed colon (#28979) (#28984) 
(cherry picked from commit 076cb408db)

Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
 2021-12-21 16:04:22 +05:30
marination
242cc7e23e Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into item-card-group-links 2021-12-21 15:51:50 +05:30
marination
dfe718ef79 fix: Convert Item links to Website Item links in Item Card Group template data 
- Changed link option to Website Item in Item card group template
- patch to convert pre-existing data
 2021-12-21 15:43:48 +05:30
mergify[bot]
84404bf6e3 fix: Reset value_after_depreciation on reversing journal entry during Asset return (#28980) 
(cherry picked from commit 1ed30ee7c7)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-12-21 15:13:11 +05:30
Deepesh Garg
56d72764b7 Merge pull request #28935 from deepeshgarg007/rcm_tax_template_fetch_issue 
fix: Is Reverse Charge check in Tax Category
 2021-12-21 13:41:22 +05:30
Deepesh Garg
84cebca254 Merge pull request #28974 from frappe/mergify/bp/version-13-hotfix/pr-28937 
fix: Added filter for dispatch address (backport #28937)
 2021-12-21 13:04:07 +05:30
Deepesh Garg
7e912db4b1 fix: Add is reverse charge in country wise tax 2021-12-21 12:54:40 +05:30
Deepesh Garg
3fed740142 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into rcm_tax_template_fetch_issue 2021-12-21 12:54:13 +05:30
Subin Tom
824c90fd11 fix: Added filter for dispatch address (#28937) 
(cherry picked from commit 98d417602f)
 2021-12-21 07:06:25 +00:00
mergify[bot]
ef47570977 test: remove unnecessary creation of companies #28965 (#28967) 
test: remove unnecessary creation of companies
(cherry picked from commit d7148adee5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-20 23:22:34 +05:30
mergify[bot]
87e53e9e46 fix: fetch appointment letter content in the same order as template (#28968) (#28969) 
(cherry picked from commit 92e86f2f09)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-20 23:17:02 +05:30
Ankush Menat
4107de4514 Merge pull request #28963 from frappe/mergify/bp/version-13-hotfix/pr-28588 
fix: incorrect bin qty on backdated reconciliation (backport #28588)
 2021-12-20 21:22:56 +05:30
Ankush Menat
9338843dac test: bin qty on backdated SR 
(cherry picked from commit 2bb7bca464)
 2021-12-20 14:36:40 +00:00
Ankush Menat
2d5f477720 fix: correct bin qty on backdated transactions 
When making a backdated transactions current balance qty depends on
evaluation of whole ledger inbetween, instead of doing that just fetch
the last sle's qty_after_transaction when future transactions are
detected against SLE

fix: don't update bin's actual_qty

1. it's already updated by repost_current_voucher
2. update if future sle exists

(cherry picked from commit ff9a6e8e89)
 2021-12-20 14:36:40 +00:00
Deepesh Garg
fa7948b5e5 Merge pull request #28961 from frappe/mergify/bp/version-13-hotfix/pr-28959 
fix: Error on viewing consolidated financial statement (backport #28959)
 2021-12-20 17:15:13 +05:30
Deepesh Garg
aad7a10a7b fix: Error on viewing consolidated financial statement 
(cherry picked from commit 5d6199cf35)
 2021-12-20 11:43:50 +00:00
Deepesh Garg
c12b00cb4b Merge pull request #28901 from frappe/mergify/bp/version-13-hotfix/pr-28822 
feat: Deferred Revenue and Expense report with actual and upcoming postings (backport #28822)
 2021-12-20 17:03:50 +05:30
Devin Slauenwhite
372f91c923 fix: fetch correct selling price. 2021-12-18 16:03:16 -05:00
Ankush Menat
0724a148e6 fix: incorrect rounding off near zero (#28948) 2021-12-18 21:34:25 +05:30
mergify[bot]
d3c62821fb fix: Add Invoice Number field to list view in Opening Invoice Creation Tool (#28941) 2021-12-18 12:07:45 +05:30
mro-admin
c5931e4b1e fix: convert asynchronous field update to synchronous (#28906) 
Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:08 +05:30
Deepesh Garg
a1d5e0bef6 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28822 2021-12-17 16:06:21 +05:30
Deepesh Garg
10a95b3a98 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into rcm_tax_template_fetch_issue 2021-12-17 16:03:22 +05:30
Deepesh Garg
7c1bfe6b46 chore: Remove patch comment 2021-12-17 16:02:40 +05:30
Deepesh Garg
b33fd6acc7 fix: Is Reverse Charge check in Tax Category 2021-12-17 15:59:21 +05:30
mergify[bot]
9c2a9c28df fix(ksa): enable ksa pos invoice print format (backport #28911) 2021-12-17 15:27:05 +05:30
Deepesh Garg
349785dcbd Merge pull request #28932 from frappe/mergify/bp/version-13-hotfix/pr-28916 
fix: Multicurrency invoices using subscription (backport #28916)
 2021-12-17 13:52:30 +05:30
Deepesh Garg
94d3e66428 fix: Add tests for multicurrency subscription 
(cherry picked from commit 6ab753015e)
 2021-12-17 06:59:59 +00:00
Deepesh Garg
eb36742427 fix: Multicurrency invoices using subscription 
(cherry picked from commit 0e4842b986)
 2021-12-17 06:59:59 +00:00
mergify[bot]
fcb08d54ea fix: mapping to maintenance visit gets erased (#28917) (#28925) 
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b627a1)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-12-16 23:33:56 +05:30
mergify[bot]
167e8d3dde chore: ledger invariant check report (#28921) (#28922) 
(cherry picked from commit 6ba8f7644d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-16 22:48:12 +05:30
mergify[bot]
85ded9e7ce perf: remove forcing of posting sort index on stock balance (#28902) (#28904) 
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.

(cherry picked from commit 228e011819)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-15 19:23:12 +05:30
ruthra
74ac5e7829 refactor: rename checkbox and translations 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error

(cherry picked from commit 9ec8841b91)
 2021-12-15 09:33:46 +00:00
ruthra
804f2ccf3d refactor: remove unused function 'get_postings' 
(cherry picked from commit a8a598ace7)
 2021-12-15 09:33:45 +00:00
ruthra
039b1fbb76 feat: Deferred Revenue and Expense report 
- show deferred revenue and expense with actual and expected postings
 - unit tests added

(cherry picked from commit c3453cd73c)
 2021-12-15 09:33:45 +00:00
mergify[bot]
970cdef911 feat: added required_date field to set date in child table (backport #28432) 
feat: added required_date field to set date in child table (backport #28432)
 2021-12-15 12:49:23 +05:30
mergify[bot]
1988e72710 revert: "fix: expected value after useful life validation" (backport #28853) 2021-12-15 11:09:21 +05:30
Saqib
cd075ce3be Merge pull request #28854 from frappe/mergify/bp/version-13-hotfix/pr-28783 
fix: hsn-wise summary is incorrect if an invoice has repeated item code (backport #28783)
 2021-12-15 10:35:25 +05:30
Ankush Menat
bdd43274b2 fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation

(cherry picked from commit 80f1a8c645)
 2021-12-14 18:22:10 +05:30
Ankush Menat
25fd11e24f test: timeout certain tests in work order to avoid stuck tests (#28666) 2021-12-14 18:21:48 +05:30