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
40,943 Commits 424 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Vora
442177aeee fix: specify fields to be set in Lead (#28289) 2021-11-09 16:05:03 +05:30
Diksha Jadhav
bb9713a7b2 refactor: use fetch from property for qi template on job card 
(cherry picked from commit 467324c87f)
 2021-11-09 10:23:00 +00:00
Diksha Jadhav
ac54e80856 feat: provision to have limited parameters for in-process quality inspection 
(cherry picked from commit 6c45f8b2c4)
 2021-11-09 10:22:59 +00:00
Diksha Jadhav
3c78ac21d9 feat(manufacturing): add link field for quality inspection template on operation 
(cherry picked from commit 281a9cc749)
 2021-11-09 10:22:58 +00:00
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
Anupam
515b8dd8ca fix: get_planned_qty chnages 
(cherry picked from commit 663a7afe4d)
 2021-11-09 10:16:26 +00:00
Anupam
dac0d87e16 fix: test cases 
(cherry picked from commit 27709a1c71)
 2021-11-09 10:16:25 +00:00
Anupam
365572f5ea fix: testcases: 
(cherry picked from commit 7044ae5e39)
 2021-11-09 10:16:25 +00:00
Anupam
029e66709d fix: linter isuue 
(cherry picked from commit cc15cf6ae2)
 2021-11-09 10:16:24 +00:00
Anupam
8851b7adcf fix: sider isuue 
(cherry picked from commit ba47bd02b6)
 2021-11-09 10:16:24 +00:00
Anupam
116210dcea fix: validate job card 
(cherry picked from commit 9b4c7e4796)
 2021-11-09 10:16:23 +00:00
Anupam
dce943b41f fix: test cases 
(cherry picked from commit 9c0906f1b5)
 2021-11-09 10:16:23 +00:00
Anupam
cb209d9b57 fix: linter issues 
(cherry picked from commit e36da4d137)
 2021-11-09 10:16:23 +00:00
Anupam
7c7493c91d fix: linter issues 
(cherry picked from commit 59e4fd980c)
 2021-11-09 10:16:22 +00:00
Anupam
f3da88e301 fix: added testcase 
(cherry picked from commit 530a0f481e)
 2021-11-09 10:16:22 +00:00
Anupam
8ddeb83191 fix: sider issue 
(cherry picked from commit 264b0df9ff)
 2021-11-09 10:16:21 +00:00
Anupam
47f8f3d9dd fix: sider issue 
(cherry picked from commit 55e97dce8a)
 2021-11-09 10:16:20 +00:00
Anupam
44c53deb90 fix: sider issue 
(cherry picked from commit e290fe0721)
 2021-11-09 10:16:20 +00:00
Anupam
d43aecbe13 feat: added confirm dialog on closing of workorder 
(cherry picked from commit 5d4c5652af)
 2021-11-09 10:16:19 +00:00
Anupam
e8ef54f4d7 feat: provision to close the Work Order 
(cherry picked from commit 23af036894)
 2021-11-09 10:16:18 +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]
eacf26d618 fix: show full item name in search widget (#28283) (#28285) 
(cherry picked from commit 34f5283c17)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-09 12:14:54 +05:30
mergify[bot]
40b5bb1d15 fix: do not generate multiple invoices (#28216) 2021-11-08 20:07:57 +05:30
mergify[bot]
5d249016c3 fix: do not generate multiple invoices (#28215) 2021-11-08 20:07:47 +05:30
Deepesh Garg
5d46f765a6 Merge pull request #28276 from frappe/mergify/bp/version-13-pre-release/pr-28262 
fix: Taxjar customer_address fix, currency fix (backport #28262)
 2021-11-08 19:04:06 +05:30
Deepesh Garg
2654098ce2 Merge pull request #28274 from frappe/mergify/bp/version-13-pre-release/pr-28272 
fix: KSA VAT setup issues (backport #28272)
 2021-11-08 18:52:20 +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
Subin Tom
a403200516 fix: company condition fix, added company field 
(cherry picked from commit 7ad2717acc)
 2021-11-08 13:12:00 +00:00
Subin Tom
1dc7cb8ad1 fix: fixed company field, updated patch 
(cherry picked from commit 7f2d304f32)
 2021-11-08 13:12:00 +00:00
Subin Tom
abe6ef4cd4 fix: Added company field, filtered account heads 
(cherry picked from commit 902c03cd37)
 2021-11-08 13:12:00 +00:00
Subin Tom
3d1b833f35 fix: Fixed customer address variable, sales invoice item field currency issue 
(cherry picked from commit 904010ab64)
 2021-11-08 13:11:59 +00:00