nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,751 Commits 401 Branches 1,700 Tags
c494ed087a2aa4cbefbee2caf1491fae8aa5ce4c
Commit Graph

38751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Subin Tom
c494ed087a fix: Coupon code item pricing dynamic updation issue 
(cherry picked from commit ccf63124d6)
 2022-02-08 06:20:51 +00:00
Ankush Menat
8e660890f4 test: commit item/warehouse creation to db 
(cherry picked from commit f82d7eb73f)
 2022-02-07 23:16:18 +05:30
Ankush Menat
29d3a189cb chore: drop dead field from stock reconciliation 
(cherry picked from commit 43f8ee1dd1)
 2022-02-07 23:16:18 +05:30
Ankush Menat
19f99a1c5f test: product bundle reposting 
(cherry picked from commit 699519f7b6)
 2022-02-07 23:16:18 +05:30
Ankush Menat
86d30ed583 test: move bundle info to class variables 
(cherry picked from commit 853e658dcc)
 2022-02-07 23:16:18 +05:30
Ankush Menat
6f6b474333 fix: merge stock ledger item warehouse with doc's 
(cherry picked from commit 1022db0474)
 2022-02-07 23:16:18 +05:30
Ankush Menat
eeb8f4874d refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.

(cherry picked from commit e6ab8df8f2)
 2022-02-07 23:16:18 +05:30
Ankush Menat
bd401810e4 fix: consider packed items too when reposting 
(cherry picked from commit c56d07dee3)
 2022-02-07 23:16:18 +05:30
