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

37958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfram Schmidt
c7f75aad79 fix: add Email option to contact email field (#28296) 
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json

(cherry picked from commit 6907ad8adb)
 2021-11-09 18:37:54 +05:30
Ankush Menat
b45d9065da fix: patch to update job card status 
(cherry picked from commit ccf84ae88a)
 2021-11-09 18:37:07 +05:30
Ankush Menat
f2aa5015cb fix: avoid mutating iterator while iterating over it 
(cherry picked from commit fdfa39c231)
 2021-11-09 18:37:07 +05:30
Ankush Menat
65844932cc fix: use completion qty instead of transfer quantity for JC status 
(cherry picked from commit 37799fe3dd)
 2021-11-09 18:37:07 +05:30
mergify[bot]
47b609ef1a fix(India setup): setup company independent fixtures for patch (#28299) 
(cherry picked from commit 88b5bda34b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 17:50:38 +05:30
mergify[bot]
077073f9a3 perf: improve financial statement loading time (#28295) 
(cherry picked from commit b7a44fe0a3)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2021-11-09 17:33:52 +05:30
rohitwaghchaure
9869b17ee0 Merge pull request #28291 from frappe/mergify/bp/version-13-hotfix/pr-28150 
feat: provision to close the Work Order (backport #28150)
 2021-11-09 16:40:46 +05:30
Sagar Vora
442177aeee fix: specify fields to be set in Lead (#28289) 2021-11-09 16:05:03 +05:30
rohitwaghchaure
8079dc1bae Merge pull request #28219 from DeeMysterio/in-process-qi 
feat: provision to have limited parameters for in-process quality inspection
 2021-11-09 15:49:37 +05:30
Anupam
47851ce754 fix: get_planned_qty chnages 
(cherry picked from commit 663a7afe4d)
 2021-11-09 10:17:09 +00:00
Anupam
7e256e220b fix: test cases 
(cherry picked from commit 27709a1c71)
 2021-11-09 10:17:09 +00:00
Anupam
26c23719a0 fix: testcases: 
(cherry picked from commit 7044ae5e39)
 2021-11-09 10:17:08 +00:00
Anupam
f96ac4e204 fix: linter isuue 
(cherry picked from commit cc15cf6ae2)
 2021-11-09 10:17:07 +00:00
Anupam
b993d45ba5 fix: sider isuue 
(cherry picked from commit ba47bd02b6)
 2021-11-09 10:17:02 +00:00
Anupam
e57f53e771 fix: validate job card 
(cherry picked from commit 9b4c7e4796)
 2021-11-09 10:17:00 +00:00
Anupam
21cc87990a fix: test cases 
(cherry picked from commit 9c0906f1b5)
 2021-11-09 10:17:00 +00:00
Anupam
fcafc0e184 fix: linter issues 
(cherry picked from commit e36da4d137)
 2021-11-09 10:16:59 +00:00
Anupam
ab1f12ff66 fix: linter issues 
(cherry picked from commit 59e4fd980c)
 2021-11-09 10:16:59 +00:00
Anupam
fcb80faadc fix: added testcase 
(cherry picked from commit 530a0f481e)
 2021-11-09 10:16:58 +00:00
Anupam
ac3605c96a fix: sider issue 
(cherry picked from commit 264b0df9ff)
 2021-11-09 10:16:57 +00:00
Anupam
e5e16b5dc4 fix: sider issue 
(cherry picked from commit 55e97dce8a)
 2021-11-09 10:16:57 +00:00
Anupam
91a06b690c fix: sider issue 
(cherry picked from commit e290fe0721)
 2021-11-09 10:16:56 +00:00
Anupam
e144f199a4 feat: added confirm dialog on closing of workorder 
(cherry picked from commit 5d4c5652af)
 2021-11-09 10:16:55 +00:00
Anupam
7bdc948a48 feat: provision to close the Work Order 
(cherry picked from commit 23af036894)
 2021-11-09 10:16:55 +00:00
mergify[bot]
59632720b2 fix: sum of components in salary register (#28237) (#28287) 
* fix: sum of components in salary register

* fix: sum of deduction components

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 17acb08545)

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-11-09 15:45:26 +05:30
mergify[bot]
58ece37d8f fix: filter only submitted fees in student fee collection report (#28280) (#28282) 
* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection

(cherry picked from commit 0e8e7e21c3)

Co-authored-by: Bibin <17405044+bibinqcs@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 15:45:11 +05:30
Diksha Jadhav
467324c87f refactor: use fetch from property for qi template on job card 2021-11-09 14:21:34 +05:30
yadavyk
627dd67a9b fix: Added count for Healthcare Practioner (#28286) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-09 13:15:41 +05:30
mergify[bot]
178a883ecc fix: show full item name in search widget (#28283) (#28284) 
(cherry picked from commit 34f5283c17)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-09 12:15:09 +05:30
mergify[bot]
5d249016c3 fix: do not generate multiple invoices (#28215) 2021-11-08 20:07:47 +05:30
Deepesh Garg
9b2c460cb8 Merge pull request #28275 from frappe/mergify/bp/version-13-hotfix/pr-28272 
fix: KSA VAT setup issues (backport #28272)
 2021-11-08 18:47:21 +05:30
Deepesh Garg
bad6c3de43 Merge pull request #28262 from nemesis189/taxjar-cust-address-patch-update 
fix: Taxjar customer_address fix, currency fix
 2021-11-08 18:40:35 +05:30
Deepesh Garg
6c1bb1ecb9 Merge pull request #28273 from frappe/mergify/bp/version-13-hotfix/pr-28065 
fix(minor): check if gst_category exists while validating GSTIN (backport #28065)
 2021-11-08 18:33:37 +05:30
Deepesh Garg
987bd4fce2 fix: Resolve conflicts 2021-11-08 18:15:53 +05:30
Deepesh Garg
8a510b5441 fix: Add patch to make custom fields 
(cherry picked from commit 508832e90a)

# Conflicts:
#	erpnext/patches.txt
 2021-11-08 12:40:19 +00:00
Deepesh Garg
a34519c0c4 fix: KSA VAT setup issues 
(cherry picked from commit c81d4734c4)
 2021-11-08 12:40:18 +00:00
Subin Tom
7ad2717acc fix: company condition fix, added company field 2021-11-08 18:03:44 +05:30
Subin Tom
7f2d304f32 fix: fixed company field, updated patch 2021-11-08 17:59:03 +05:30
Anuja Pawar
d37ca7b3e0 fix: sider 
(cherry picked from commit f2fbcc8124)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
bbea156aa6 fix: update set_value query 
(cherry picked from commit dd3cadd46b)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
10606b242c fix: re-writing sql query with ORM methods 
(cherry picked from commit bc1e7bc15f)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
1dbb83c03d fix: sider 
(cherry picked from commit 6a3bd882b4)
 2021-11-08 12:24:28 +00:00
Anuja Pawar
ba08b4fcb3 fix: sider 
(cherry picked from commit 4f53837624)
 2021-11-08 12:24:27 +00:00
Anuja Pawar
2c0e8c8559 fix: check if gst_category exist 
(cherry picked from commit 59c31bb124)
 2021-11-08 12:24:27 +00:00
Deepesh Garg
18e7fbf33a Merge pull request #28271 from frappe/mergify/bp/version-13-hotfix/pr-28166 
feat(Print Format): KSA VAT Invoice (backport #28166)
 2021-11-08 17:15:29 +05:30
ahmadpak
8f52ebdd68 update(Print Format): Sales Invoice 
- KSA VAT Invoice
Customer Identification Number Added

(cherry picked from commit 8df50cf1e0)
 2021-11-08 09:58:38 +00:00
ahmadpak
1e08111da4 new (Print Format): KSA VAT Invoice 
(cherry picked from commit 2a5beec885)
 2021-11-08 09:58:38 +00:00
Subin Tom
902c03cd37 fix: Added company field, filtered account heads 2021-11-08 15:16:20 +05:30
Subin Tom
904010ab64 fix: Fixed customer address variable, sales invoice item field currency issue 2021-11-08 09:49:11 +05:30
Diksha Jadhav
6c45f8b2c4 feat: provision to have limited parameters for in-process quality inspection 2021-11-07 20:50:48 +05:30