nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,603 Commits 400 Branches 1,700 Tags
24011bc6a40fbc7fa034d4bd46dfc1a7f8a393a7
Commit Graph

38603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra
24011bc6a4 refactor: fix failing test cases 
(cherry picked from commit f122a47d0d)
 2022-01-24 07:07:04 +00:00
ruthra
1273221477 fix: linter issue 
(cherry picked from commit 80ea163953)
 2022-01-24 07:07:04 +00:00
ruthra
b96fa03228 test: validating custom accouting dimension in opening invoice tool 
- create new dimension 'department'
 - assign and validate department in opening invoices

(cherry picked from commit 88463dc494)
 2022-01-24 07:07:03 +00:00
ruthra
bbd777a9cb fix: opening invoice creation tool not taking in accouting dimension 
(cherry picked from commit e2267cdba8)
 2022-01-24 07:07:03 +00:00
rohitwaghchaure
43a21f2836 Merge pull request #29337 from anupamvs/crm-contact-duplication-v13 
fix: contact duplication on converting lead to customer
 2022-01-24 10:16:23 +05:30
mergify[bot]
2fbaba40b5 fix: bypass_credit_limit_check in credit balance report (#29401) 2022-01-23 18:17:30 +05:30
Britlog
096e7b9ec5 fix: Don't delete barcode while saving Item (#29411) 2022-01-23 16:56:09 +05:30
Marica
315d542c2a Merge pull request #29398 from marination/minor-quotation-doc-wrong-var 
fix: Wrong variable name breaks Cart Items rendering
 2022-01-21 19:20:29 +05:30
marination
bfbcde7595 debug: CI 2022-01-21 19:02:47 +05:30
Ankush Menat
1538076ae4 fix(patch): skip patch if column doesn't exist 2022-01-21 16:11:32 +05:30
Ankush Menat
f60ea20145 test: create and cancel sr no with stock reco 
(cherry picked from commit 4fa93e246e)
 2022-01-21 16:11:32 +05:30
Ankush Menat
91887f215d fix(patch): update stock reconciliation current serial nos 
When current serial nos are non-existing there shouldn't be any value in
current_serial_no field.

(cherry picked from commit 203f0086f8)
 2022-01-21 16:11:32 +05:30
Ankush Menat
0e413ef54e fix: bad default for non-existing serial nos 
serial_no field should have empty string if it doesn't have any serial
nos

(cherry picked from commit 33c4a0b5a9)
 2022-01-21 16:11:32 +05:30
Ankush Menat
f336b5d586 perf: single query to update serial nos 
(cherry picked from commit ea5efd0791)
 2022-01-21 16:11:32 +05:30
marination
2be15bd8e0 fix: Wrong variable name breaks Cart Items rendering 2022-01-21 15:58:29 +05:30
mergify[bot]
d9f783f38e fix: update status on visit cancel (#29389) (#29394) 
* fix: update status on cancelling visit

* test: updated test for cancelling visits

(cherry picked from commit 11c9a5a79f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2022-01-21 15:22:56 +05:30
Saqib Ansari
6aaa187a49 Merge pull request #29392 from frappe/mergify/bp/version-13-hotfix/pr-29385 
fix: first depreciation amount in asset (backport #29385)
 2022-01-21 15:15:55 +05:30
Marica
f2d8d7ab96 Merge pull request #29383 from marination/item-variant-web-logic-fix 
fix: Cart & Popup Logic of Item variant without Website Item
 2022-01-21 15:15:33 +05:30
mergify[bot]
fde6f13b4b fix: cannot cancel jv after migrating from v12 (#29391) 2022-01-21 15:15:11 +05:30
marination
2185016f71 fix: (test) set user for price test 2022-01-21 14:55:43 +05:30
marination
33b5e1d7e6 fix: Sider and Linter 2022-01-21 14:49:10 +05:30
Saqib Ansari
4fec250cbf fix: merge conflicts 2022-01-21 14:33:59 +05:30
marination
c1dd3d7d9e tests: Variant without web item price fetch and add to cart 
- Also, optionally get image from template web item for cart if variant has no image
 2022-01-21 14:33:30 +05:30
Saqib Ansari
8e2b96e814 fix: failing test cases 
(cherry picked from commit ae580d116c)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2022-01-21 08:56:40 +00:00
Saqib Ansari
398fab4786 fix: depreciation amount on selling an asset 
(cherry picked from commit 0bbde4819b)
 2022-01-21 08:56:40 +00:00
Saqib Ansari
844b73efcd fix: first depreciation amount in asset 
(cherry picked from commit 60bfead773)
 2022-01-21 08:56:39 +00:00
mergify[bot]
9869b31b31 fix(Timesheets): calculate to time (backport #28589) (#29390) 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2022-01-21 13:51:49 +05:30
Saqib Ansari
04e3fb85e5 Merge pull request #28851 from frappe/mergify/bp/version-13-hotfix/pr-28507 
fix: Clear Depreciation Schedule before modification (backport #28507)
 2022-01-21 12:34:05 +05:30
Marica
1f099bcdfb Merge pull request #29077 from dj12djdjs/fix-ecommerce-cart-badge 
fix(e-commerce)(UX): shopping cart qty badge
 2022-01-21 12:28:28 +05:30
mergify[bot]
ceba7f2fe4 fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607) (#29387) 
* fix: updated packed_items getting fetched on sales return

* fix: updated test cases for product bundle returns

* fix: moved calculate_mapped_packed_items_return to stock.utils

* fix: updated packed_items getting fetched on Return/Credit Note

* refactor: change var name to avoid `self`

* fix: check item code before assigning parent item

(cherry picked from commit 20216fa9f1)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-21 12:11:58 +05:30
Chillar Anand
696fc0a482 refactor: Added deprecation warning for hospitality domain (#29384) 2022-01-21 11:36:40 +05:30
marination
7d130af12b fix: Cart Logic of Item variant without Website Item 2022-01-20 19:34:36 +05:30
Anupam Kumar
29241070c1 Merge branch 'version-13-hotfix' into crm-contact-duplication-v13 2022-01-20 17:30:21 +05:30
Ankush Menat
d32f229483 ci: fail on merge conflict label 2022-01-20 15:39:32 +05:30
Ankush Menat
8a9a13cb96 ci: concurrency control on v13 branches 2022-01-20 15:39:32 +05:30
Ankush Menat
d190ea4ad3 ci: disable coverage on v13 branch 2022-01-20 15:39:32 +05:30
Marica
eb44b16e31 Merge pull request #29378 from frappe/mergify/bp/version-13-hotfix/pr-29375 
fix: (enhance) BOM Operations Report (backport #29375)
 2022-01-20 15:34:20 +05:30
mergify[bot]
b9a42807f8 fix: show stock UOM for material transfers (#29376) (#29377) 
(cherry picked from commit 7e407bcc42)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-20 15:06:11 +05:30
marination
655d8980dc fix: Allow only BOM with ops in BOM ID filter & add total row to report 
(cherry picked from commit af734298c8)
 2022-01-20 09:25:05 +00:00
marination
e963d0e8e0 fix: Sider (unused imports) and Linter(add extra empty line) 
(cherry picked from commit 3c7b772112)
 2022-01-20 09:25:05 +00:00
marination
77cb7ebd40 fix: (enhance) BOM Operations Report 
- Added filters in the Report for BOM ID, Item Code and Workstation
- Converted Raw SQL to frappe.qb and added method to get filtered data
- Changed fieldtype of 'Time in mins' from Int to Float
- Get BOM wise grouped data to  keep order and accurate grouping in report

(cherry picked from commit a9ff1fc52e)
 2022-01-20 09:25:04 +00:00
Deepesh Garg
829ea71ae1 Merge pull request #29366 from deepeshgarg007/bank_statement_import_template 
fix: Cleanup empty rows on bank statement import
 2022-01-20 11:24:48 +05:30
Deepesh Garg
25398d017b fix: Cleanup empty rows on bank statement import 2022-01-20 10:51:59 +05:30
mergify[bot]
f75d36dcb4 fix: from time and to time not updated in drag and drop action #29114 (#29361) 
fix: from time and to time not updated in drag and drop action
(cherry picked from commit 8b5827ed6d)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2022-01-19 19:30:21 +05:30
Marica
6c45223606 Merge pull request #29352 from frappe/mergify/bp/version-13-hotfix/pr-28843 
refactor: update_serial_no function for old Maintenance Visits (backport #28843)
 2022-01-19 14:48:24 +05:30
marination
93d665b38a fix: Patch (reload doc) 2022-01-19 13:53:18 +05:30
Anupam
44d2098530 fix: changed function name 2022-01-19 13:10:23 +05:30
marination
3023757a60 fix: Conflicts 2022-01-19 13:06:52 +05:30
Noah Jacob
add36363ab fix: Serial No. filters for unscheduled visits 
(cherry picked from commit dec7513773)
 2022-01-19 07:19:51 +00:00
Noah Jacob
93325c72f0 refactor: moved purpose table mandatory check to server 
(cherry picked from commit b98c61f2a7)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
 2022-01-19 07:19:50 +00:00