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
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
Rohit Waghchaure
2bfb063fdb
fix(sales order item): not able to search item by description
2019-03-02 21:47:55 +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