Commit Graph

33962 Commits

Author SHA1 Message Date
marination
d6277cdc7f feat: Value Based and Numeric Quality Inspection
- Acceptance Formula is optional
- Choose between Value based and Numeric QI
- If numeric, select single or multiple readings
- Added Min, Max and Mean Values for numeric inspection to avoid formula usage
- Deprecated code cleanup in js file
2020-12-18 21:37:19 +05:30
Ganga Manoj
89a02d7d3f feat: Changed Fiscal Year to Payroll Period 2020-12-18 15:31:45 +05:30
Afshan
a81519f557 fix: error popup for submitted doc 2020-12-18 11:16:01 +05:30
Rushabh Mehta
6afa83f2c7 fix(requirements): update to latest pandas 2020-12-18 11:05:55 +05:30
Ganga Manoj
9f1e018e4f feat: Compute year_to_date 2020-12-18 01:35:27 +05:30
Ganga Manoj
04f48a011d feat: Add year_to_date field 2020-12-18 01:31:00 +05:30
pateljannat
b8e656512e fix: test cleanup 2020-12-17 20:22:06 +05:30
Deepesh Garg
d4ee05c5fb
Merge pull request #24172 from deepeshgarg007/ttax_category_typo
fix: Typo in tax category doctype query
2020-12-17 18:48:03 +05:30
Deepesh Garg
b074334dcf fix: Typo in tax category doctype query 2020-12-17 18:46:59 +05:30
pateljannat
79b71462cb fix: patch 2020-12-17 18:21:34 +05:30
Deepesh Garg
5a06908bbc fix: Add breadccrumbs to item group page 2020-12-17 17:38:53 +05:30
pateljannat
09f0e9111d fix: patch 2020-12-17 17:20:21 +05:30
Anurag Mishra
611b42733b fix: leave policy dashboard fix and roles 2020-12-17 16:34:15 +05:30
Anurag Mishra
5e8e0037d6
Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop 2020-12-17 16:01:42 +05:30
Anurag Mishra
7e641f457c
Merge pull request #24166 from scmmishra/appointment-fix
fix: wrap assignees in a list
2020-12-17 16:00:48 +05:30
pateljannat
2dbb1d6bc7 fix: indentation 2020-12-17 15:49:52 +05:30
Shivam Mishra
1872e2c1ac fix: wrap assignees in a list 2020-12-17 14:29:52 +05:30
Deepesh Garg
5432ee3364
Merge pull request #24095 from frappe/skr04_equity_dev
feat: separate equity tree in CoA SKR04
2020-12-17 12:37:28 +05:30
pateljannat
2f4c88b228 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220 fix: patch relaod doctype 2020-12-17 11:54:59 +05:30
Rucha Mahabal
f1854f9196
Merge branch 'develop' into fix-therapy-type-filter 2020-12-17 08:46:39 +05:30
Rohit Waghchaure
c9f63accdd fix: do not manufacture same serial no multiple times 2020-12-17 00:18:17 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks 2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription (#24158) 2020-12-16 19:39:34 +05:30
pateljannat
2528d5ee15 fix: tests 2020-12-16 18:29:49 +05:30
Rucha Mahabal
23d6afe43a
fix: Auto Repeat Import (#24157) 2020-12-16 18:21:08 +05:30
Prssanna Desai
df2067003e
Merge pull request #24154 from prssanna/job-card-gantt-v13 2020-12-16 17:01:43 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13 2020-12-16 16:59:50 +05:30
prssanna
ff59f18012 fix: override field_map for job card gantt 2020-12-16 16:56:30 +05:30
pateljannat
d44f45c57b fix: sider issues 2020-12-16 16:28:09 +05:30
hasnain2808@gmail.com
2da0035a0f Merge branch 'develop' into fix-analytics-reports 2020-12-16 16:14:23 +05:30
Rucha Mahabal
f2a431d866 fix: filter Therapy Types and Therapy Plan in Patient Appointment 2020-12-16 16:09:58 +05:30
Rucha Mahabal
5a8a52b9c6 fix: Therapy Type and Therapy Plan field visibility in Patient Appointment 2020-12-16 15:54:06 +05:30
Deepesh Garg
924f99bead fix: Help message 2020-12-16 15:42:50 +05:30
Deepesh Garg
4638f604ed Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-16 14:59:30 +05:30
Rucha Mahabal
b184d43e75
refactor: Auto Repeat next schedule date function params (#23959)
* refactor: Auto Repeat next schedule date function params

* refactor: Auto Repeat next schedule date function params
2020-12-16 14:51:42 +05:30
hasnain2808@gmail.com
9962ba86d0 fix: charts not displaying when tree_type changed 2020-12-16 14:41:04 +05:30
pateljannat
87b477a311 feat: patch for project template tasks 2020-12-16 13:37:21 +05:30
Deepesh Garg
bc462fa140
Merge pull request #24146 from deepeshgarg007/tax_template_update_customer
fix: Tax template update on customer address change
2020-12-16 13:02:00 +05:30
Deepesh Garg
96a5e4effa fix: Tax template update on customer address change 2020-12-16 13:00:55 +05:30
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added (#24126) 2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan
c553453825
fix: user is not a field (#24129) 2020-12-15 16:29:10 +05:30
pateljannat
a6fef7ae6b feat: parent-child relation tasks 2020-12-15 11:50:18 +05:30
pateljannat
caf67e608f fix: tests 2020-12-15 10:00:31 +05:30
pateljannat
23f0debf88 fix: tests 2020-12-15 10:00:21 +05:30
Raffael Meyer
f2206c27e7
fix: allow other github links in same PR (#23995) 2020-12-15 09:35:16 +05:30
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount (#24119) 2020-12-15 09:32:02 +05:30
Afshan
89d14fdf68
fix: minor ui changes (#24125)
* fix: minor ui changes

* fix: slider
2020-12-15 09:31:30 +05:30
Afshan
58e8e06ab7
fix: retention filters (#24123)
* fix: retention filters

* fix: slider
2020-12-15 09:17:17 +05:30
Afshan
e64718b2ae
fix: selecting salary component (#24121) 2020-12-15 09:16:27 +05:30