nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 18:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,376 Commits 462 Branches 1,752 Tags
d697515125fbf5c202af5d4e8a4f3f8fda79370f
Commit Graph

40376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f7593f599e Merge pull request #29424 from frappe/mergify/bp/version-13-hotfix/pr-29360 
test: unit test for deferred item with zero months (backport #29360)
 2022-01-24 13:01:49 +05:30
Deepesh Garg
51518cf978 Merge pull request #29423 from frappe/mergify/bp/version-13-hotfix/pr-29407 
fix: opening invoice creation tool can fetch multiple accounting dimension (backport #29407)
 2022-01-24 13:01:11 +05:30
Deepesh Garg
f6ee0c70e2 Merge branch 'version-13-hotfix' into doc_currency_override 2022-01-24 12:48:53 +05:30
ruthra
abd8291012 test: unit test for deferred items with zero months 
(cherry picked from commit 1e0450ed17)
 2022-01-24 07:12:37 +00:00
ruthra
37bbdc6743 refactor: a more generalized way to clear old entries for test cases 
(cherry picked from commit ed0f9cc063)
 2022-01-24 07:12:36 +00:00
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
384c6234d5 fix: conflicts 2022-01-24 12:16:19 +05:30
Rohit Waghchaure
540690252f fix: incorrect raw materials quantity in manufacture stock entry 
(cherry picked from commit f8d232ac26)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2022-01-24 06:44:46 +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
Saqib Ansari
ddf5ffc47e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29373 2022-01-23 18:17:56 +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
Rohit Waghchaure
5c8fc3890f Merge branch 'version-13-pre-release' into version-13 v13.19.0 2022-01-23 14:57:36 +05:30
Rohit Waghchaure
f44d90e097 bumped to version 13.19.0 2022-01-23 15:17:36 +05:50
rohitwaghchaure
4305d58273 Merge pull request #29415 from rohitwaghchaure/change-log-for-v13-19 
chore: change log for v13.19.0
 2022-01-23 14:55:32 +05:30
Rohit Waghchaure
194b7fbf2f chore: change log for v13.19.0 2022-01-23 14:50:49 +05:30
Marica
f9de807b25 Merge pull request #29400 from marination/minor-quotation-doc-wrong-var-pre-release 
fix: Wrong variable name breaks Cart Items rendering
 2022-01-21 19:45:49 +05:30
marination
5ed4b43b73 debug: CI 2022-01-21 19:21:38 +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
Deepesh Garg
ef782fd35b fix: Previous document currency getting overriden 2022-01-21 18:00:35 +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
b27fe43920 fix: Wrong variable name breaks Cart Items rendering 2022-01-21 16:04:48 +05:30
marination
2be15bd8e0 fix: Wrong variable name breaks Cart Items rendering 2022-01-21 15:58:29 +05:30
Marica
398fa6eb48 Merge pull request #29396 from frappe/mergify/bp/version-13-pre-release/pr-29383 
fix: Cart & Popup Logic of Item variant without Website Item (backport #29383)
 2022-01-21 15:35:16 +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
mergify[bot]
0da75d745e fix: update status on visit cancel (#29389) (#29395) 
* 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:18:15 +05:30
marination
522031fd73 fix: (test) set user for price test 
(cherry picked from commit 2185016f71)
 2022-01-21 09:46:15 +00:00
marination
927efffcb7 fix: Sider and Linter 
(cherry picked from commit 33b5e1d7e6)
 2022-01-21 09:46:15 +00:00
marination
454ae7e0ed 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

(cherry picked from commit c1dd3d7d9e)
 2022-01-21 09:46:14 +00:00
marination
c81cf33dce fix: Cart Logic of Item variant without Website Item 
(cherry picked from commit 7d130af12b)
 2022-01-21 09:46:14 +00:00
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