CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 423 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GangaManoj
eb851dd36a fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 
(cherry picked from commit 8370042f82)
 2021-12-02 03:52:53 +00:00
GangaManoj
c9d3fa0649 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 
(cherry picked from commit 0803f87660)
 2021-12-02 03:52:52 +00:00
GangaManoj
4a38e61345 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:52:51 +00:00
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]
dd2ce664ea test: dynamic fiscal year creation in tests (#28667) (#28671) 
(cherry picked from commit fdffa037b5)

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

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-12-01 11:24:20 +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
mergify[bot]
62c5fd2c4c fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 18:43:22 +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