schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,134 Commits 322 Branches 1,581 Tags
e8e0faa23a744bec402809b8dae9db576f60e9bd
Commit Graph

38134 Commits

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