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,183 Commits 400 Branches 1,700 Tags
ae6bac9fcbe15bc1d375349d2cd674ee24af2e44
Commit Graph

38183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GangaManoj
ae6bac9fcb fix: Categorize into test suites 
(cherry picked from commit c84c983073)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:18 +00:00
GangaManoj
94c3e0503f fix: Add tests for depreciation 
(cherry picked from commit 40ec2d622b)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:15 +00:00
GangaManoj
7c114c0bc5 fix: Replace asset.schedules with asset.get('schedules') 
(cherry picked from commit fdd9e6cc3c)
 2021-12-03 11:24:13 +00:00
GangaManoj
46c0e349f6 fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned 
(cherry picked from commit 796ed947ce)
 2021-12-03 11:24:12 +00:00
GangaManoj
91fbe54b8d fix: Reset depreciation schedule on returning asset 
(cherry picked from commit b9fb59da58)
 2021-12-03 11:24:12 +00:00
GangaManoj
7921e7ebfd fix: Add test for depreciation on sale of a depreciated Asset 
(cherry picked from commit 7ab3b9dd5a)
 2021-12-03 11:24:11 +00:00
GangaManoj
efe9926bb4 fix: Add depreciation_schedule details in create_asset() 
(cherry picked from commit 249672c35d)
 2021-12-03 11:24:10 +00:00
GangaManoj
9eb37197e0 fix: Remove extra brackets 
(cherry picked from commit 700e78d69b)
 2021-12-03 11:24:08 +00:00
GangaManoj
311f9c8389 fix: Calculate depreciation_amount accurately 
(cherry picked from commit 3c8879e777)
 2021-12-03 11:24:08 +00:00
GangaManoj
04acf5b08c fix: Correct expected_values 
(cherry picked from commit 244d9dee04)
 2021-12-03 11:24:07 +00:00
GangaManoj
9a3a22a08e fix: Calculate depreciation_left accurately 
(cherry picked from commit 164a2ad28d)
 2021-12-03 11:24:06 +00:00
