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
38,649 Commits 423 Branches 1,723 Tags
f22bbaa9bacfda0c506f818fa3e04e0992a0fdf5
Commit Graph

38649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f22bbaa9ba Merge pull request #28788 from frappe/mergify/bp/version-13-pre-release/pr-28786 
fix: Error on Invoice generation (backport #28786)
 2021-12-08 14:12:00 +05:30
Deepesh Garg
f478d2d36a fix: Error on Invoice generation 
(cherry picked from commit 82255293c4)
 2021-12-08 08:40:05 +00:00
Rohit Waghchaure
fa304f3300 Merge branch 'version-13-pre-release' into version-13 v13.16.1 2021-12-08 13:27:11 +05:30
Rohit Waghchaure
603b1888fc bumped to version 13.16.1 2021-12-08 13:47:11 +05:50
Deepesh Garg
20f9015620 Merge pull request #28784 from frappe/mergify/bp/version-13-pre-release/pr-28777 
fix: Error on creating invoice (backport #28777)
 2021-12-08 12:13:08 +05:30
Deepesh Garg
153c9221a9 fix: Error on creating invoice 
(cherry picked from commit e11515a356)
 2021-12-08 06:42:36 +00:00
Rohit Waghchaure
5c1a2aee3a Merge branch 'version-13-pre-release' into version-13 v13.16.0 2021-12-06 00:24:07 +05:30
Rohit Waghchaure
0e8981028e bumped to version 13.16.0 2021-12-06 00:44:06 +05:50
rohitwaghchaure
55c653a7f8 Merge pull request #28737 from rohitwaghchaure/change-log-for-v13-16 
chore: change log for v13.16.0
 2021-12-06 00:20:44 +05:30
Rohit Waghchaure
6398e588ec chore: change log for v13.16.0 2021-12-05 23:56:31 +05:30
mergify[bot]
b6ef93d574 fix(patch): create only component type field instead of running the whole setup (#28734) (#28736) 
(cherry picked from commit 0ef42d1000)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-05 13:05:34 +05:30
Noah Jacob
ddcbea3d0a test: added tests for manufacture stock entry when material_consumption is enabled 
(cherry picked from commit 35346de162)
 2021-12-04 18:51:16 +05:30
Noah Jacob
27c8c361d6 fix: incorrect outgoing rates when material_consumption enabled 
(cherry picked from commit 7f3e6d149a)
 2021-12-04 18:51:16 +05:30
mergify[bot]
e1c209973c fix(ksa): qrcode for invoices with special chars (#28717) 2021-12-03 16:38:26 +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
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
mergify[bot]
97dd2dbc56 fix: qrcode image name for invoices with special chars (#28702) 2021-12-03 11:53:02 +05:30
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
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
mergify[bot]
b47322af5a fix: remove change_abbr method (#28692) 2021-12-02 15:31:30 +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
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
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]
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]
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
Subin Tom
10c92c45d8 fix: merge conflicts 2021-11-30 16:11:29 +05:30
mergify[bot]
6c5cefb3ac fix: allow creating Shift Assignment for same day (#28613) (#28630) 
(cherry picked from commit 4458b24813)

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

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2021-11-30 09:08:52 +00:00
Subin Tom
fcfd6d6f04 fix: fixed tests, separated a method for shipping charges 
(cherry picked from commit a8e2c02e14)
 2021-11-30 09:08:51 +00:00
Subin Tom
8d0493113a fix: check if shipping rule value exists 
(cherry picked from commit af1fce0419)
 2021-11-30 09:08:50 +00:00
Subin Tom
edf446e632 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 
(cherry picked from commit 18ae03d967)
 2021-11-30 09:08:50 +00:00
Subin Tom
bf212da25a fix: Shipping Rule picking up old net_rate 
(cherry picked from commit c78b8b7897)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
#	erpnext/public/js/controllers/transaction.js
 2021-11-30 09:08:50 +00:00
mergify[bot]
3d76afbc7b fix: Employee Transfer and Project Profitability test cases (#28633) (#28640) 
* fix: Employee Transfer testcases

* fix: Project Profitability test case

(cherry picked from commit d0f4f03b66)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-30 14:26:57 +05:30
rohitwaghchaure
bf62c7634a Merge pull request #28622 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-16 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-11-29 21:08:49 +05:30
Rohit Waghchaure
ced223188f chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-11-29 19:41:48 +05:30
Rohit Waghchaure
db7fbfb5a7 Merge branch 'version-13-pre-release' into version-13 v13.15.2 2021-11-29 19:18:12 +05:30
Rohit Waghchaure
f1fb0fc5cb bumped to version 13.15.2 2021-11-29 19:38:12 +05:50
Deepesh Garg
fbe5157e3f Merge pull request #28620 from frappe/mergify/bp/version-13-hotfix/pr-28464 
fix:Change QR Code Triggerr event (backport #28464)
 2021-11-29 19:15:33 +05:30
Deepesh Garg
6feb0df8e8 Merge pull request #28621 from frappe/mergify/bp/version-13-pre-release/pr-28464 
fix:Change QR Code Triggerr event (backport #28464)
 2021-11-29 19:15:13 +05:30
Deepesh Garg
ca375b0e8d fix: Move trigger from on trash to on cancel 
(cherry picked from commit 4382040fb6)
 2021-11-29 13:18:15 +00:00
Mohammed Redah
26932885bb fix:Change QR Code Triggerr event 
This fixes the bug if the user changes the date after insertion it will show the wrong values

(cherry picked from commit 9d319c2205)
 2021-11-29 13:18:14 +00:00