Commit Graph

25701 Commits

Author SHA1 Message Date
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
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
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
Rohan Bansal
e66f59654e fix(report): Incorrectdata for balance quantity and value in Stock Balance report 2019-03-06 16:04:11 +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
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
Prateeksha Singh
6e28ef425a
Merge pull request #16845 from hrwX/additional_salary_develop
fix(Additional Salary): Additional salary develop
2019-03-05 17:49:23 +05:30