mergify[bot]
09f0e9be86 fix(ksa): qrcode for invoices with special chars (#28716) 2021-12-03 16:37:57 +05:30
mergify[bot]
521318b4ad fix: cannot load company form (#28663) 2021-12-03 15:58:29 +05:30
Deepesh Garg
c02d46862d Merge pull request #28713 from frappe/mergify/bp/version-13-hotfix/pr-28708 
fix: Invoice amount in KSA E Invoice QR Code (backport #28708)
 2021-12-03 15:52:29 +05:30
Deepesh Garg
3b3f764ef2 fix: Invocie amount in KSA E Invoice QR Code 
(cherry picked from commit f2ffddf059)
 2021-12-03 09:55:41 +00:00
Deepesh Garg
b09274bd49 Merge pull request #28641 from frappe/mergify/bp/version-13-hotfix/pr-28302 
fix: Shipping Rule picking up old net_rate (backport #28302)
 2021-12-03 15:20:09 +05:30
mergify[bot]
99dfa91f81 feat: Grant commission on certain items only (#28645) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit e10ab1626c)
 2021-12-03 15:17:45 +05:30
mergify[bot]
2f6b1569f4 fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) (#28704) 
(cherry picked from commit 0b1808e1ee)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-03 12:08:14 +05:30
mergify[bot]
83418f5110 fix: qrcode image name for invoices with special chars 2021-12-03 11:52:47 +05:30
Deepesh Garg
10c4874306 Merge pull request #28654 from deepeshgarg007/tax_template_mapping 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice
 2021-12-03 09:40:54 +05:30
Deepesh Garg
313eb70bfa Merge pull request #28600 from frappe/mergify/bp/version-13-hotfix/pr-28592 
fix: do not add gst fields if no indian company (backport #28592)
 2021-12-03 09:37:54 +05:30
Deepesh Garg
a1fa55f41f Merge pull request #28681 from frappe/mergify/bp/version-13-hotfix/pr-28533 
fix: misc minor Product Bundle fixes (backport #28533)
 2021-12-02 19:13:57 +05:30
Deepesh Garg
8309cbe064 Merge pull request #28627 from deepeshgarg007/accounts_receivable_multi_currency 
fix: Paid invoices showing in AR/AP report
 2021-12-02 19:13:09 +05:30
Deepesh Garg
c10f4ebe70 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28533 2021-12-02 17:18:45 +05:30
Deepesh Garg
f274f4decd Merge branch 'version-13-hotfix' into tax_template_mapping 2021-12-02 17:18:22 +05:30
Deepesh Garg
56c626adbf fix: India utils code cleanup 2021-12-02 17:17:56 +05:30
Saqib
0808438508 fix: remove change_abbr method (#28691) 2021-12-02 15:00:42 +05:30
mergify[bot]
0325ed1277 fix: dont requeue repost immediately and clear progress (#28684) (#28689) 
(cherry picked from commit a37c99a23d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-02 14:58:17 +05:30
mergify[bot]
e7982a9c9e fix: Make buttons translatable (#28685) 2021-12-02 12:13:50 +05:30
mergify[bot]
b6d752201a fix: actual tax conversion in case of multicurrency invoices (#28686) 2021-12-02 12:13:34 +05:30
GangaManoj
a16fa09a54 fix: Add item to packing list 
(cherry picked from commit a473e1dbe9)
 2021-12-02 03:52:04 +00:00
GangaManoj
f38899a28a fix: Remove unnecessary comma 
(cherry picked from commit c9743185c6)
 2021-12-02 03:52:03 +00:00
GangaManoj
9aab38d242 fix: Test Product Bundle price calculation when there are multiple Product Bundles 
(cherry picked from commit adfd519139)
 2021-12-02 03:52:02 +00:00
GangaManoj
d2dd51f15b fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 
(cherry picked from commit 325923afc7)
 2021-12-02 03:52:02 +00:00
GangaManoj
cfb6cbbd8c fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 
(cherry picked from commit 8370042f82)
 2021-12-02 03:52:01 +00:00
GangaManoj
e18542ef6a fix: Fix Product Bundle price calculation when there are multiple Product Bundles 
(cherry picked from commit 0803f87660)
 2021-12-02 03:52:00 +00:00
GangaManoj
e8e0faa23a fix: Add bundle items to PO only if the Product Bundle was selected from the SO 
(cherry picked from commit 406278b5c1)
 2021-12-02 03:51:59 +00:00
mergify[bot]
742ede7ba4 test: dynamic fiscal year creation in tests (#28667) (#28670) 
(cherry picked from commit fdffa037b5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-01 17:53:53 +05:30
mergify[bot]
d2a0a554a6 fix(POS Profile): replace cur_frm with frm (#28664) 2021-12-01 15:18:01 +05:30
mergify[bot]
f599c375ed chore: add timeout to GHA workflows (#26714) (#28661) 
(cherry picked from commit 0bb60b37df)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-12-01 11:23:40 +05:30
Deepesh Garg
6a75e8d283 fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 2021-11-30 20:36:30 +05:30
Ankush Menat
743b8c23ed Merge pull request #28626 from frappe/mergify/bp/version-13-hotfix/pr-28349 
feat: Let serialised Items be consumed during Asset Repairs (backport #28349)
 2021-11-30 18:51:39 +05:30
Deepesh Garg
1d38040091 Merge pull request #28649 from frappe/mergify/bp/version-13-hotfix/pr-28636 
feat: Show Zero Values filter in consolidated financial statement (backport #28636)
 2021-11-30 18:40:09 +05:30
Deepesh Garg
08b7c856b2 fix: Unable to search project by project name in Sales Invoice (#28648) 2021-11-30 18:36:56 +05:30
Deepesh Garg
b3d182e782 Merge branch 'version-13-hotfix' into accounts_receivable_multi_currency 2021-11-30 18:20:08 +05:30
Deepesh Garg
f3916c02a8 feat: Show Zero Values filter in consolidated financial statement 
(cherry picked from commit 9610086d0c)
 2021-11-30 12:46:30 +00:00
mergify[bot]
d711a3883b chore: remove duplicate code (bp #28646) 
[skip ci]

(cherry picked from commit 0854c183aa)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-30 18:00:54 +05:30
Subin Tom
f591596615 fix: merge conflicts 2021-11-30 16:06:55 +05:30
mergify[bot]
9975da755b fix: allow creating Shift Assignment for same day (#28613) (#28629) 
(cherry picked from commit 4458b24813)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-30 14:46:59 +05:30
Subin Tom
facaa9cc39 fix: sider issues 
(cherry picked from commit e7b4204c35)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2021-11-30 09:08:17 +00:00