CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,616 Commits 424 Branches 1,723 Tags
2353fb64d81e12766a8a6772bee2bb13a555da99
Commit Graph

38616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
mergify[bot]
2cb24c8ec5 fix: Employee Advance paid amount not updated on PE cancellation (#28572) (#28608) 
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim

(cherry picked from commit baf41fdc9c)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-29 14:44:05 +05:30
Marica
ac2af2d99c Merge pull request #28606 from marination/custom-search 
feat: Allow addition of custom product search box
 2021-11-29 14:31:49 +05:30
marination
7fec4ab88b fix: search_box_id instead of search_box_class 2021-11-29 14:23:32 +05:30
marination
9ec58dec4d fix: Sider (missing semicolon) 2021-11-29 13:59:45 +05:30
marination
ae27bbe3c0 feat: Allow addition of custom search box 
- allow passing custom search box class to bind search actions on
- this allows users to inject and get a custom search box running on any page
 2021-11-29 13:47:14 +05:30
Ankush Menat
d270b320f1 chore: correct docstring 
[skip ci]
 2021-11-29 13:37:00 +05:30
Ankush Menat
2768047c9b fix: use get_all instead of get_list for child tables 
(cherry picked from commit f862339024)
 2021-11-29 13:37:00 +05:30
mergify[bot]
3621ee234e fix(ux): allow translations (#28455) (#28590) 
* Translation

* Translations

(cherry picked from commit cdaf0a04cf)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2021-11-27 15:11:25 +00:00
mergify[bot]
44cdedf9a2 fix: better validation for Integration Request (#28540) 2021-11-27 16:32:04 +05:30
mergify[bot]
965bfa5c62 fix: incorrect balance for warehouses (#28583) (#28584) 
(cherry picked from commit 7ff30a4b2b)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-26 17:36:26 +05:30
Deepesh Garg
e6b3becfbb Merge pull request #28581 from frappe/mergify/bp/version-13-hotfix/pr-27348 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers (backport #27348)
 2021-11-26 14:50:12 +05:30
Deepesh Garg
03449a09ce fix: Incorrect indentation 
(cherry picked from commit 7f06c8ca57)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
125ce5dd6d fix: Add tests 
(cherry picked from commit f07f010962)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
31f95bd5d1 fix(refactor): Advance tds allocation to purchase invoice 
(cherry picked from commit 5ba3b28d69)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
e2956922dc fix: GL Entries on advance TDS allocation 
(cherry picked from commit 25d208aa8a)
 2021-11-26 08:59:29 +00:00