Himanshu
6343a697a2
fix(Salary Slip): Consider Leave without Pay for calculation ( #16926 )
...
while net salary calculation, it was not considering actual days worked but now it will consider it
2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status
...
fix: Task overdue status propagates to project
2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status
...
fix: task overdue status propagates to project
2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe
fix(Salary Slip): Consider Leave without Pay for calculation ( #17023 )
...
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
2019-03-29 18:32:23 +05:30
Rushabh Mehta
c4599c21c3
fix(test): item variant
2019-03-29 18:30:00 +05:30
Nabin Hait
92797eee87
Merge pull request #17052 from deepeshgarg007/patch-fix
...
fix: Add patch to move item tax to item tax template
2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0
Merge pull request #17045 from rmehta/fix-sla-auto-update
...
fix(sla): update agreement status on save'
2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca
fix: get credit and debit as float and not string
2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379
fix: get credit and debit in float and not string
2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e
fix: fetch account only if available
2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition
2019-03-29 16:06:38 +05:30
Rushabh Mehta
048e5f44b5
fix(test): item variant
2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716
Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12
...
fix: POS items not loading
2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13
Merge branch 'deferred_revenue' into hotfix
2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700
fix(accounts): Indentation
2019-03-29 13:25:11 +05:30
scmmishra
2b7e158e50
feat: Quiz attempt limits is configurable
...
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue
...
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30
deepeshgarg007
4f1926bcfe
fix: Add patch to move item tax to item tax template
2019-03-29 12:10:44 +05:30
scmmishra
d4ed56af02
fix: navbar login bug
2019-03-29 11:03:34 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue
...
fix: accounts receivable summary
2019-03-29 09:28:21 +05:30
Rohit Waghchaure
9da14747aa
fix: accounts receivable summary
2019-03-29 09:26:40 +05:30
Rohit Waghchaure
573d1dd31f
fix: bank reconciliation not working
2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7
fix(accounts): codacy fixes
2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6
Refactored deferred revenue booking logic
2019-03-28 19:43:02 +05:30
Rushabh Mehta
cf33f4fd53
fix(sla): update agreement status on save'
2019-03-28 18:49:23 +05:30
Rohit Waghchaure
d5e45481cd
fix: code cleanup
2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
...
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:51:57 +05:30
Faris Ansari
f04988a02f
fix: Missing "and" in filter conditions
2019-03-28 15:42:07 +05:30
scmmishra
cea851522f
feat: Added custom navbar
2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251
fix: styled program card
2019-03-28 15:32:54 +05:30
Suraj Shetty
6262c9ed6a
fix: Subquery in get_bom_items method
2019-03-28 14:59:27 +05:30
scmmishra
9b7ac3e7d2
fix: fixed joining date bug on lms profile
2019-03-28 14:47:22 +05:30
scmmishra
281902f530
chore: clean up
2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf
chore: Minor fixes on profile page
2019-03-28 14:34:23 +05:30
scmmishra
209250ccae
fix: Profile page cards
...
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2
fix: layout for hero image of program card
2019-03-28 14:15:30 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Saurabh
f2036dd1d1
bumped to version 11.1.17
2019-03-28 14:21:58 +06:00
scmmishra
29aaee1488
feat: Added youtube video component
2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7
feat: refactored YoutubePlayer component
2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b
fix: Video stops on closing modal
2019-03-28 13:11:00 +05:30
scmmishra
526af9d268
feat: added Youtube Video component
2019-03-28 13:10:42 +05:30
Saurabh
1271dea39b
Merge pull request #17035 from gaurav-naik/issue-17033
...
fix(regional,italy): autoset tax id, cf from customer before validating
2019-03-28 12:46:24 +05:30
rohitwaghchaure
89a2577ae5
Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview
...
fix(print): Fix group same items for print view
2019-03-28 12:42:22 +05:30
scmmishra
9bfe3a0315
feat: Added Program Intro Video modal
2019-03-28 12:20:24 +05:30
Gaurav
bd80fd13cb
fix(regional,italy): autoset company cf, tax_id before validating
2019-03-28 12:18:03 +05:30
Saurabh
ea19250884
Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml
...
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-28 11:19:44 +05:30
Faris Ansari
8fdcda7d6d
Merge pull request #16411 from adityahase/dashboard
...
feat: Accounting Dashboard
2019-03-28 11:16:41 +05:30
Gaurav
010acf75fa
fix(regional,italy): autoset tax id, cf from customer before validating missing values
...
Fixes issue #17033
2019-03-28 10:42:29 +05:30
Himanshu
4d45ca08de
fix(Issue): Time left and display only if Agreement exists ( #17014 )
...
* fix: time left and display only if agreement
* fix: remove div if present
* code refactor
* use frappe.scrub
* code formatting
Co-Authored-By: hrwX <himanshuwarekar@yahoo.com>
* remove unused fields
* remove unsed return value
2019-03-28 07:24:54 +05:30
Suraj Shetty
a7992ecb62
style: Fix formatting
2019-03-27 20:32:42 +05:30
Suraj Shetty
abc2a64d5e
fix: Commonify get gl_entry code by moving it to accounts_controller
2019-03-27 20:25:18 +05:30
scmmishra
233db67451
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-03-27 18:27:05 +05:30
scmmishra
f04ceaec95
chore: removed commented code
2019-03-27 18:14:59 +05:30
scmmishra
5b57d977d8
fix: single primary action on LMS home
2019-03-27 18:14:41 +05:30
scmmishra
3d39b88e7c
feat: LMS now supports multiple correct choice questions
2019-03-27 18:01:14 +05:30
Sagar Vora
d20ecb0a71
fix(accounts): dependent field should be displayed after source link field
2019-03-27 17:42:42 +05:30
Rohit Waghchaure
1b7059b867
fix: ImponibileImporto calculation
2019-03-27 15:33:47 +05:30
scmmishra
1b63c87929
feat: refactored update status
2019-03-27 15:04:55 +05:30
scmmishra
2405e14dde
Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status
2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb
feat: refactored update status
2019-03-27 15:01:40 +05:30
Himanshu Warekar
a86f3a7d80
remove issue credit note
2019-03-27 10:01:18 +05:30
rohitwaghchaure
fa638443bc
Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements
...
feat: stock entry enhancements
2019-03-26 22:50:54 +05:30
rohitwaghchaure
4510e3a836
Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making
...
fix: offline pos, duplicate records creating
2019-03-26 22:49:42 +05:30
Himanshu
e43b6beff0
fix(Leave Balance Report): total allocated leaves not calculated properly ( #16969 )
...
* fix: total alloted leaves not calculated properly
* fix: Possible SQL injection
* typo fix in sql query
* prevent sql injection again ?
* Use ORM for query
2019-03-26 21:42:12 +05:30
Himanshu Warekar
1b05ed042f
Cost Center as per company
2019-03-26 20:25:54 +05:30
Rohit Waghchaure
22ebaf1b11
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-26 20:19:46 +05:30
Rohit Waghchaure
1df62097f6
fix: offline pos, duplicate records creating
2019-03-26 19:15:53 +05:30
Prateeksha Singh
6d2bb9126a
Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom
...
fix(uom): Get items as per UOM defined in BOM
2019-03-26 18:00:50 +05:30
Nabin Hait
411f66a177
Merge pull request #17006 from deepeshgarg007/account-fix
...
fix: Ignore root company validation setting in company master
2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0
fix: Change name to Allow Account Creation against Child Company in company master
2019-03-26 17:18:06 +05:30
Prateeksha Singh
a0927c1ba6
fix: correct use of include_item_in_manufacturing
2019-03-26 16:55:13 +05:30
Nabin Hait
8aaee57921
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-26 16:53:13 +05:30
Anurag Mishra
10c1db1b28
fix: removed empty row on getting invoices
2019-03-26 16:30:31 +05:30
rohitwaghchaure
e196b3120e
Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise
...
feat: Stock ageing report warehouse wise
2019-03-26 16:21:17 +05:30
Anurag Mishra
ca4117e652
feat: seting status and indicators on list view
2019-03-26 16:03:00 +05:30
Anurag Mishra
702c6e00da
fix: route on loan Disbursement and Closing
2019-03-26 16:00:43 +05:30
deepeshgarg007
c45c2bdabb
fix: Missing semicolon
2019-03-26 15:38:38 +05:30
deepeshgarg007
7aefc15352
fix: Allow to add child account if ignore validation checked
2019-03-26 15:09:29 +05:30
Anurag Mishra
78903b1e57
fix: test for invoice payment by setting default Bank Account
2019-03-26 12:59:30 +05:30
Rohit Waghchaure
5816fc2801
Renamed subcontract to Send to Subcontractor
2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428
renamed purpose in stock entry
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433
feat: added button get items from material request in stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706
Added test cases
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087
feat: added good in transit feature in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360
feat: added stock entry type master to select purpose in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
327c194144
Added hsn code field in the stock entry item table
2019-03-26 12:52:08 +05:30
Raffael Meyer
fdbb516a1b
fix(projects): Auto-set employee and company in Timesheet ( #16743 )
...
* fix(projects): auto-set employee and company
* only set employee and company if document is unsaved
* use frm.set_value()
2019-03-26 12:47:36 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
deepeshgarg007
1c785a99b1
fix: Added setting in company to ignore root company validation
2019-03-25 22:32:29 +05:30
Mangesh-Khairnar
324e06cba0
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-03-25 18:51:13 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
rohitwaghchaure
7779bb3839
Merge pull request #17010 from rohitwaghchaure/rename_pricing_rule_child_doctypes
...
fix: rename pricing rule child doctype names
2019-03-25 17:50:02 +05:30
Mangesh-Khairnar
b3ec508655
feat: record reason for hold as comment
2019-03-25 17:29:14 +05:30
Mangesh-Khairnar
5e474f4664
fix: add server-side validation for closed sales order for linked material request
2019-03-25 17:28:20 +05:30
Mangesh-Khairnar
c423d6f2e4
fix: validate sales order linked work order creation on server side
2019-03-25 17:27:33 +05:30
Mangesh-Khairnar
bcb8b135f2
feat: ask reason for putting sales order on hold
2019-03-25 17:27:16 +05:30
Faris Ansari
843b7f6dd5
fix: Reorder Currency column to fix print ( #17008 )
...
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
Rohit Waghchaure
4ed7d035cb
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:37:25 +05:30
Rohit Waghchaure
4792a84b5f
fix: rename pricing rule child doctype names
2019-03-25 14:28:08 +05:30
rohitwaghchaure
794b6b6c0d
Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix
...
fix: Show consolidated amount of payment entries in Bank reconciliation
2019-03-25 14:11:47 +05:30
Rushabh Mehta
5770ad9e8c
Merge pull request #16963 from itusedyetnew/develop
...
Fix:stock_values_on removed append function on string
2019-03-25 12:03:53 +05:30
Rushabh Mehta
689490e4de
Merge pull request #16986 from hrwX/italy_xml_fix
...
fix(Italy Customisation): Include fiscal code in invoice xml if present
2019-03-25 11:57:30 +05:30
deepeshgarg007
4f9ac0ad55
fix: Child company account currency fix
2019-03-25 11:39:25 +05:30
Shivam Mishra
ec56122876
fix: minor fix in test
2019-03-25 11:36:43 +05:30
scmmishra
26e5c753db
fix: Typo in update_status
2019-03-25 11:35:28 +05:30
scmmishra
1af3c41da3
fix: Typo in update_status
2019-03-25 11:34:33 +05:30
Suraj Shetty
67876d1026
fix: Show amount of entry based on diff of credit and debit
2019-03-25 11:19:07 +05:30
scmmishra
f7f32634c8
feat: Added check for no end date and refactored query
2019-03-24 20:43:15 +05:30
scmmishra
a2e801e840
fix: Added check for no end date
2019-03-24 20:38:47 +05:30
scmmishra
5869ba1470
feat: Added filter to query
2019-03-24 20:27:32 +05:30
scmmishra
e7cf06b3c6
fix: task overdue status propagates to project
2019-03-24 18:23:41 +05:30
scmmishra
6ab6d35f92
fix: Task Overdue status propagates to project
...
- Used ORM instead of a SQL for set_task_as_overdue
- update_status function compares the time and marks the appropriate task as overdue
- The on_update hook makes the changes in project as well
2019-03-24 18:17:13 +05:30
rohitwaghchaure
6fabcdd5b3
Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports
...
feat: sales partner reports
2019-03-24 14:52:45 +05:30
rohitwaghchaure
9673d0ddae
fix: description missing in the XML ( #16985 )
2019-03-24 12:19:58 +05:30
Himanshu Warekar
92593bb717
fix: Cost center as per company
2019-03-23 19:46:31 +05:30
Frappe Bot
b07a5d449d
Merge branch 'master' into develop
2019-03-23 07:25:03 +00:00
Frappe Bot
021ccf572a
bumped to version 11.1.16
2019-03-23 07:25:02 +00:00
Zarrar
963d62b701
feat: Chart of Accounts Importer ( #16623 )
...
* bare doctype created for COA utility
* improvise doctype's design
* validation to check no transaction exist for the company
* download file and import coa - client side logic added
* download csv template to create custom chart
* read the custom csv uploaded and parse it to appropriate format
* convert list of list to nested tree structure
* preview the uploaded chart before actual import
* toggle field based on necessity
* tweak create_charts and build_json logic to incorporate COA Import utility
* code cleanify and validation call added
* code enhancement for flexibility and validation added
* show import button only if data is validated
* unset existing data and load new accounts
* disable coa fields if parent_company set, minor improv
* file api fix
* added progress bar
* codacy fixes
* fix: Add account number in template
* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Himanshu
138e030055
CodiceFiscale should be after IdFiscaleIVA
2019-03-22 23:22:52 +05:30
Saif Ur Rehman
7d1c1aa28f
fix(Party Ledger Summary): Show all adjustment entries as columns
...
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
2019-03-22 17:18:32 +05:00
Himanshu Warekar
1d04ea1212
fix: include fiscal code in invoice xml if present
2019-03-22 17:47:57 +05:30
rohitwaghchaure
56e491bccd
Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields
...
feat: enabled allow on submit for action fields in the Budget
2019-03-22 15:34:41 +05:30
Prateeksha Singh
cc1a022d63
fix: correct use of include_item_in_manufacturing
2019-03-22 14:58:22 +05:30
Rushabh Mehta
d562e9530e
fix(link): help link in selling
2019-03-22 14:46:12 +05:30
Rushabh Mehta
c0de5b741e
fix: remove gitter chat
2019-03-22 14:32:00 +05:30
Nabin Hait
95705412f3
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-22 13:19:17 +05:30
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix
...
fix: Rounding adjustment in Rounded Total
2019-03-22 12:51:09 +05:30
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name
2019-03-22 12:48:56 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt
...
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12
...
feat: Brand Item Defaults (v12)
2019-03-22 12:46:04 +05:30
Rushabh Mehta
ff04142d9b
Merge pull request #16848 from alyf-de/hotfix-1
...
fix(projects): change fieldtype of billing amounts to Currency
2019-03-22 12:44:18 +05:30
Rushabh Mehta
7defd6f3b5
Merge pull request #16749 from Alchez/hotfix-cancelled-payments
...
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
2019-03-22 12:43:52 +05:30
Rushabh Mehta
b0a7cbb591
Merge pull request #16905 from frappe/netchampfaris-patch-1
...
fix: Update Training Level
2019-03-22 12:43:00 +05:30
Rushabh Mehta
199aae0fe8
Merge pull request #16861 from Anurag810/asset_fixes
...
fix: passing the correct argument in get_depreciation_amount
2019-03-22 12:42:46 +05:30
Rushabh Mehta
fc4eefcb22
Merge pull request #16871 from rmehta/attendance-from-leave
...
feat: Pre mark attendance for Leave Application
2019-03-22 12:41:47 +05:30
Rohit Waghchaure
9c214b6129
feat: enabled allow on submit for action fields in the Budget
2019-03-22 12:08:09 +05:30
Rushabh Mehta
2f9c7171fa
Merge pull request #16980 from chdecultot/fec_correctioon
...
fix: [Regional] [FEC report] Mapping issue in sql query
2019-03-22 12:05:51 +05:30
Deepesh Garg
22b61607c6
feat: GSTR3B Report JSON creation and Print Format ( #16595 )
...
* feat: Created doctype for GSTR3B report and added boilerplate code
* feat: Updated gst_fields and patches for gst_category
* feat: Functions for calculating itc amount
* fix: Patched eligibility_for_itc_field
* fix: Updated set_category for gst
* fix: Function for setting iter_state supplies
* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format
* fix(style): Added missing semicolon and removed unused imports
* fix: Patch field only if column is available
* fix: Make custom fields only for india sepecific company
* fix: Add intro to gstr3b report
* fix: Updated patch in patches.txt
* fix: Update patches.txt
* fix: Update patch to set GST Category
* fix: Add fields for nil rated and non gst in item master
* fix: Added logic for nil rated and non gst inward flow
* fix: Initial test case for GSTR3B Report
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Add link for gstr_3b_report in accounting module
* fix: Updated report template
* fix: Changes in GSTR3B Report doctype
* fix: Added function to get missing field invoices
* fix: Added more test cases
* fix: Item not found error in test case
* fix: Key error in state numbers
* fix: Changes in GSTR3b Doctype
* fix: Changed functions to method
* fix: Minor fix in patch
* fix: Add gst_ctegory in GST Reports
* fix: Minor fixes in patch and itc_mapping
* fix: Query to patch itc field
* fix: Patch registered customers and fix for multiple gst accounts
* fix: Test case
* fix: Total taxable calculation logic fix and template enhancement
* fix: Calculate txval seperately
* fix: itc amount calculation fix and patch improvement
* fix: Updated test_cases for itc calculation
* fix: Missing field query
* fix: Multiple minor fixes inreport
* fix: Added transalations in GSTR3B-Form
* fix: Use double underscore for translation
* fix: GST fields ordering fix
* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30
Charles-Henri Decultot
a7cf7fbccc
Fix: Mapping issue in sql query
2019-03-21 13:28:14 +00:00
Deepesh Garg
3a05b3501c
fix: Failing test case on develop ( #16974 )
2019-03-21 12:53:12 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Saurabh
83cc587f8f
bumped to version 11.1.15
2019-03-20 15:03:00 +06:00
Faris Ansari
3ba91d7e19
fix: Add /all-products to sitemap
2019-03-20 14:11:22 +05:30
Faris Ansari
d77fe38513
fix: Remove no_sitemap property
2019-03-20 14:11:05 +05:30
rohitwaghchaure
f45db71ba2
Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working
...
fix: Cost center from PO to PI is not mapping
2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130
fix: Cost center from PO to PI is not mapping
2019-03-20 13:34:28 +05:30
Mangesh-Khairnar
2ffa87ea34
feat: added erpnext doctype via hooks ( #16930 )
2019-03-20 13:25:48 +05:30
scmmishra
43e9375642
feat [WIP]: Added multiple choice question component
2019-03-20 13:25:02 +05:30
Rohit Waghchaure
65d9435fd5
feat: sales partner reports
2019-03-20 12:05:21 +05:30
itusedyetnew
8aafbd22de
stock_values_on append function on string
2019-03-20 11:10:41 +05:30
Rohit Waghchaure
ca9f93cdc2
feat: Stock ageing warehouse wise
2019-03-20 02:14:54 +05:30
rohitwaghchaure
e521f51e5f
Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars
...
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:17:15 +05:30
Mangesh-Khairnar
7fc1bc0b27
fix: handle an empty match query condition in leave application ( #16931 )
2019-03-19 18:14:02 +05:30
Rohit Waghchaure
a322687897
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:10:08 +05:30
Himanshu
f3e5213190
feat(Support): Service Level Agreements ( #16828 )
...
* init SLA
* Added more inputs to the forms
* set priority of issue
* Removed UOM in favor of hours for tracking
* updated js to autofill values
* Removed unwanted fields
* timer functionality
* code refactor
* parenthesis fix
* fixed typo
* added new fields
* Updated fields
* Updated fields for issue doctype
* Updated fields for issue doctype
* changed doctype structure
* added new fields to issue
* code refactor
* new function to set criticality level
* changed dropdown options
* set timer for sla
* calculation of resolution and response time
* stopwatch counter
* dashboard changes
* renamed sla to support contract
* countdown timer section
* issue doctype changes
* removed unwanted imports
* fixed wrong response time and resolution time
* update response and resolution time
* calculate time to respond and resolve
* feature enhancements
* probable scheduling bug fix
* fixed scheduling issue support sent out of support time
* removed issue criticality link from support
* Changed day order
* skip date validation when support contract is default
* removed mandatory field
* fix scheduling conditions for now
* code refactor
* removed duplicate doctypes
* fixed day inserted twice in service level
* check to not add another default contract
* default support contracts
* removed commented code
* removed unused imports
* fix sla for non-listed days
* reduced redundant code and optimized it and starting unit tests
* added condition check to compute days correctly
* renamed doc as per guidelines and added conditions for scheduling
* removed per day support timings
* added response and resolution time to support contract
* scheduling based on hours kinda fix
* set sla before_update and finally fixed time scheduling out of support time
* DocType Issue removed test_records and rewrote test cases
* test cases and codacy fixes
* Doctype SLA instead of Support Contract to avoid confusion with Contract
* fixed tests failing due to change in options for time period
* change naming to Prompt
* remove unknown doctype from help_desk
* revert unwanted changes to default
* refactor get_list for fetching service_level_agreement
* change datatypes
* fix tests
* refactored tests
* remove unused imports
* code and comments refactor for better understandability
* removed and renamed doctype to service days and minor fixes
* Refactor test cases for response and resolution time for issue
* add validation to check if response time < resolution time
* minor fix for checking if current day is start day
* calculate time in js rather than python
* fix: parenthesis fixing customer dashboard
* json changes to rename sections
* refactor: alignment
* refactor: beautify code
* fix: use frm api to get the element
* fix: replace '__' with '_'
* refactor: remove pointless test
2019-03-19 16:47:56 +05:30
rohitwaghchaure
40046721b2
Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors
...
fix: POS, cost center not added against debtors
2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e
fix: POS, cost center not added against debtors
2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
...
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a
fix: advance amount is not calculating properly
2019-03-19 15:06:01 +05:30
Rohit Waghchaure
8bfe330b37
feat: pricing rule enhancements
2019-03-19 12:44:30 +05:30
scmmishra
000e706337
feat: Only student progress is recorded in LMS
...
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 ( #15965 )
...
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Himanshu Warekar
642a5b69f5
fix: change customer to supplier
2019-03-18 21:53:33 +05:30
Himanshu Warekar
2f5f17fcbb
refactor: fix issue credit note
2019-03-18 21:46:26 +05:30
scmmishra
7ad5619318
feat: Set default role to LMS User for signup in Education
2019-03-18 19:11:44 +05:30
scmmishra
eaed1ae3d6
fix: Added import statement for translate wrapper
2019-03-18 19:11:07 +05:30
scmmishra
f2c638f8ab
fix (minor): Replaced text editor with small text in course doctype
2019-03-18 18:38:51 +05:30
scmmishra
acc278de9c
feat: Added validations for question doctype
...
- A question must have more than two options
- A question must have at least one correct option
2019-03-18 18:38:18 +05:30
scmmishra
5c646e60f5
fix: Auto course enrollment for enrolled programs in LMS
2019-03-18 18:37:35 +05:30
scmmishra
a0978a2aab
chore: Cleaned up quiz.py
2019-03-18 18:37:06 +05:30
Rushabh Mehta
f060831cce
fix(escaping): make_italian_localization_fields.py
2019-03-18 18:04:34 +05:30
Rohit Waghchaure
5b43e2f31a
code cleanup
2019-03-18 17:00:44 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool
...
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
2019-03-18 15:48:55 +05:30
scmmishra
e3dea29f58
fix: Minor UI fix
2019-03-18 15:44:55 +05:30
Himanshu
ac199580af
fix(Customer Ledger): ambiguous error in where clause ( #16914 )
...
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
2019-03-18 15:44:54 +05:30
scmmishra
621cad8781
fix: Default program list
...
Shows two latest programs if no program is set as featured
2019-03-18 15:40:47 +05:30
scmmishra
c22eef28f7
fix: LMS Title
...
Shows default company name if LMS title not set
2019-03-18 15:36:49 +05:30
scmmishra
dcbe7e5490
fix: Added permissions for instructor
...
Also made description mandatory in program
2019-03-18 15:29:30 +05:30
scmmishra
b2c745827f
fix: Removed accidentally added course doctype in list
2019-03-18 15:28:49 +05:30
rohitwaghchaure
ac9f38bfc2
Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap
...
feat: added cost center filter in AR/AP reports
2019-03-18 14:22:15 +05:30
Rohit Waghchaure
d4e4316d0b
fix: test cases and codacy
2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c
codacy fixes
2019-03-18 12:50:29 +05:30
Zlash65
11bba571af
test case added to check account syncing
2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62
fix: chart of accounts field toggling improv
2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d
fix: return if no descendants found
2019-03-18 12:50:28 +05:30
Zlash65
73acb8c837
fix: set chart of accounts based on parent company on server side
2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e
feat: sync account created for a group company to all its descendants
2019-03-18 12:50:28 +05:30
Zlash65
88c990901d
fix: added validation to if account is being added to child company
2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00
fix: override primary action button, change filter to root company
2019-03-18 12:50:27 +05:30
Zlash65
2def228da8
feat: allow adding account only if topmost parent company
...
- hidden filter for Parent Company added
- Add button overriden with new condition
2019-03-18 12:50:27 +05:30
Zlash65
a57d58f756
feat: once company is saved, parent_company cannot be selected
2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090
feat: selecting parent_company should disable chart_of_accounts based fields
2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56
disbale pl check for Sales and Purchase Invoice
2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Mangesh-Khairnar
db96db2897
style: change position of hold and resume button
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
e613c4f380
test: purchase order on hold
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
873c579bb4
fix: check for both hold and closed status in po
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
4f74313baf
feat: record reason for hold as comment
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723
feat: add validation for on hold purchase order
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
439546c83c
feat: add on hold status in purchase order
2019-03-18 12:14:25 +05:30
scmmishra
b854d64401
Merge branch 'develop' of github.com:frappe/erpnext into lms-beta-v2
2019-03-18 11:51:27 +05:30
Aditya Hase
42640cb908
fix(dashboard): Add configuration to chart source
2019-03-18 11:18:43 +05:30
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 ( #16847 )
2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix ( #16935 )
2019-03-17 09:49:24 +05:30
Mangesh-Khairnar
b343407236
refactor: change validate email add to validate email address
2019-03-16 13:40:58 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit
...
feat: added provision to disable CWIP accounting in asset settings
2019-03-16 12:18:36 +05:30
rushin29
08a209bc52
fix: gst_state_number for address with Unregistered GST ( #16798 )
2019-03-15 15:28:50 +05:30
rohitwaghchaure
ef74e94374
Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card
...
feat: child table to add multiple time logs in job card
2019-03-15 11:46:33 +05:30
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template
...
fix: Add credit month in validation
2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop
...
fix: Add 'Half-Yearly' option to Earned Leave Frequency
2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance
...
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
2019-03-15 09:02:20 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py
2019-03-15 08:57:49 +05:30
Rushabh Mehta
e5d79f3621
Merge pull request #16673 from Alchez/feat-task-from-issue
...
feat(issue): Create and view Tasks from Issues
2019-03-15 08:55:20 +05:30
Anurag Mishra
ed190bb329
fix: codacy
2019-03-14 18:14:20 +05:30
Anurag Mishra
1c7baaeba5
test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices
2019-03-14 16:45:02 +05:30
Anurag Mishra
6deffbd6e8
test: loan_return date and loan Sanctioned on submit
2019-03-14 16:44:49 +05:30
Anurag Mishra
4a538ba78a
Resolve merge conflict
2019-03-14 16:43:16 +05:30
Nabin Hait
ed96591618
feat(accounts): Invoice Discounting
2019-03-14 16:42:44 +05:30
scmmishra
0bcae95d3c
chore: Fixed config for education
2019-03-14 15:46:51 +05:30
scmmishra
21823f5f66
feat: Added test for program_enrollment
2019-03-14 15:44:01 +05:30
scmmishra
e3b7e1381d
feat: Moved make_course_activity to test_course_activity.py
2019-03-14 15:34:13 +05:30
scmmishra
8aa6ac7b03
feat: Moved setup_program to test_program.py
2019-03-14 15:32:22 +05:30
scmmishra
a98e936d26
chore: Removed LMS Activity Doctype
2019-03-14 15:24:26 +05:30
scmmishra
88b2244468
feat: Added test for course_enrollment
2019-03-14 15:19:20 +05:30
scmmishra
c75b513e2c
fix: Enrollment bug
2019-03-14 15:16:14 +05:30
scmmishra
34fa33d324
fix: Config bug, added type doctype
2019-03-14 15:14:25 +05:30
Bassam Ramadan
e14758c897
fix: add returns field to cashier closing ( #16911 )
2019-03-14 15:01:50 +05:30
Rushabh Mehta
947d573276
Merge pull request #16892 from hrwX/uae_fix
...
fix(UAE): Fetch from fix for UAE customizations
2019-03-14 14:20:32 +05:30
Rushabh Mehta
e8258fc352
Merge pull request #16854 from jay-parikh/hotfix
...
fix: Default Company to Total Stock Summary Report
2019-03-14 14:18:36 +05:30
Rushabh Mehta
2352ce92cc
Merge pull request #16849 from frappe/bcornwellmott-patch-1
...
fix: Add date to currency exchange caching
2019-03-14 14:18:09 +05:30
Rushabh Mehta
d63e0f490c
Merge pull request #16856 from hrwX/sales-work-fix
...
fix(Work Order): fetch item info when making work order from sales order
2019-03-14 14:17:40 +05:30
Rushabh Mehta
20af5a2b40
Merge pull request #16866 from deepeshgarg007/additional
...
fix: Removed relieving date validation form additional salary
2019-03-14 14:16:18 +05:30
Rushabh Mehta
bd9622bfd5
Merge pull request #16918 from Alchez/hotfix-party-payments
...
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 14:14:42 +05:30
Rohan Bansal
82433845e5
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 13:18:55 +05:30
scmmishra
14d70ce444
chore: updated education config
2019-03-14 12:31:25 +05:30
Rushabh Mehta
f49d0d8058
Merge pull request #16890 from Anurag810/timesheet
...
feat: Timesheet Reports
2019-03-14 10:31:23 +05:30
Rushabh Mehta
6e2286f5f0
Merge pull request #16897 from PawanMeh/fixes_16894
...
fixes: Amazon v12 integration issues
2019-03-14 10:30:29 +05:30
Aditya Hase
3b75551739
feat(dashboard): Render Account Balance Timeline is a time series
2019-03-12 14:47:21 +05:30
Aditya Hase
59fc039c77
style: Linting fixes
2019-03-12 14:47:21 +05:30
Aditya Hase
1e0f9a2882
feat(dashboard): Use caching decorator for dashboard
2019-03-12 14:47:21 +05:30
Aditya Hase
76158e6643
feat(dashboard): Export chart source doc to JSON file
2019-03-12 14:47:21 +05:30
Aditya Hase
675c1d3a5a
refactor(dashboard): Move Soure settings to account_balance_timeline.js
2019-03-12 14:47:20 +05:30
Aditya Hase
09f2ed2e69
refactor(dashboard): Move dashboard.py to account_balance_timeline.py
2019-03-12 14:47:20 +05:30
Aditya Hase
d85b0ae602
fix(dashboard): Remove unused variables
2019-03-12 14:47:20 +05:30
Aditya Hase
2fa1d9caed
fix(dashboard): Remove print statement
2019-03-12 14:47:20 +05:30
Aditya Hase
15c0cfff0f
refactor(dashboard): Convert indentation to tabs
2019-03-12 14:47:20 +05:30
Aditya Hase
4b171ddebb
feat(dashboard): Remove hardcoded company filter
2019-03-12 14:47:20 +05:30
Aditya Hase
3b593e44c6
feat(dashboard): Set account from filters
2019-03-12 14:47:20 +05:30
Aditya Hase
5911e100ad
fix(dashboard): Consider opening balance
2019-03-12 14:47:20 +05:30
Aditya Hase
6cadf77073
feat(dashboard): Add Time Grain filter
2019-03-12 14:47:20 +05:30
Aditya Hase
c888e52788
feat(dashboard): Add missing dates
2019-03-12 14:47:20 +05:30
Aditya Hase
8896374413
feat(dashboard): Add timespan filter
2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47
feat(dashboard): Create Accounting dashboard from General Ledger Report
2019-03-12 14:47:20 +05:30
Anurag Mishra
641e412853
fix: Removed raw query and used frappe.get_all
2019-03-12 13:12:31 +05:30
Rohan Bansal
f4bce6a66e
fix(issue): Replace Make buttons on Issue and Task with a dashboard
2019-03-12 12:48:13 +05:30
Rohan Bansal
bf7c69f3c4
fix(issue): Don't auto-set project
2019-03-12 12:48:13 +05:30
Rohan Bansal
fa77b591ac
fix(issue): View Tasks against an Issue
2019-03-12 12:48:13 +05:30
Rohan Bansal
2ba21fb66c
fix(issue): Add issue name in Task and fix description in Issue
2019-03-12 12:48:13 +05:30
Rohan Bansal
5327d0253d
feat(issue): Create tasks from issues
2019-03-12 12:40:32 +05:30
Rohan Bansal
6cbd3998fb
fix(work_order): Use single update query
2019-03-12 12:15:37 +05:30
Rohan Bansal
b4745ec668
fix(work_order): Change Work Order title to show item name instead of item code
2019-03-12 12:13:02 +05:30
Anurag Mishra
9a1adc7c49
Added mandatory feilds to the report
2019-03-12 11:00:02 +05:30
Faris Ansari
47f1080f1e
fix: Update modified
2019-03-12 10:57:35 +05:30
Faris Ansari
175709ed50
fix: Update Training Level
...
- Rename Expert to Intermediate, since it was ambiguous with Advance
2019-03-12 10:55:39 +05:30
Faris Ansari
2221151132
fix: Update Training Level
2019-03-12 10:55:11 +05:30
Anurag Mishra
34e1f92a7e
fix: readability
2019-03-11 18:17:22 +05:30
Anurag Mishra
1218255178
feat: Project Billing Summary for timesheet
2019-03-11 17:43:44 +05:30
Rohan Bansal
90972cfbf9
fix(transaction): Avoid shipping rule charge override by tax template
2019-03-11 15:00:48 +05:30
pawan
c0e1000919
fix: SKU issue
2019-03-11 14:58:17 +05:30
pawan
7c3e017ac3
fix: Amazon integration issues
2019-03-11 14:47:57 +05:30
Rohit Waghchaure
267723f57b
fix: stock ledgre report not working
2019-03-11 14:06:00 +05:30
Anurag Mishra
9b64baa734
Minor Fixes
2019-03-11 12:02:25 +05:30
Anurag Mishra
59f4556d95
Commonify code
2019-03-11 11:58:34 +05:30
Anurag Mishra
e86ac3c8d4
feat: timesheet Employee Summary Report
2019-03-11 11:58:28 +05:30
Rohit Waghchaure
52729bf369
feat: child table to add multiple time logs in job card
2019-03-11 00:02:32 +05:30
Himanshu Warekar
1692fbaf1c
fetch from fix
2019-03-08 18:37:34 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Frappe Bot
3406229152
bumped to version 11.1.14
2019-03-08 09:39:32 +00:00
Rushabh Mehta
96842c9de6
fix(typo): leave_application.py
2019-03-08 12:36:43 +05:30
Rushabh Mehta
701c0b792c
feat: Pre mark attendance for Leave Application
2019-03-08 12:30:42 +05:30
Rohit Waghchaure
6b33c9b934
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125
feat: added provision to disable CWIP accounting in asset settings
2019-03-08 10:51:37 +05:30
Nabin Hait
9ec4816b32
Update item_barcode_childtable_migrate.py
2019-03-08 10:44:13 +05:30
Saif Ur Rehman
e62bd893c5
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
deepeshgarg007
78a32ae172
fix: Remove validation for relieving date from additional salary
2019-03-07 20:00:07 +05:30
Anurag Mishra
1b0f5fd430
fix: pass correct argument to method get_deprication_amount
2019-03-07 16:17:00 +05:30
Rushabh Mehta
703a597478
fix(patch): update customization options if completed is not present
2019-03-07 13:03:40 +05:30
Rushabh Mehta
e9db0d2c61
fix(minor): update task list label from Closed to Completed
2019-03-07 12:50:02 +05:30
rohitwaghchaure
d4754619d0
Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table
...
fix: scan barcode not adding the barcode value in the items table
2019-03-07 11:29:56 +05:30
Himanshu Warekar
7ab961f798
remove debug code
2019-03-06 23:53:38 +05:30
Himanshu Warekar
59699bf46e
[debug] locally tests passed but travis failed
2019-03-06 23:33:03 +05:30
Himanshu Warekar
4f1737c2dd
fix sales order test for creating work order from sales order
2019-03-06 22:19:15 +05:30
scmmishra
62416224ab
feat: Added test utilities for course_activity
2019-03-06 19:01:28 +05:30
Himanshu Warekar
783331c645
sales_order to work_order item desc fix
2019-03-06 18:44:04 +05:30
Rohit Waghchaure
db8500c03a
POS profile, account for change amount must be cash or bank account
2019-03-06 18:28:45 +05:30
Jay Parikh
9757a603fa
Fix Company Default to Total Stock Summary Report
2019-03-06 12:44:41 +00:00
scmmishra
18ddc92947
feat: Added check for duplicate course enrollment
2019-03-06 17:05:17 +05:30
scmmishra
890ce60e86
style: Removed trailing spaces
2019-03-06 17:04:42 +05:30
scmmishra
531d2761cf
feat: Refactored some enrollment functions
2019-03-06 17:04:17 +05:30
scmmishra
b72ba416ff
feat: More tests
2019-03-06 17:03:51 +05:30
Rohan Bansal
e66f59654e
fix(report): Incorrectdata for balance quantity and value in Stock Balance report
2019-03-06 16:04:11 +05:30
scmmishra
bf9a10fd5e
chore(style): Renamed a function
2019-03-06 15:45:35 +05:30
scmmishra
bcfe6f024f
feat: Added lms tests for student doctype
2019-03-06 15:26:41 +05:30
scmmishra
92ab107b60
fix: Minor fix
2019-03-06 15:26:20 +05:30
scmmishra
4a7e2c1e2f
feat: Minor changes to topic tests
2019-03-06 15:19:02 +05:30
scmmishra
2cec025bbe
feat: Added test for program doctype
2019-03-06 15:18:43 +05:30
scmmishra
64347a5642
feat: Added test for Course Doctype
2019-03-06 15:18:27 +05:30
scmmishra
75defde940
fix: fixed user creation bug in student
2019-03-06 15:18:01 +05:30
Rushabh Mehta
29c46bb311
fix(sales_order.py): handle zero bundle qty
2019-03-06 14:49:13 +05:30
Joyce Babu
3d0121369f
Add 'Half-Yearly' option to Earned Leave Frequency
...
in addition to the current values of Monthly, Quarterly and Yearly
2019-03-06 13:04:45 +05:30
scmmishra
18a1a8d4f4
style: Fixed route.js
2019-03-06 10:55:21 +05:30
bcornwellmott
b263876918
Add date to currency exchange caching
...
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
2019-03-05 16:44:02 -08:00
Raffael Meyer
33d0a9f684
fix(projects): change fieldtype of billing amounts to Currency
2019-03-05 21:57:11 +01:00
Himanshu Warekar
250ebe5888
Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop
2019-03-05 17:45:14 +05:30
Himanshu Warekar
219b9f4150
Salary Component can be equal to zero
2019-03-05 17:44:07 +05:30
deepeshgarg007
e062acbbd3
fix: Removed shortcuts from desktop.py
2019-03-05 17:17:10 +05:30
Himanshu Warekar
acb7238ad6
Allow zero amount in additional salary
2019-03-05 12:20:19 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return
...
fix: Python 3 Sales Invoice Return Validation "validate_pos"
2019-03-05 08:05:00 +05:30
rohitwaghchaure
55c382a780
Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes
...
fix: on save of the address, state code field become blank
2019-03-04 16:59:45 +05:30
rohitwaghchaure
f6a8b17717
Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description
...
fix(sales order item): not able to search item by description
2019-03-04 16:59:19 +05:30
rohitwaghchaure
369d20ac2b
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number
...
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats
...
feat: Auditors print formats
2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
...
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf
Minor fixes
2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc
fix: gross depends upon now report type
2019-03-04 14:46:28 +05:30
Prateeksha Singh
a5f2962c16
Merge pull request #16830 from pratu16x7/explore-2.0
...
minor(modules): add onboard keys, remove hidden
2019-03-04 14:39:29 +05:30
scmmishra
28dd4c139e
feat: Added test for Topic Doctype
...
- Added test for get_contents function
- Removed unused class functions
2019-03-04 14:21:22 +05:30
Prateeksha Singh
8aa4594b1e
feat(modules): add onboard keys, remove hidden
2019-03-04 14:00:26 +05:30
Rohit Waghchaure
9842ce5a79
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 13:39:52 +05:30
deepeshgarg007
511713e131
fix: Delete GL entry for supplier before creating new one
2019-03-04 13:25:39 +05:30
deepeshgarg007
e615051ccc
fix: Updated test_united_states
2019-03-04 13:22:51 +05:30
Deepesh Garg
44ff41188d
fix: Selling and buying amount precision fix ( #16764 )
2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7
fix: Print letter head only if checked in Print Settings ( #16789 )
...
Letter head is printed in financial statements even if option is not checked
![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png )
2019-03-04 12:53:11 +05:30
Deepesh Garg
e1f72cc010
revert: Address and contact report fix ( #16786 )
...
Reverts #16674
Address and other info are not visible in address and contact report
![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png )
2019-03-04 12:49:39 +05:30
Anurag Mishra
1e4e61bd94
Minor fixes
2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68
minor fixes
2019-03-04 12:27:41 +05:30
deepeshgarg007
f6d1f53aef
fix: Account type fix in test_united_states
2019-03-04 10:23:35 +05:30
Mangesh-Khairnar
83f1fbdc4e
test: assert validation error for sales order on hold
2019-03-02 22:24:23 +05:30
Rohit Waghchaure
2bfb063fdb
fix(sales order item): not able to search item by description
2019-03-02 21:47:55 +05:30
Mangesh-Khairnar
3ebeac13e9
feat: add resume funtionality for sales order on hold
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
86e650c1ed
feat: validate linked sales order on material request creation
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
8f7c7a6882
feat: check for on hold sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
4f350fcadb
feat: validate sales order in sales invoice
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
1c276e9828
feat: validate on hold sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
602223dd55
feat: add a option of on hold in sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
5eb66aed77
feat: add on hold status check
2019-03-02 20:48:03 +05:30
Mangesh-Khairnar
e17b7095bf
feat(sales order on hold): check status of sales order to validate entry
2019-03-02 20:48:03 +05:30
Jay Parikh
c2090939d7
Fix Sales Invoice Return Validation "validate_pos"
2019-03-02 12:19:32 +00:00
Rohit Waghchaure
4ef924d0ba
fix: on save state code field become blank
2019-03-01 18:11:43 +05:30
Frappe Bot
8f0660ab31
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
Frappe Bot
3ec0bb7e53
bumped to version 11.1.13
2019-03-01 09:12:25 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix
...
fix(regional,italy): bank details, custom button on sales invoice
2019-03-01 14:26:07 +05:30
rohitwaghchaure
5e71a56c7a
Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate
...
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
2019-03-01 14:25:00 +05:30
Gaurav
6a4625b94c
fix(regional,italy): codacy fixes in regional sales_invoice js
2019-03-01 13:58:39 +05:30
Gaurav
b30a9b1869
fix(regional,italy): bank details, custom button on sales invoice
...
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total
...
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
2019-03-01 11:57:06 +05:30
Rushabh Mehta
94d6f94e0e
Merge pull request #16421 from agritheory/usregional
...
feat: US Regional Module with IRS 1099 reporting
2019-03-01 09:14:18 +05:30
scmmishra
471140c6d4
fix: Minor changes
2019-02-28 18:14:25 +05:30
scmmishra
f0a56b977a
feat: Minor fixes to profile page
2019-02-28 18:11:46 +05:30
scmmishra
ab8fc8c2bf
feat: Quizzes fixed
2019-02-28 16:42:37 +05:30
scmmishra
3726f8a7f6
feat: Added check for no content in topic meta
2019-02-28 16:33:53 +05:30
scmmishra
b793cc8e1e
fix: Minor changes
2019-02-28 16:33:38 +05:30
Rohit Waghchaure
c21cda2790
Removed validation for group by voucher in general ledger
2019-02-28 16:20:45 +05:30
Frappe Bot
1fcae10258
Merge branch 'master' into develop
2019-02-28 10:20:48 +00:00
scmmishra
5e61b17cf8
fix: Routing after finishing a course topic
2019-02-28 15:43:33 +05:30
scmmishra
de5f71ae9e
fix: Showing Topic Progress
2019-02-28 15:40:49 +05:30
Frappe Bot
58135976dd
bumped to version 11.1.12
2019-02-28 10:08:08 +00:00
scmmishra
b17d289bda
fix: Course card progress
2019-02-28 15:21:43 +05:30
Rohit Waghchaure
ab4ff984c4
fix: scan barcode not adding the barcode value in the items table
2019-02-28 13:31:02 +05:30
Rushabh Mehta
57128e413c
fix: task.js
2019-02-28 12:43:58 +05:30
Himanshu Warekar
3315a9fafb
fix routes
2019-02-28 11:51:36 +05:30
Himanshu Warekar
1cb695b7e9
fix route for Task and Tree of Procedure
2019-02-28 11:42:36 +05:30
rohitwaghchaure
1d41c1c2de
Merge pull request #16787 from rohitwaghchaure/italian_more_fixes
...
fix: e-invoicing patch, patch to set country code in the address
2019-02-28 11:28:04 +05:30
Rohit Waghchaure
b48effebce
fix: test case
2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670
fix: bom cost update is not working
2019-02-27 18:01:30 +05:30
scmmishra
56ad5da090
fix: Minor Changes
2019-02-27 15:32:36 +05:30
Rohit Waghchaure
74cfe57716
fix: e-invoicing patch, patch to set country code in the address
2019-02-27 14:38:36 +05:30
Anurag Mishra
a9a1552e32
refactor
2019-02-27 14:10:24 +05:30
scmmishra
e6735e418f
fix: Content navigation
2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1
Fix: Content title fields
2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661
fix: Reloading bug on Content page
2019-02-27 12:24:17 +05:30
scmmishra
23880ae567
fix: Content fetching for articles and videos
2019-02-27 12:09:57 +05:30
scmmishra
628659e02a
fix: Routing for course
2019-02-27 12:09:28 +05:30
Rushabh Mehta
fcd0556119
Merge pull request #16709 from rmehta/project-template
...
feat: Project Template
2019-02-27 09:22:12 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master
...
fix: call base class onload method
2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808
fix: call base clase onload method
2019-02-26 18:01:37 +01:00
scmmishra
90b503621b
fix: Content Routing
2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287
fix: TopicMeta fixes
2019-02-26 17:11:01 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
Sagar Vora
5a14e46a1b
bumped to version 11.1.11
2019-02-26 17:28:58 +05:50
scmmishra
03c4c635e0
fix: list title on CoursePage
2019-02-26 16:54:32 +05:30
scmmishra
95bb3c0ee9
Minor fixes
2019-02-26 16:49:58 +05:30
scmmishra
c011b08699
fix: Fixed UI and API for course page
2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77
fix: Fixed API and UI for topic card
2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849
fix: Minor UI fixes
2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb
style: Minor code formatting
2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978
fix: Course Card shows topic list
2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f
fix: Route for course page
2019-02-26 16:47:10 +05:30
scmmishra
3866dee3e1
feat: Corse doctype
2019-02-26 16:37:31 +05:30
Rushabh Mehta
45c252a240
fix(test): test_task.py
2019-02-26 16:18:46 +05:30
Nabin Hait
39c489bfdc
Merge pull request #16781 from deepeshgarg007/summary
...
fix: Make company filter mandatory in sales person wise transaction summary
2019-02-26 16:00:51 +05:30
Nabin Hait
be5124fe10
Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing
...
fix: multiple e-invoicing issues for italy region
2019-02-26 15:52:56 +05:30
Rohit Waghchaure
0f98cb8b83
fix: multiple e-invoicing issues for italy region
2019-02-26 15:09:27 +05:30
Rushabh Mehta
b94c8b1c77
fix(tests): add test for bulk complete / cancellation of project
2019-02-26 14:30:38 +05:30
Rushabh Mehta
02a9ec33ed
BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk
2019-02-26 14:30:38 +05:30
Rushabh Mehta
2d2d176e5c
fix: linting
2019-02-26 14:30:38 +05:30
Rushabh Mehta
e9984672ce
feat: Project Template
2019-02-26 14:30:38 +05:30
Saurabh
acf83791ab
fix: file api
2019-02-26 13:58:18 +05:30
deepeshgarg007
d2d84e3c9d
fix: Company filter fix
2019-02-26 11:52:22 +05:30
Suraj Shetty
5636f924a9
fix: get mode of payment while selecting payment term in payment term template ( #16765 )
2019-02-25 12:43:34 +05:30
Nabin Hait
9990306399
fix: Consider only active BOMs while updating cost via BOM Update Tool ( #16753 )
2019-02-25 11:59:05 +05:30
Rushabh Mehta
e2de8e0fa5
fix: expense claim type ( #16760 )
2019-02-25 11:56:30 +05:30
Suraj Shetty
2dadc1ef98
chore: Remove trailing whitespaces
2019-02-21 20:51:35 +05:30
deepeshgarg007
bf6b36a39b
fix: Removed white spaces
2019-02-21 19:30:27 +05:30
deepeshgarg007
56b52d43e6
Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item
2019-02-21 18:30:02 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Saurabh
76cd402ca5
bumped to version 11.1.10
2019-02-21 18:55:28 +06:00
Saurabh
e5ff28a92c
Merge pull request #16754 from deepeshgarg007/state_code
...
fix: State code issue fix
2019-02-21 18:21:24 +05:30
Nabin Hait
367d7c104e
Merge pull request #16724 from rohitwaghchaure/user_progress_issue
...
fix: user progress issue
2019-02-21 18:13:52 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs
...
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty
...
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 18:11:37 +05:30
Nabin Hait
31f46b313c
Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue
...
fix: not able to cancel maintenance visit
2019-02-21 18:10:46 +05:30
Nabin Hait
e328869b10
Merge pull request #16738 from deepeshgarg007/unique_tree_options
...
fix: Filter out unique values for tree options
2019-02-21 18:09:42 +05:30
Nabin Hait
e3b1b11bc5
Merge pull request #16740 from nabinhait/leave-calendar
...
fix: Calendar events for leaves considering user permissions
2019-02-21 18:08:19 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing
...
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit
...
fix: Decimal point issue in gross profit print
2019-02-21 18:07:14 +05:30
deepeshgarg007
1915e15a9e
fix: State code issue fix in regional module(Italy)
2019-02-21 17:55:57 +05:30
rohitwaghchaure
a49f59fcec
Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero
...
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:50:51 +05:30
Rohit Waghchaure
90691dc0d8
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:18:28 +05:30
Nabin Hait
b24caad789
fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings
2019-02-21 17:11:35 +05:30
Rohan Bansal
143973166f
fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests
2019-02-21 15:57:06 +05:30
Suraj Shetty
463a3cf8cf
Merge pull request #16725 from deepeshgarg007/item_dashboard
...
fix: Item name display issue fix in item dashboard
2019-02-21 14:42:38 +05:30
Nabin Hait
26972c954d
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 14:32:41 +05:30
deepeshgarg007
14ff6bfc32
fix: Decimal point issue in gross profit print
2019-02-21 12:08:32 +05:30
Nabin Hait
816a4655a0
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 12:02:36 +05:30
Nabin Hait
40c15d2e74
fix: Calendar events for leaves considering user permissions
2019-02-20 18:55:38 +05:30
Saurabh
482ebd2c7c
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
Saurabh
ada93e5d77
bumped to version 11.1.9
2019-02-20 18:44:17 +06:00
deepeshgarg007
0d64d622e5
fix: filter only unique values for tree options
2019-02-20 17:55:14 +05:30
rohitwaghchaure
485bd93dae
Merge pull request #16737 from saurabh6790/indentation_fixes
...
fix: reload report doc and indentation fixes
2019-02-20 17:40:50 +05:30
rohitwaghchaure
c18e925d61
fix: Moved regional methods from controller to hooks ( #16736 )
2019-02-20 17:13:15 +05:30
Saurabh
9fcfc63f77
fix: reload report doc and indentation fixes
2019-02-20 17:04:18 +05:30
rohitwaghchaure
ef3f864123
fix: not able to submit purchase order ( #16735 )
2019-02-20 15:47:06 +05:30
rohitwaghchaure
e141865c43
Merge pull request #16722 from rohitwaghchaure/stop_button_not_working
...
fix: stop button not working in material request
2019-02-20 12:30:26 +05:30
Sagar Vora
eba76c99a3
Merge branch 'master' into develop
2019-02-20 12:11:25 +05:30
Sagar Vora
d48393541d
bumped to version 11.1.8
2019-02-20 12:31:25 +05:50
Gaurav Naik
3bf0acbac6
fix(regional,italy): renamed validate hook for address ( #16732 )
2019-02-20 12:08:53 +05:30
Rohit Waghchaure
7e02e1c3cd
fix: not able to cancel maintenance visit
2019-02-19 22:53:31 +05:30
deepeshgarg007
1b04534095
fix: Removed duplicate fields from BOM Item
2019-02-19 21:36:12 +05:30
deepeshgarg007
942c894f93
fix: fetch item name in item dashboard
2019-02-19 19:51:23 +05:30
Rohit Waghchaure
f4049f9dfd
fix: user progress issue
2019-02-19 19:46:14 +05:30
Rohit Waghchaure
389cd6ad63
fix: stop button not working in material request
2019-02-19 19:18:07 +05:30
scmmishra
62968b318f
wip
2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Sagar Vora
f5c511c193
bumped to version 11.1.7
2019-02-19 18:14:14 +05:50
Nabin Hait
2c23f98b65
Merge pull request #16721 from nabinhait/ar-ap-fix
...
fix: AR/AP report based on account type
2019-02-19 17:45:30 +05:30
Gaurav
3f046136d4
fix(regional,italy): added state code on address, updated patch
...
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
2019-02-19 17:28:36 +05:30
Nabin Hait
e4f73929c4
fix: AR/AP report based on account type
2019-02-19 17:11:50 +05:30
scmmishra
cb8ef96f6b
chore (css): Switched to frappe navbar
2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36
fix (css): Removed container class
2019-02-19 17:01:31 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes
2019-02-19 15:07:46 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision
...
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix
2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
...
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
...
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
Gaurav
2670ad7eb2
mod(regional,italy): adjusted calculation logic for charges
...
validation for missing code on mode of payment
UOM from settings
Replace str with cstr
2019-02-19 13:15:25 +05:30
scmmishra
765529241e
[Major][Breaking] More changes
2019-02-19 13:06:33 +05:30
scmmishra
da39da627c
[Major][Breaking] Server side changes to handle Topic Layer
...
- Moved `get_course_progress` to CourseEnrollment class.
- Added Topic context to progress functions in lms.py
- Create user on creation of a student
2019-02-19 13:06:33 +05:30
scmmishra
cc7290b7af
[Major][Breaking] Student Class
2019-02-19 13:06:33 +05:30
scmmishra
766f68a20a
[Major][Breaking] Modified lms.py and utils
2019-02-19 13:06:33 +05:30
scmmishra
e7d52c594b
[Major][Breaking] Program Enrollment Creates Course enrollment
2019-02-19 13:06:33 +05:30
scmmishra
1253061055
[Major][Breaking] Modified Course Doctype, added Topic based functions
2019-02-19 13:06:33 +05:30
scmmishra
42f50fd82c
[Major][Breaking] Added Topic Layer in Course
2019-02-19 13:06:33 +05:30
scmmishra
699f7c6fee
Minor changes
2019-02-19 13:06:33 +05:30
scmmishra
42f3c51ff7
Removed Content Doctype
2019-02-19 13:06:33 +05:30
scmmishra
6663ca1d7f
Adding Test Utils
2019-02-19 13:06:33 +05:30
scmmishra
c51f738b03
Refactored student creation
2019-02-19 13:06:33 +05:30
scmmishra
689500d081
Minor UI Fixes
2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0
UI Improvements: Added Custom Navbar
2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d
Added quiz card on profile page
2019-02-19 13:06:33 +05:30
scmmishra
4d10229cef
Quiz Progress and Minor fixes
2019-02-19 13:06:33 +05:30
scmmishra
c84a318591
Student and User link for LMS added
2019-02-19 13:06:33 +05:30
scmmishra
b3154efa84
UI Fixes
2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d
More Improvements
2019-02-19 13:06:33 +05:30
scmmishra
02420bd4ba
Client side improvements
2019-02-19 13:06:33 +05:30
scmmishra
edc54cd5f6
Minor improvements for CardList.vue
2019-02-19 13:06:33 +05:30
scmmishra
2955851867
Built Student Profile Page
2019-02-19 13:06:33 +05:30
scmmishra
308f235859
Added Profile page
2019-02-19 13:06:33 +05:30
scmmishra
201fec3101
Minor Improvements
2019-02-19 13:06:33 +05:30
scmmishra
97c994f394
create course enrollment if not already enrolled for a program
2019-02-19 13:06:33 +05:30
scmmishra
affbfe7d0c
Added get_program_meta
2019-02-19 13:06:33 +05:30
scmmishra
cbb7c7ff23
ui fixes
2019-02-19 13:06:33 +05:30
scmmishra
cc755f6204
Doctype Changes for Beta Release
2019-02-19 13:06:33 +05:30
scmmishra
788ffbd5b6
Minor improvements
2019-02-19 13:06:33 +05:30
scmmishra
9229f4fc92
UI fixes
2019-02-19 13:06:33 +05:30
scmmishra
082e3c94ef
Minor Fixes: Student Enrollment
2019-02-19 13:06:32 +05:30
scmmishra
fdbabde80a
UI fixes for course card
2019-02-19 13:06:32 +05:30
scmmishra
be7fadc521
Renamed CoursePage to ContentPage
2019-02-19 13:06:32 +05:30
scmmishra
d93cec374d
Minor UI changes
2019-02-19 13:06:32 +05:30
scmmishra
a592f70d4a
Refactored Course Progression Logic
2019-02-19 13:06:32 +05:30
scmmishra
1192529698
Refactored lms.py, modified utils
2019-02-19 13:06:32 +05:30
scmmishra
8951c165f0
Fixed major bugs
2019-02-19 13:06:32 +05:30
scmmishra
53c2d5db63
Refactored lms store
2019-02-19 13:06:32 +05:30
scmmishra
0a5c7a6b46
Removed unnecessary prints
2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c
Refactored server side code
2019-02-19 13:06:32 +05:30
scmmishra
19e12ac3d6
Minor changes to quiz doctype
2019-02-19 13:06:32 +05:30
scmmishra
80ecc56cbe
Using lms.call across the Vue app
2019-02-19 13:06:32 +05:30
scmmishra
0a4902f8b5
UI Changes
2019-02-19 13:06:32 +05:30
scmmishra
c5a1226e93
Refactored State management store
2019-02-19 13:06:32 +05:30
scmmishra
85c2feec0d
Added ListPage and other UI improvements
2019-02-19 13:06:32 +05:30
scmmishra
efb01c3f75
Renamed components
2019-02-19 13:06:32 +05:30
scmmishra
2596ea0816
Renamed Vue Files
2019-02-19 13:06:32 +05:30
scmmishra
0225642459
Renamed Pages
2019-02-19 13:06:32 +05:30
scmmishra
8ff1028665
Renamed AcademyRoot to lmsRoot
2019-02-19 13:06:32 +05:30
scmmishra
1fbe2d4b2b
Renamed academy to lms (Client Side)
2019-02-19 13:06:32 +05:30
scmmishra
35bf561a6f
Renamed academy to lms on server side
2019-02-19 13:06:32 +05:30
scmmishra
44921a3ee9
Renamed default element for Vue to mount on
2019-02-19 13:06:32 +05:30
scmmishra
91bbe776c1
Modified academy.call
to point to erpnext.www.lms
2019-02-19 13:06:32 +05:30
scmmishra
af30b771f0
Renamed academy to lms on server side
2019-02-19 13:06:32 +05:30
scmmishra
f9f7318d3f
Deleted Old LMS Content
2019-02-19 13:06:32 +05:30
scmmishra
d7c993f028
Minor UI changes
2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717
Fixed course and content page
2019-02-19 13:06:32 +05:30
scmmishra
db9c8b795a
Functions now have a login context
2019-02-19 13:06:32 +05:30
scmmishra
708756ed40
Added academy namespace
2019-02-19 13:06:32 +05:30
scmmishra
892b0c23fc
Added class functions
2019-02-19 13:06:31 +05:30
scmmishra
cc166c01eb
Improved Client implementation
2019-02-19 13:06:31 +05:30
scmmishra
c1b1a5ec37
Permission Changes
2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37
More Bug fixes UI and Permissions
2019-02-19 13:06:31 +05:30
scmmishra
05e07b44b1
Removed unused utils functions
2019-02-19 13:06:31 +05:30
scmmishra
734a746687
Minor DocType changes
2019-02-19 13:06:31 +05:30
scmmishra
b409f7a388
Minor UI Changes and Fixes
2019-02-19 13:06:31 +05:30
scmmishra
850dfd0358
Set appropriate permissions
2019-02-19 13:06:31 +05:30
scmmishra
9f316a3b30
Permission changes
2019-02-19 13:06:31 +05:30
scmmishra
86897b3cc8
UI: Kinda fixed "Completed" button render issue
2019-02-19 13:06:31 +05:30
scmmishra
5611bf4e29
Minor change
2019-02-19 13:06:31 +05:30
scmmishra
25e42baeaf
Course completion logic complete
2019-02-19 13:06:31 +05:30
scmmishra
a920bca044
Minor UI fixes
2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06
Added methods to saving Quiz attempts
2019-02-19 13:06:31 +05:30
scmmishra
76222f7acc
Modified add-activity, no duplicates will be saved now
2019-02-19 13:06:31 +05:30
scmmishra
a3afe2a998
Sending session data explicitly
2019-02-19 13:06:31 +05:30
scmmishra
cfce153ed4
Minor UI changes
2019-02-19 13:06:31 +05:30
scmmishra
1f4835b3b4
Added Video UI
2019-02-19 13:06:31 +05:30
scmmishra
6de9cbb52d
Solved minor issue (Last activity not being saved)
2019-02-19 13:06:31 +05:30