nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,154 Commits 401 Branches 1,700 Tags
313eb70bfa9f346a0eeffabd2dc9dcf46fa07bec
Commit Graph

38154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Saqib
0808438508 fix: remove change_abbr method (#28691) 2021-12-02 15:00:42 +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
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]
d2a0a554a6 fix(POS Profile): replace cur_frm with frm (#28664) 2021-12-01 15:18:01 +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
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
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
Deepesh Garg
f3916c02a8 feat: Show Zero Values filter in consolidated financial statement 
(cherry picked from commit 9610086d0c)
 2021-11-30 12:46:30 +00:00
mergify[bot]
d711a3883b chore: remove duplicate code (bp #28646) 
[skip ci]

(cherry picked from commit 0854c183aa)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-30 18:00:54 +05:30
mergify[bot]
9975da755b fix: allow creating Shift Assignment for same day (#28613) (#28629) 
(cherry picked from commit 4458b24813)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-30 14:46:59 +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
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
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
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
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