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,631 Commits 423 Branches 1,723 Tags
6fd7460abfa6c953dbe64e95e6621be231e5df19
Commit Graph

38631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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