nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,728 Commits 401 Branches 1,698 Tags
3c032146adeefa8df2e28d7164ffd7870e46e3a3
Commit Graph

38728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sagar Sharma
36609c50c0 test: add test case for multiple WO 2022-02-02 23:04:19 +05:30
Saqib Ansari
03248ea483 Merge pull request #29598 from frappe/mergify/bp/version-13-hotfix/pr-29597 
fix(pos): pricing rule on transactions doesn't work (backport #29597)
 2022-02-02 21:45:49 +05:30
Saqib Ansari
6dd5ed68b4 Merge pull request #29446 from frappe/mergify/bp/version-13-hotfix/pr-29426 
fix: Use get for conditionally available fields while setting missing values (backport #29426)
 2022-02-02 21:45:11 +05:30
Saqib Ansari
34f223a144 Merge pull request #29565 from frappe/mergify/bp/version-13-hotfix/pr-29556 
feat: Allowing non stock items in POS (backport #29556)
 2022-02-02 21:44:02 +05:30
Saqib Ansari
e2f5ddb20a fix(pos): pricing rule on transactions doesn't work 
(cherry picked from commit e082e3f702)
 2022-02-02 14:18:46 +00:00
mergify[bot]
0608f61b80 fix: Program Enrollment tests (backport #29592) (#29594) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-02 17:51:46 +05:30
Sagar Sharma
4e58c1da3a fix: ordered_qty for production-plan-item 2022-02-02 14:56:11 +05:30
mergify[bot]
535e6d61f0 fix: employee reminders fixes (backport #29548) (#29576) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 20:22:49 +05:30
Deepesh Garg
b9b42c11e6 Merge pull request #29561 from frappe/mergify/bp/version-13-hotfix/pr-29451 
feat: Provisional accounting for expenses (backport #29451)
 2022-02-01 18:11:37 +05:30
mergify[bot]
ffbf7ec3b7 fix: don't show "create" on cancelled BOMs (#29570) (#29572) 
(cherry picked from commit a3a05c0c23)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-01 17:44:13 +05:30
Deepesh Garg
640b2d57de chore: fix tests 2022-02-01 17:25:26 +05:30
Saqib Ansari
c0a2388ab2 fix: Validation for invalid serial nos at POS invoice level (backport #29447) 2022-02-01 16:39:22 +05:30
Saqib Ansari
4778f16c56 fix: flaky test 
(cherry picked from commit bf70feb7c9)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
33e8cd9cde chore: remove unused import 
(cherry picked from commit 4e4159ec06)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
04acbea93d chore: remove useless rollback 
(cherry picked from commit 2aca54eb38)
 2022-02-01 11:07:32 +00:00
Saqib Ansari
c8f2a7fc69 test: point of sale search 
(cherry picked from commit 650d44a714)
 2022-02-01 11:07:32 +00:00
Subin Tom
7815ffb842 fix: remove qty indicator from non stock items 
(cherry picked from commit 845c02a989)
 2022-02-01 11:07:31 +00:00
Subin Tom
c57d184576 fix: sider fix 
(cherry picked from commit 27b35d72e2)
 2022-02-01 11:07:30 +00:00
Subin Tom
8ed2a7bc2c fix: removing get_value call by returning is_stock_item in get_stock_availability method 
(cherry picked from commit ac9a9fb229)
 2022-02-01 11:07:30 +00:00
Subin Tom
15c6b93ee3 fix: Removed validate_non_stock_items, filter_service_items methods 
(cherry picked from commit 9e20fa85c1)
 2022-02-01 11:07:29 +00:00
Subin Tom
0aff20e85c fix: sider issues 
(cherry picked from commit 6b973d658c)
 2022-02-01 11:07:28 +00:00
Subin Tom
75faa151fd fix: Allowing non stock items in POS 
(cherry picked from commit ec37930404)
 2022-02-01 11:07:28 +00:00
mergify[bot]
e2bdd5efdb fix: leave application tests (backport #29539) (#29563) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 16:18:16 +05:30