nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 12:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,941 Commits 438 Branches 1,737 Tags
e57f53e7719b1a39f0e78bf8504075d72fec6aaa
Commit Graph

37941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sagar Sharma
bb3957eba3 fix: auto update price list rate (#28255) 
* fix: auto update price list rate

* fix: hide field when auto insert isn't enabled
 2021-11-07 17:18:00 +05:30
mergify[bot]
4cb3c2a46c feat: replace newline in remarks (DATEV report) (#28152) (#28247) 
(cherry picked from commit 114028e473)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-11-05 11:15:31 +05:30
fatihustaoglu
95a5ef1d41 fix: Bulk update of valid upto field wasn't working (#28242) 
* fix: Bulk update of valid upto field wasn't working

Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.

* chore: extend fix and cleanup whitespace

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-04 11:27:56 +05:30
Saqib
73e9e991cc fix(e-invoicing): link to error log list 2021-11-03 17:49:50 +05:30
Saqib
1ba2a47761 Merge pull request #28220 from frappe/mergify/bp/version-13-hotfix/pr-27946 
fix(Payment Entry): splitting outstanding rows as per payment terms (backport #27946)
 2021-11-03 15:41:02 +05:30
Anuja Pawar
fa24b9842b fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 
(cherry picked from commit d72709dd81)
 2021-11-03 09:18:12 +00:00
Ankush Menat
72a050fb0b fix: ignore unsupported methods while resyncing (#28210) 2021-11-02 23:05:14 +05:30
Deepesh Garg
2a1695c7de Merge pull request #28206 from frappe/mergify/bp/version-13-hotfix/pr-28205 
fix: Error on LDC creation (backport #28205)
 2021-11-02 20:29:31 +05:30
Deepesh Garg
35c5822115 fix: Error on LDC creation 
(cherry picked from commit 66348e1a03)
 2021-11-02 14:58:30 +00:00
Marica
df6465d715 Merge pull request #28203 from frappe/mergify/bp/version-13-hotfix/pr-28202 
fix: Serial Nos not set in the row after scanning in popup (backport #28202)
 2021-11-02 20:25:59 +05:30
marination
4262682080 fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57deec)
 2021-11-02 14:48:14 +00:00
mergify[bot]
4bdde5f706 fix: replaced "=" with "in" for multiple statuses in query #28193 (#28199) 
fix: replaced "=" with "in" for multiple statuses in query
(cherry picked from commit 857d87da97)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-02 18:20:49 +05:30
mergify[bot]
0a608911f1 fix(Payment Reconciliation): clear child tables on company/party change (#28153) 2021-11-02 17:10:27 +05:30
Marica
27570db761 Merge pull request #28197 from frappe/mergify/bp/version-13-hotfix/pr-28195 
fix: (ux) Remove warehouse filter on Batch field for Material Receipt (backport #28195)
 2021-11-02 16:27:18 +05:30
marination
68646c5756 chore: Add comment above fix for future reference 
(cherry picked from commit 48886ee705)
 2021-11-02 10:40:41 +00:00
marination
189595b4f7 fix: Remove warehouse filter on Batch field for Material Receipt 
(cherry picked from commit 048210a8f6)
 2021-11-02 10:40:40 +00:00