Anurag Mishra
05c17a505c
fix: column sequence and add total
2019-06-13 16:08:01 +05:30
Rohit Waghchaure
033ed93586
fix: taxes are not overriding after changing the taxes template
2019-06-13 15:47:42 +05:30
Mangesh-Khairnar
b2f266ad10
fix: get bom item when company is not passed
2019-06-13 14:34:40 +05:30
Faris Ansari
00578ba632
fix: Show product page even if cart is not enabled
2019-06-13 13:30:39 +05:30
Rohit Waghchaure
02ae934d5c
feat: added cost center in the opening invoice creation tool
2019-06-13 12:00:30 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report
...
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
Mangesh-Khairnar
0a3ed374cd
test: validate tax based expense claim gl entries
2019-06-12 20:03:22 +05:30
Anurag Mishra
bbe2c4fb01
fix: fetch item on the base of item group
2019-06-12 19:09:51 +05:30
Mangesh-Khairnar
a1d354e147
feat: add grand total field
2019-06-12 18:18:38 +05:30
Rohan Bansal
ddea50fa22
fix(stock): Remove hardcoded validation for Item
2019-06-12 17:59:23 +05:30
Deepesh Garg
a3c0d2768e
Merge branch 'develop' into serial_no_batch_selector_develop
2019-06-12 17:21:23 +05:30
Shivam Mishra
d9aabb83cd
Merge branch 'develop' into lms-link-fix
2019-06-12 17:21:05 +05:30
Shivam Mishra
b94b1febee
refactor: topic card redirects to login
2019-06-12 17:20:33 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards
...
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
sahil28297
deef0908d7
Merge branch 'develop' into education-test-fixes
2019-06-12 16:59:58 +05:30
Shivam Mishra
147d5d9bf2
fix: redirect to lms home if query params not set
2019-06-12 16:01:02 +05:30
Deepesh Garg
9c3d2eeb1f
Merge branch 'develop' into serial_no_batch_selector_develop
2019-06-12 15:54:44 +05:30
Shivam Mishra
3264822c1c
test: fixed unknown column course_name
2019-06-12 15:43:36 +05:30
Shivam Mishra
44f98a9a4b
fix: back to course button
2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83
fix: card imqge not visible for courses
2019-06-12 15:16:26 +05:30
Shivam Mishra
278ef4bf73
fix: template fix for null_card
2019-06-12 14:53:00 +05:30
Shivam Mishra
a99d3a844f
test: fix fixtures for program and course
2019-06-12 14:32:27 +05:30
Mangesh-Khairnar
444313bdfc
feat: change the claim amount in expenses to amount
2019-06-12 12:52:02 +05:30
Shivam Mishra
28b2da7850
Merge branch 'develop' into lms-patch-4
2019-06-12 12:51:53 +05:30
Shivam Mishra
8df7e1c215
fix: templates for cards
2019-06-12 12:50:38 +05:30
Shivam Mishra
147cd1035e
Merge branch 'develop' into lms-patch-3
2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69
refactor: remove course name field from ProgramCourse
2019-06-12 12:43:22 +05:30
Shivam Mishra
490d2e0357
Merge branch 'develop' into lms-acad-fixes
2019-06-12 12:40:30 +05:30
Shivam Mishra
a9508862b2
refactor: doctype settings for lms
2019-06-12 12:39:12 +05:30
Saurabh
ccbf646a4d
Merge pull request #17904 from deepeshgarg007/patch_fix
...
fix(patch): Fix breaking patch on develop branch
2019-06-12 12:33:38 +05:30
Kenneth Sequeira
add002bb0f
fix: Make Travel Request Document Submittable ( #17874 )
...
* make travel request submittable
* add patch
* remove patch
2019-06-12 12:25:48 +05:30
deepeshgarg007
44ac3580d9
fix: Fix breaking patch on develop branch
2019-06-11 18:35:01 +05:30
Mangesh-Khairnar
ac9a4fe03c
feat: add tax and charges in expense claim
2019-06-11 14:25:44 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
...
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b
fix: requested changes
2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
...
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:15:43 +05:30
deepeshgarg007
9297829804
fix: Codacy
2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87
fix: Available qty not shown in item batch selector for batch
2019-06-10 17:46:16 +05:30
Deepesh Garg
ebeafa55ca
fix: Total Amount fix in journal entry ( #17880 )
2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9
fix(patch): escape illegal characters to avoid SQL syntax error ( #17890 )
2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48
fix: GSTR-1 Report fixes ( #17885 )
2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop
...
fix: set COGS for material issue only
2019-06-10 16:57:23 +05:30
Himanshu Warekar
874326dc7b
patch: set apply_to as customer
2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718
Merge develop into sla_fix
2019-06-10 12:32:45 +05:30
Himanshu Warekar
0b36d324ee
fix: display depends for apply_to in sla
2019-06-10 11:36:51 +05:30
Himanshu Warekar
65e0ae2171
test: new test cases for sla
2019-06-10 11:24:24 +05:30
Shivam Mishra
9510e69910
fix (lms): null cards visible on xs
2019-06-10 10:53:25 +05:30
Himanshu Warekar
88becdd869
test: test cases for sla with apply_to
2019-06-09 19:33:55 +05:30
Himanshu Warekar
0674d16fee
feat: sla based on customer/group/territory
2019-06-07 15:28:42 +05:30
Rohit Waghchaure
9a792c2eed
stock_entry: set COGS for material issue only
2019-06-07 15:20:36 +05:30
Shivam Mishra
449f261128
feat: show signup dialog for Guest
2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee
fix: link typo
2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc
fix: lms card hero image no visible
2019-06-07 13:34:41 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop
...
fix: Not able to save salary slip
2019-06-07 12:58:25 +05:30
Rohit Waghchaure
72264697be
fix: Not able to save salary slip
2019-06-07 11:46:27 +05:30
rohitwaghchaure
74f502cfa6
Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items
...
feat: provision to set multiple manufacturer against the item
2019-06-07 10:24:53 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Himanshu
c4366c9357
Merge branch 'develop' into qmsystem
2019-06-06 19:04:48 +05:30
Anurag Mishra
fd19678bc7
fix: show cost center in print fromat of report trial balance
2019-06-06 18:37:10 +05:30
Anurag Mishra
4ca393d14c
fix: renamed report BOM item scraps into BOM Explorer ( #17869 )
2019-06-06 18:05:08 +05:30
Anurag Mishra
4992fc98dd
Merge branch 'develop' into qmsystem
2019-06-06 17:25:39 +05:30
Shivam Mishra
d49b5e4736
fix: sql query case fix
2019-06-06 17:19:53 +05:30
Himanshu
b57b4a7199
Merge branch 'develop' into qmsystem
2019-06-06 16:42:53 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor
...
refactor: lms
2019-06-06 16:32:17 +05:30
Shivam Mishra
2a0483dee3
refactor: styling cards and article
2019-06-06 16:02:38 +05:30
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem
2019-06-06 15:37:04 +05:30
Shivam Mishra
6132c8527b
refactor: all programs are shown on home by deafult
2019-06-06 14:19:36 +05:30
Himanshu Warekar
db1d1197ea
feat: add fixtures
2019-06-06 14:17:07 +05:30
Shivam Mishra
098b8324f2
refactor: remove erpnext.com link
2019-06-06 14:14:17 +05:30
Himanshu Warekar
ab97cd4db1
feat: dashboards
2019-06-06 14:13:10 +05:30
Shivam Mishra
b31276572b
refactor: styling changes
2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b
fix: minor bugs
2019-06-06 14:02:49 +05:30
Himanshu Warekar
b114d9f621
test: fix test case
2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267
[Add] GSTIN filters in hsn wise summary and itemised reports
2019-06-06 12:08:09 +05:30
Himanshu Warekar
b318b83bb7
patch: fixes
2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124
patch: fixes
2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6
patch: add priority in service level and agreement
2019-06-06 11:49:15 +05:30
Shivam Mishra
624b4fd5b8
refactor: better sql
2019-06-06 11:30:56 +05:30
Himanshu Warekar
b9c24a01da
patch: reload_doc before inserting values
2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249
patch: set priorities for issue
2019-06-06 10:58:42 +05:30
Himanshu Warekar
e119a713fd
Merge develop into sla_fix
2019-06-06 10:46:36 +05:30
Saurabh
6179130a54
Merge pull request #17861 from frappe/clarkejj-patch-1
...
fix: Update demo.html
2019-06-06 10:37:48 +05:30
Aditya Hase
29e77ccc00
fix(error-report): Do not send error reports to support@erpnext.com
2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d
Update demo.html
...
fix typo nit in page
2019-06-05 10:49:47 -06:00
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print ( #17860 )
2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05
fix(attendance): fetch employee name ( #17857 )
2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46
fix: NoneType fixes in Lab test ( #17858 )
2019-06-05 20:23:23 +05:30
Shivam Mishra
f121b51951
fix: import _ in porgram.py
2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa
feat: added topic page
2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe
chore: remove old lms files
2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0
fix: minor ui fixes
2019-06-05 18:16:09 +05:30
Shivam Mishra
9cad9439a1
fix: travis fixes for education setup
2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95
refactor: minor fixes
2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27
chore: added session check for profile page
2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede
feat: added student profile page
2019-06-05 17:29:48 +05:30
Rohan
bd9abc15b5
fix(projects): Remove hardcode of expected end date for new Tasks ( #17717 )
2019-06-05 14:17:29 +05:30
Himanshu Warekar
b903da6bfd
fix: remove priorities list
2019-06-05 13:42:03 +05:30
Shivam Mishra
6593263df8
feat: added navigation
2019-06-05 13:34:44 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component ( #17852 )
2019-06-05 13:20:08 +05:30
Shivam Mishra
570161b978
feat: added course progress apis
2019-06-05 13:08:53 +05:30
Aditya Hase
811bed32c1
fix(naming): Limit number of docs to be renamed to 50000 per doctype ( #17827 )
...
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error
This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Himanshu
4cb1a1e2e3
fix: set task weight from onboarding template ( #17840 )
2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
da2e009990
fix(payment-order): filter already created payment entries ( #17843 )
2019-06-05 10:22:05 +05:30
deepeshgarg007
a87c545907
fix: Remove support analytics report
2019-06-05 09:07:42 +05:30
deepeshgarg007
1831844fcf
fix: Dashboard for cost center
2019-06-03 21:53:58 +05:30
Himanshu Warekar
68ed272bfa
feat: show priorities listed in sla in issue
2019-06-03 18:59:55 +05:30
Rohit Waghchaure
8309582cca
fix: report Payment Period Based On Invoice Date not working
2019-06-03 18:23:54 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
...
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Shivam Mishra
6d4c666476
feat: added topic progress api
2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae
feat: added auto course enrollment for enrolled programs
2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop
...
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
...
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934
fix: Pass delivery document no as empty string
2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b
refactor: refactored quiz api and added quiz.js
2019-06-03 12:57:38 +05:30
deepeshgarg007
853a561f11
fix: Serial no filtering issue for delivered items
2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413
fix: codacy
2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c
fix: codacy
2019-06-02 19:46:44 +05:30
deepeshgarg007
290847df46
fix: Fixes in accounting doctype dashboards
2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1
fix: Remove diemnsion from value list if present
2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a
fix: Resolve merge conflicts in purchase_receipt_item
2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785
fix: Update function name
2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-06-01 22:57:51 +05:30
Faris Ansari
b8eaa3d377
fix: Issue list portal styling
2019-06-01 20:56:37 +05:30
Saurabh
011fe48ec3
Merge pull request #17823 from abhijitkumbharInd/develop
...
fix: Vehicle Master - Last carbon check accepting future date.(#17821 )
2019-05-31 14:26:08 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
...
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
b6028b0495
Merge pull request #17809 from Alchez/develop-sales-analytics-total
...
fix(selling): Remove Totals row for Sales Analytics
2019-05-31 14:21:01 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev
...
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
abhijitkumbharIND
39d6cf38fc
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
Rohit Waghchaure
e98d1c1147
fix: allow import for packing slip
2019-05-31 14:16:11 +05:30
Deepesh Garg
bd3c60254a
Merge pull request #17819 from deepeshgarg007/module
...
fix: Add chart of accounts importer in data import module
2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
...
fix: POS cash mode of payment css
2019-05-31 12:29:19 +05:30
Rohit Waghchaure
840244c562
fix: pricing rule is applying on the incorrect item
2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c
fix: Add chart of accounts importer in data import module
2019-05-31 10:11:46 +05:30
Rohit Waghchaure
4fd704dbb6
fix: POS cash mode of payment css
2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b
fix: Label translations
2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70
fix: Add translations for missing labels in AR report
2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d
fix: pricing rule not exists issue
2019-05-30 22:24:24 +05:30
deepeshgarg007
2580075583
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-30 22:11:27 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
Shivam Mishra
46b3446da0
refactor: add check for max passing score
2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5
refactor: added question type field
2019-05-30 18:54:58 +05:30
Shivam Mishra
253a2bd260
refactor: goodbye Vue 👋
2019-05-30 18:54:11 +05:30
Shivam Mishra
e94e9d2b06
feat: content navigation and activity tracking working
2019-05-30 18:23:03 +05:30
Nabin Hait
0e1e37c921
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-30 18:13:41 +05:30
Shivam Mishra
3336fb595c
style: removed console.logs
2019-05-30 18:04:36 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Nabin Hait
b6ffaf11fe
Merge pull request #17787 from nabinhait/naming-series-chars
...
fix: Allowed '{' and '}' in naming series
2019-05-30 17:25:08 +05:30
Nabin Hait
1bb3fc3c19
Merge pull request #17789 from sunnyakaxd/patch-2
...
fix: Dont fetch all orders to update a few
2019-05-30 17:24:49 +05:30
Shivam Mishra
12579617f3
refactor: added enrolled status to program card
2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc
feat: enabled per student access
2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000
refactor: style changes and template refactor
2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1
refactor: added enrollment api
2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b
refactor: added program card macro
2019-05-30 16:34:53 +05:30
Nabin Hait
d060890817
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 16:05:30 +05:30
Deepesh Garg
af32ed6d8f
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
...
feat: Product Bundle Balance Report
2019-05-30 15:58:25 +05:30
Saurabh
2b40a44429
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
...
feat: Updated translation
2019-05-30 15:56:45 +05:30
Nabin Hait
4d58734492
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 15:51:29 +05:30
Saif Ur Rehman
7129231dbb
fix(Product Bundle Balance): Update frappe.db.escape for v12
2019-05-30 13:55:32 +05:00
Anurag Mishra
62d58acea9
fix: Added description if item variants does not have description in map(v12) ( #17796 )
...
* fix: variant item description based on attribute
* style: removed unwanted changes
2019-05-30 14:04:08 +05:30
frappe
5aeb62f288
feat: Updated translation
2019-05-30 08:17:59 +00:00
deepeshgarg007
a9b2e4e4a8
fix: White space in subscription plan dashboard
2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754
fix: Tax category dashboard
2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596
fix: Dashboards for doctypes in accounting modules
2019-05-30 11:53:12 +05:30
Himanshu Warekar
70a2734aab
fix: config file for qms
2019-05-30 01:40:31 +05:30
Shivam Mishra
f927502cc5
refactor: added lms utilities for enrollment and program list
2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e
refactor: cards and hero markup
2019-05-29 18:38:58 +05:30
Shivam Mishra
08425d46fa
refactor: set Student as default portal role for Education
2019-05-29 18:37:52 +05:30
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance
2019-05-29 18:23:21 +05:30
Shivam Mishra
63d8cabb3d
fix: program card height bug
2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7
refactor: /lms redirects to home if lms is disbaled
2019-05-29 15:15:59 +05:30
Shivam Mishra
65681bf317
refactor: allow disbaling self enroll on lms
2019-05-29 15:15:30 +05:30
Himanshu Mishra
70029b818b
Update status_updater.py
2019-05-29 14:19:35 +05:30
Nabin Hait
f1cde0ccf6
fix: Allowed '{' and '}' in naming series
2019-05-29 13:44:03 +05:30
Shivam Mishra
16f3b713bc
Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor
2019-05-29 13:14:50 +05:30
Shivam Mishra
ae2871f962
feat: content not visible to guest users
2019-05-29 13:11:34 +05:30
Himanshu Warekar
38ed090bf8
test: fix test case
2019-05-29 00:16:04 +05:30
Himanshu Warekar
775e9e423a
refactor: QMS refactor initial bringup
2019-05-29 00:05:58 +05:30
Himanshu Warekar
8240f48a8e
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-28 23:40:57 +05:30
Himanshu Warekar
beba79c420
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-05-28 23:40:43 +05:30
Himanshu Warekar
da91cfe1e2
fix: set default priority on sla change
2019-05-28 23:38:43 +05:30
deepeshgarg007
c97c7c51a9
fix: Test cases for accounting dimension
2019-05-28 18:51:10 +05:30
Faris Ansari
da2c742cea
Merge branch 'develop' into request_to_quatation_fix
2019-05-28 18:28:13 +05:30
Faris Ansari
dd016479af
fix: Remove print statement
2019-05-28 18:27:22 +05:30
Anurag Mishra
5afe9f2200
fix: changed dialog field to select
2019-05-28 18:23:34 +05:30
deepeshgarg007
233b88dc52
fix: Test case fixes
2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
Nabin Hait
e7b8400fc7
Merge pull request #17696 from Anurag810/warehouse_type
...
feat: Added Warehouse Type master
2019-05-28 17:25:13 +05:30
deepeshgarg007
e025aabef0
fix: Indentation fixes
2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4
fix: Remove print statements
2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b
fix: Is group filter for dimensions for doctype
2019-05-28 12:13:53 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Himanshu
6f08866640
Merge branch 'develop' into sla_fix
2019-05-28 11:54:30 +05:30
Himanshu Warekar
fee2fee83a
fix: test cases
2019-05-28 11:47:51 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
...
fix: Tax calculation on salary slip
2019-05-28 11:16:31 +05:30
Anurag Mishra
a69f72988a
fix: requested filters changes
2019-05-28 11:08:14 +05:30
Himanshu Warekar
c7170f80ce
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-28 00:02:54 +05:30
Himanshu Warekar
24f8310ece
fix: test cases
2019-05-28 00:01:55 +05:30
Nabin Hait
351e9983cf
Merge pull request #17389 from mujeerhashmi/develop
...
feat: Student Group with Student Category filter
2019-05-27 19:14:31 +05:30
Nabin Hait
9813897ec3
Merge pull request #17759 from saurabh6790/custom_field_fix
...
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:39 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Nabin Hait
7f375d209c
fix: Tax calculation on salary slip
2019-05-27 18:42:53 +05:30
Anurag Mishra
32c23ae274
fix: added read write permission to stock manager
2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea
fix: added permission and fix filters in stock balance report
2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0
feat: added warehouse type master
2019-05-27 18:37:04 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress
...
fix(UX): Upload Attendance
2019-05-27 17:17:03 +05:30
Nabin Hait
e662be7508
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
...
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
4f549cc196
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 17:16:03 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-27 14:00:43 +05:30
Nabin Hait
39490ca0c5
Merge branch 'develop' into sla_fix
2019-05-27 13:59:56 +05:30
Mitchy25
a8f6938556
Fix: Precision in Appraisals ( #17673 )
...
* Update appraisal.js
This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.
* fix: score based on field's precisin
2019-05-27 13:57:56 +05:30
Nabin Hait
235332d4ab
Merge branch 'develop' into lms-refactor
2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50
fix: GSTR-1 Report B2B fixes ( #17751 )
...
* fix: GSTR-1 Report fixes
* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c
fix: holidays was showing on same date in calendar view ( #17754 )
2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
Himanshu Warekar
6feb12d333
fix: miscellaneous fixes
2019-05-26 00:03:40 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress
2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61
fix(minor): after manual testing
2019-05-24 11:22:31 +05:30
Faris Ansari
513bfc26d2
Merge branch 'develop' into upload-attendance-progress
2019-05-23 20:04:16 +05:30
Nabin Hait
d8496a770a
fix: validate expense account for opening stock reco
2019-05-23 15:32:55 +05:30
rohitwaghchaure
0c2e3c77a3
fix: range 4 for ageing filter added in the AP/AR report ( #17715 )
2019-05-23 15:27:47 +05:30
rohitwaghchaure
fd4815da53
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12
...
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-23 15:04:43 +05:30