nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,114 Commits 458 Branches 1,746 Tags
ac2d1a9accd7aeaf70d609baea2ae437f29f4e4d
Commit Graph

39114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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]
e1c209973c fix(ksa): qrcode for invoices with special chars (#28717) 2021-12-03 16:38:26 +05:30
mergify[bot]
09f0e9be86 fix(ksa): qrcode for invoices with special chars (#28716) 2021-12-03 16:37:57 +05:30
Saqib
d021fc8464 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28675 2021-12-03 15:59:01 +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
4c1d1555d2 Merge pull request #28711 from frappe/mergify/bp/version-13-pre-release/pr-28708 
fix: Invoice amount in KSA E Invoice QR Code (backport #28708)
 2021-12-03 15:47:20 +05:30
Deepesh Garg
64feb2862b Merge pull request #28697 from frappe/mergify/bp/version-13-pre-release/pr-28654 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
 2021-12-03 15:46:53 +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
6fd7460abf fix: Invocie amount in KSA E Invoice QR Code 
(cherry picked from commit f2ffddf059)
 2021-12-03 09:54:46 +00:00
Deepesh Garg
e4c9581d6e Merge pull request #28642 from frappe/mergify/bp/version-13-pre-release/pr-28302 
fix: Shipping Rule picking up old net_rate (backport #28302)
 2021-12-03 15:20:28 +05:30
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
Saqib
f80e670580 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28675 2021-12-03 12:59:17 +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
Saqib
f106e15fcc Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28675 2021-12-03 11:53:32 +05:30
mergify[bot]
97dd2dbc56 fix: qrcode image name for invoices with special chars (#28702) 2021-12-03 11:53:02 +05:30
mergify[bot]
83418f5110 fix: qrcode image name for invoices with special chars 2021-12-03 11:52:47 +05:30
Saqib Ansari
bcb372ab61 fix: conflicts 2021-12-03 11:46:50 +05:30
Saqib Ansari
ae330bc132 fix: conflicts 2021-12-03 11:44:06 +05:30
GangaManoj
e5a5d5f8e5 fix: Remove unnecessary variable 
(cherry picked from commit 828769ca70)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/regional/india/utils.py
 2021-12-03 06:02:55 +00:00
GangaManoj
a12000921f fix: Test if depreciation schedules are set up properly for existing assets 
(cherry picked from commit 774ac852c9)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 06:02:52 +00:00
GangaManoj
c888904cd2 fix: Modify has_pro_rata() to include existing assets 
(cherry picked from commit de002005ac)
 2021-12-03 06:02:50 +00:00
GangaManoj
7790c32676 fix: Create Depreciation Schedules properly for existing Assets 
(cherry picked from commit 5c3d4caeda)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2021-12-03 06:02:49 +00:00
GangaManoj
a50ecffb69 fix: Fix depreciation_amount calculation 
(cherry picked from commit 22cc8d2246)

# Conflicts:
#	erpnext/regional/india/utils.py
 2021-12-03 06:02:47 +00:00
Deepesh Garg
6bb2051c11 fix: India utils code cleanup 
(cherry picked from commit 56c626adbf)
 2021-12-03 04:11:55 +00:00
Deepesh Garg
a5163b0879 fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 
(cherry picked from commit 6a75e8d283)
 2021-12-03 04:11:54 +00:00
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
519394e1fc Merge pull request #28682 from frappe/mergify/bp/version-13-pre-release/pr-28533 
fix: misc minor Product Bundle fixes (backport #28533)
 2021-12-02 19:14:32 +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
mergify[bot]
b47322af5a fix: remove change_abbr method (#28692) 2021-12-02 15:31:30 +05:30
Saqib
0808438508 fix: remove change_abbr method (#28691) 2021-12-02 15:00:42 +05:30
mergify[bot]
abfaa4c07e fix: dont requeue repost immediately and clear progress (#28684) (#28690) 
(cherry picked from commit a37c99a23d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-02 14:58:24 +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
1ec0cd4e5b fix: Add item to packing list 
(cherry picked from commit a473e1dbe9)
 2021-12-02 03:52:56 +00:00
GangaManoj
1b8a947a18 fix: Remove unnecessary comma 
(cherry picked from commit c9743185c6)
 2021-12-02 03:52:55 +00:00
GangaManoj
ad96511fba fix: Test Product Bundle price calculation when there are multiple Product Bundles 
(cherry picked from commit adfd519139)
 2021-12-02 03:52:54 +00:00
GangaManoj
2353fb64d8 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:54 +00:00