nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 10:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,084 Commits 463 Branches 1,752 Tags
7c4f5fa5c5f798ebec5b8dbf33df746f380e2d2e
Commit Graph

41084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Subin Tom
9e1fd09a64 fix: fixed tests, separated a method for shipping charges 
(cherry picked from commit a8e2c02e14)
 2021-11-30 09:08:16 +00:00
Subin Tom
d2d8986553 fix: check if shipping rule value exists 
(cherry picked from commit af1fce0419)
 2021-11-30 09:08:16 +00:00
Subin Tom
e6d0103cf3 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 
(cherry picked from commit 18ae03d967)
 2021-11-30 09:08:15 +00:00
Subin Tom
e65a720810 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:15 +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
mergify[bot]
16ce9dfa12 fix: Employee Transfer and Project Profitability test cases (#28633) (#28639) 
* 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:43 +05:30
mergify[bot]
c69fe4efb4 fix(ux): remove attachment limit from item doctype (backport #28632) 
fix(ux): remove attachment limit from item doctype (backport #28632)
 2021-11-30 13:48:22 +05:30
Deepesh Garg
5e7ce5370f fix: Paid showing in AR/AP report 2021-11-29 23:53:28 +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
mergify[bot]
b6ffe333b9 fix(regional): hsn_wise as false returns item_code (#28619) 2021-11-29 20:47:56 +05:30
mergify[bot]
20f9b621e4 feat(pos): Total item qty field to POS screen (backport #28331) 2021-11-29 20:46:47 +05:30
GangaManoj
944b995179 fix: Change order of import statements 
(cherry picked from commit c94f1ed39a)
 2021-11-29 15:13:48 +00:00
GangaManoj
1c643059df fix: Remove unused import 
(cherry picked from commit b28f137ee8)
 2021-11-29 15:13:48 +00:00
GangaManoj
53eb7bd1c3 fix: Add test for consumption of serialized Assets 
(cherry picked from commit 6b75d1439f)
 2021-11-29 15:13:47 +00:00
GangaManoj
45f948f575 fix: Create setUpClass 
(cherry picked from commit efac7b0904)
 2021-11-29 15:13:47 +00:00
GangaManoj
a1f47d8ae0 fix: Create stock item 
(cherry picked from commit eea80b6c01)
 2021-11-29 15:13:46 +00:00
GangaManoj
7dbf6867d5 fix: Replace 'item' with 'item_code' in tests 
(cherry picked from commit c9e79ef1f2)
 2021-11-29 15:13:46 +00:00
GangaManoj
b38819aa3f fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 
(cherry picked from commit 1393f97ad5)
 2021-11-29 15:13:46 +00:00
GangaManoj
ebd89e1c3d feat: Add 'Add Serial No' button in the Stock Items table 
(cherry picked from commit 4668bb4be0)
 2021-11-29 15:13:45 +00:00
GangaManoj
246f02d585 fix: Rename item to item_code 
(cherry picked from commit abb535540a)
 2021-11-29 15:13:45 +00:00
GangaManoj
4b9d1fa0de feat: Add Serial No field 
(cherry picked from commit 1aed8c4b2f)
 2021-11-29 15:13:44 +00:00
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
Deepesh Garg
db5930742d fix: Move trigger from on trash to on cancel 
(cherry picked from commit 4382040fb6)
 2021-11-29 13:17:34 +00:00
Mohammed Redah
f32ed1bd41 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:17:34 +00:00
Deepesh Garg
12a79dc6ac Merge pull request #28609 from frappe/mergify/bp/version-13-hotfix/pr-28556 
fix: incorrect discount amount set when item is replaced (backport #28556)
 2021-11-29 18:06:19 +05:30
rohitwaghchaure
0628aba0c7 Merge pull request #28616 from frappe/mergify/bp/version-13-hotfix/pr-28611 
fix: changed fieldtype from int to float for the field Batch Size in the Work Order Operation table (backport #28611)
 2021-11-29 17:49:47 +05:30
Deepesh Garg
fcaebc465e Merge pull request #28614 from frappe/mergify/bp/version-13-hotfix/pr-28605 
refactor(KSA VAT): QR Code as per ZATKA specification (backport #28605)
 2021-11-29 17:38:47 +05:30
Deepesh Garg
69c0e4dea1 Merge pull request #28612 from frappe/mergify/bp/version-13-pre-release/pr-28605 
refactor(KSA VAT): QR Code as per ZATKA specification (backport #28605)
 2021-11-29 17:38:26 +05:30
Rohit Waghchaure
1733c1c513 fix: changed fieldtype from int to float for the field Batch Size in the work order 
(cherry picked from commit 7fac9b8e9c)
 2021-11-29 11:44:25 +00:00
Deepesh Garg
fa54cd31a0 fix: Remove duplicate patch 2021-11-29 16:54:34 +05:30
Deepesh Garg
eeaed9d730 fix: KSA print format for invoices not having item codes 
(cherry picked from commit af6fc29770)
 2021-11-29 11:17:42 +00:00
Deepesh Garg
63d29b5d01 fix: Translations 
(cherry picked from commit f3f7ed6f0d)
 2021-11-29 11:17:41 +00:00
Ahmad
7fed860654 fix: KSA VAT QR Code arabic conversion 
(cherry picked from commit 31b9b84fdf)
 2021-11-29 11:17:40 +00:00
Ahmad
ca0a6c04fb refactor: comments removed 
(cherry picked from commit de784d8bfe)
 2021-11-29 11:17:40 +00:00
Ahmad
35f4159274 refactor(KSA VAT): QR Code as per ZATKA specification 
(cherry picked from commit d1746caa02)
 2021-11-29 11:17:39 +00:00
Deepesh Garg
9348fcf6c3 fix: KSA print format for invoices not having item codes 
(cherry picked from commit af6fc29770)
 2021-11-29 11:17:04 +00:00
Deepesh Garg
3289ba92fa fix: Translations 
(cherry picked from commit f3f7ed6f0d)
 2021-11-29 11:17:03 +00:00
Ahmad
f2f00ad402 fix: KSA VAT QR Code arabic conversion 
(cherry picked from commit 31b9b84fdf)
 2021-11-29 11:17:03 +00:00
Ahmad
641043e893 refactor: comments removed 
(cherry picked from commit de784d8bfe)
 2021-11-29 11:17:02 +00:00
Ahmad
fda69bc0cf refactor(KSA VAT): QR Code as per ZATKA specification 
(cherry picked from commit d1746caa02)
 2021-11-29 11:17:01 +00:00
Saqib
acb2eec7ed fix: incorrect discount amount set when item is replaced (#28556) 
(cherry picked from commit c0cc72ec1d)
 2021-11-29 09:35:59 +00:00