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 |
|
rohitwaghchaure
|
94561607f0
|
Merge pull request #16893 from rohitwaghchaure/stock_ledger_report_not_working_v12
fix: stock ledgre report not working
|
2019-03-11 14:52: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
|
2ae018a653
|
Merge branch 'hotfix'
|
2019-03-08 09:39:33 +00:00 |
|
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 |
|
rohitwaghchaure
|
d06212e408
|
Merge pull request #16853 from rohitwaghchaure/pos_profile_changes
fix: POS profile, account for change amount must be cash or bank account
|
2019-03-07 11:28:25 +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 |
|