Ritwik Puri
c137b141e8 fix: use item_code instead of parent field in bom_stock_calculated report (#29684) 
(cherry picked from commit 72a812f18b)
 2022-02-07 23:11:40 +05:30
Deepesh Garg
cace76b355 Merge pull request #29682 from frappe/mergify/bp/version-13-hotfix/pr-29349 
feat: option to disable Item Tax Template and Tax Category (backport #29349)
 2022-02-07 22:26:09 +05:30
Deepesh Garg
fbf6b4e5aa Merge pull request #29677 from frappe/mergify/bp/version-13-hotfix/pr-29460 
feat: Refund entry against loans (backport #29460)
 2022-02-07 19:17:32 +05:30
Deepesh Garg
146cf89588 Merge pull request #29685 from frappe/mergify/bp/version-13-hotfix/pr-29660 
fix: Add missing key in Loan (backport #29660)
 2022-02-07 19:05:38 +05:30
Deepesh Garg
066ceb06cd fix: Resolve conflicts 2022-02-07 18:46:53 +05:30
Deepesh Garg
4196f04f49 test: Add test case for repayment against partially disbursed loans 
(cherry picked from commit ef69d1fd38)
 2022-02-07 13:15:42 +00:00
Abhinav Raut
9396143009 fix: missing key in loan 
(cherry picked from commit d0043bdbac)
 2022-02-07 13:15:41 +00:00
barredterra
ec55251f6a feat: option to disable tax category 
(cherry picked from commit 663c594ead)
 2022-02-07 12:11:14 +00:00
barredterra
501ce90796 feat: option to disable Item Tax Template 
(cherry picked from commit f60e040d69)
 2022-02-07 12:11:13 +00:00
Deepesh Garg
f4e2c1fad3 fix: Add disbursement accounts to tests 
(cherry picked from commit 8ece2845f2)
 2022-02-07 09:08:48 +00:00
Deepesh Garg
946e560c55 feat: Refund entry against loans 
(cherry picked from commit c68c70f8bc)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
#	erpnext/patches.txt
 2022-02-07 09:08:48 +00:00
mergify[bot]
8cadc2668d fix(ux): make stock entry type the title field (#29674) (#29675) 
(cherry picked from commit 5e6227e3d8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-07 13:20:34 +05:30
Deepesh Garg
fd4e0f1d40 Merge pull request #29666 from frappe/mergify/bp/version-13-hotfix/pr-29659 
fix: Billing status for zero amount ref doc (backport #29659)
 2022-02-06 21:56:34 +05:30
Deepesh Garg
3c032146ad Merge pull request #29668 from frappe/mergify/bp/version-13-hotfix/pr-29601 
fix: Incorrect provisional profit and loss in balance sheet (backport #29601)
 2022-02-06 21:55:54 +05:30
Deepesh Garg
dcff8e74fc Merge pull request #29669 from frappe/mergify/bp/version-13-hotfix/pr-29609 
fix: Zero rated exports in GSTR-3B report (backport #29609)
 2022-02-06 21:55:15 +05:30
Deepesh Garg
00af714743 Merge pull request #29661 from frappe/mergify/bp/version-13-hotfix/pr-29641 
fix: Ignore linked invoices on Journal Entry cancel (backport #29641)
 2022-02-06 21:53:12 +05:30
Ankush Menat
3e79533112 fix: dont show cancelled PO items in plan report 
(cherry picked from commit 6459ceaea1)
 2022-02-06 20:07:31 +05:30
Deepesh Garg
aca788cbe0 fix: Zero rated exports in GSTR-3B report 
(cherry picked from commit 233e6449fc)
 2022-02-06 14:04:46 +00:00
Deepesh Garg
d10423ef1f fix: Incorrect provisional profit and loss in balance sheet 
(cherry picked from commit ed2c6b6637)
 2022-02-06 14:03:41 +00:00
Deepesh Garg
62b71f9edd fix: Add test case 
(cherry picked from commit c5726fd3da)
 2022-02-06 13:52:58 +00:00
Deepesh Garg
3b47a55932 fix: Billing status for zero amount ref doc 
(cherry picked from commit d679692472)
 2022-02-06 13:52:57 +00:00
Deepesh Garg
5acf773042 Merge pull request #29635 from deepeshgarg007/sales_invoice_tax_template 
fix: Incorrect tax template in Sales Invoice via data import
 2022-02-06 18:58:43 +05:30
Deepesh Garg
f5f1afde15 fix: Ignore linked invoices on Journal Entry cancel 
(cherry picked from commit 6f7ae62907)
 2022-02-06 13:27:34 +00:00
Ankush Menat
65d4670f45 test: regression test for LCV GL entries 
(cherry picked from commit 69c65afd72)
 2022-02-06 12:31:27 +05:30
Ankush Menat
689f8cb537 fix: ignore cancelled svd while updating GLE for PR 
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.

(cherry picked from commit 8858c703a8)
 2022-02-06 12:31:27 +05:30
Marica
5bf994a82a Merge pull request #29645 from frappe/mergify/bp/version-13-hotfix/pr-29642 
fix: Regenerate packed items on newly mapped doc (backport #29642)
 2022-02-04 23:24:15 +05:30
mergify[bot]
2628e2faff fix: enable Allow on Submit for 'Is Active' field in Salary Structure (backport #29630) (#29643) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-04 23:02:45 +05:30
marination
3342efc388 fix: Regenerate packed items on newly mapped doc 
- Cannot determine action on newly mapped DN that hasnt been inserted
- Rows could have been deleted, updated, added, etc. before first save
- In this case , reset packing table

(cherry picked from commit bd41a99c8a)
 2022-02-04 17:32:09 +00:00
Deepesh Garg
20f321a889 fix: Incorrect tax template in Sales Invocie via data import 2022-02-04 12:01:07 +05:30
Marica
51f9f42fab Merge pull request #29628 from frappe/mergify/bp/version-13-hotfix/pr-29456 
fix: Incorrect packing list for recurring items & code cleanup (backport #29456)
 2022-02-04 10:17:25 +05:30
marination
3fea24f9db fix: (Linter) import sequence 
(cherry picked from commit f18ec2d947)
 2022-02-03 16:40:46 +00:00
marination
f33a1e858f test: Packed Items test file 
(cherry picked from commit 4e7b4dc9a8)
 2022-02-03 16:40:45 +00:00
marination
fc35a74f76 refactor: Price fetching and updation logic 
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table

(cherry picked from commit 2f4d266ee1)
 2022-02-03 16:40:45 +00:00
marination
cc22cbe50b chore: Break updation logic into smaller functions 
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls

(cherry picked from commit 2c14ab0439)
 2022-02-03 16:40:45 +00:00
marination
6e7f1a300c fix: Linter and minor code refactor 
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)

(cherry picked from commit 4c677eafe9)
 2022-02-03 16:40:44 +00:00
marination
c59c5bf2c6 chore: SQL to QB & accomodate Update Items 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM

(cherry picked from commit f8a5786542)
 2022-02-03 16:40:44 +00:00
marination
596a3a65c2 fix: Incorrect packing list for recurring items & code cleanup 
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes

(cherry picked from commit 3f48fc1898)
 2022-02-03 16:40:44 +00:00
mergify[bot]
b93d8f8716 feat: show stock value difference in stock ledger report (#29607) (#29621) 
(cherry picked from commit 04f6426dbf)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-03 17:17:33 +05:30
Ankush Menat
862a90bb15 Merge pull request #29603 from s-aga-r/fix/production-plan/ordered_qty 
fix: Multiple WO for a single Production Plan Item
 2022-02-03 15:26:02 +05:30
Ankush Menat
22ff462abb fix: add default if qty is not found 2022-02-03 15:25:34 +05:30
mergify[bot]
754a3d65f0 fix: ignore empty customer/supplier in item query (#29610) (#29613) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier

(cherry picked from commit 41a95e5624)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-03 13:22:15 +05:30
Sagar Sharma
35ee119c99 Merge branch 'version-13-hotfix' into fix/production-plan/ordered_qty 2022-02-03 11:08:35 +05:30