Ameya Shenoy
|
2806d83362
|
Merge branch 'master' into staging-fixes
|
2018-11-28 08:12:48 +00:00 |
|
Ameya Shenoy
|
e3136c38e1
|
bumped to version 10.1.73
|
2018-11-28 07:57:27 +00:00 |
|
deepeshgarg007
|
ebe1e12a82
|
Codacy issue fixes
|
2018-11-28 08:21:54 +05:30 |
|
Nabin Hait
|
305c8b1fba
|
Merge pull request #16110 from shreyashah115/fix-timer
[Timesheet] Element selector in Timer
|
2018-11-27 17:57:46 +05:30 |
|
Nabin Hait
|
ce870316c5
|
Merge pull request #16112 from rohitwaghchaure/accounts_receivable_summary_print_issue
[Fix] Accounts receivable summary print is not working
|
2018-11-27 17:57:17 +05:30 |
|
Nabin Hait
|
f642f86982
|
Merge branch 'hotfix' into accounts_receivable_summary_print_issue
|
2018-11-27 17:56:49 +05:30 |
|
Nabin Hait
|
96598936ad
|
fix(test): Fixed tests for discount with margin and period closing voucher
|
2018-11-27 17:48:13 +05:30 |
|
deepeshgarg007
|
c1a3c72b49
|
final dashboard design
|
2018-11-27 17:09:12 +05:30 |
|
Rohit Waghchaure
|
10bcd5113c
|
[Fix] Accounts receivable summary print is not working
|
2018-11-27 16:25:35 +05:30 |
|
deepeshgarg007
|
f31caffa74
|
Changes in get_dashboard_info
|
2018-11-27 15:04:12 +05:30 |
|
Nabin Hait
|
3b16dd7377
|
Merge branch 'staging-fixes' into pr_staging_fixes
|
2018-11-27 14:19:49 +05:30 |
|
Nabin Hait
|
dfd79b0349
|
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
|
2018-11-27 14:19:20 +05:30 |
|
Nabin Hait
|
15ca2f438f
|
Merge pull request #16029 from Alchez/hotfix-child-task-error
Fix error when trying to convert a task into a group even if no child tasks exist
|
2018-11-27 14:17:32 +05:30 |
|
Nabin Hait
|
676a2fbc8a
|
Merge branch 'staging-fixes' into hotfix-child-task-error
|
2018-11-27 14:17:23 +05:30 |
|
deepeshgarg007
|
6372fbba54
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
|
2018-11-27 14:06:58 +05:30 |
|
Nabin Hait
|
3854940e42
|
Merge branch 'staging-fixes' into fix-patch
|
2018-11-27 13:26:05 +05:30 |
|
Nabin Hait
|
e4cc062cf1
|
Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
|
2018-11-27 13:22:50 +05:30 |
|
Nabin Hait
|
b98d08a2cb
|
Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation
[Fix] Incorrect stock value difference because of negative stock
|
2018-11-27 13:21:43 +05:30 |
|
Nabin Hait
|
0090b1aa16
|
Merge pull request #16058 from KanchanChauhan/reflinks-in-related-docs
Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate
|
2018-11-27 13:20:39 +05:30 |
|
Nabin Hait
|
ccb03fb255
|
Merge pull request #16073 from deepeshgarg007/receivable-summary
Accounts receivable summary print fix
|
2018-11-27 13:11:37 +05:30 |
|
shreyashah115@gmail.com
|
5281fe8e50
|
fix: Element selector
|
2018-11-27 13:11:30 +05:30 |
|
Nabin Hait
|
72fc1b57be
|
Merge pull request #16083 from Anurag810/new-fix-branch
[fix] delivery note with quantity equal 0 #14211
|
2018-11-27 13:10:31 +05:30 |
|
Nabin Hait
|
3c31e4ad4b
|
Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items
If is pos is enabled and no pos profile then use the item's default warehouse for packing materials
|
2018-11-27 13:10:14 +05:30 |
|
Nabin Hait
|
6743219dc2
|
Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice
[Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice
|
2018-11-27 13:09:16 +05:30 |
|
Nabin Hait
|
5f7b37ee11
|
Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue
[Fix] No permission for Manufacturing Settings
|
2018-11-27 13:07:44 +05:30 |
|
Rohit Waghchaure
|
6cc2f52fa4
|
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
|
2018-11-27 12:07:03 +05:30 |
|
Nabin Hait
|
dde952d591
|
Merge pull request #16092 from deepeshgarg007/salary_slip
Salary slip earnings and deductions table bug fix
|
2018-11-27 11:39:10 +05:30 |
|
Nabin Hait
|
a9f72bd3ce
|
Merge pull request #16108 from KanchanChauhan/indicators-in-leave-applications
[Minor] Indicators in Leave Application
|
2018-11-27 11:38:44 +05:30 |
|
Nabin Hait
|
9a06543453
|
Merge branch 'staging-fixes' into indicators-in-leave-applications
|
2018-11-27 11:38:29 +05:30 |
|
Nabin Hait
|
9a4cf4dce9
|
Merge pull request #16100 from deepeshgarg007/test-fix
Removed total label from graph
|
2018-11-27 11:37:30 +05:30 |
|
Nabin Hait
|
f48cf001ed
|
Merge branch 'staging-fixes' into test-fix
|
2018-11-27 11:37:22 +05:30 |
|
Nabin Hait
|
be65af5dfe
|
Merge pull request #16101 from SaiFi0102/patch-1
Company rename abbr to consider more DocTypes
|
2018-11-27 11:36:46 +05:30 |
|
Nabin Hait
|
57fa8759ee
|
Merge pull request #16102 from deepeshgarg007/fees
Paid Amount not showing for fees in web portal fix
|
2018-11-27 11:36:27 +05:30 |
|
Nabin Hait
|
df8fb59511
|
Merge pull request #16099 from SaiFi0102/SO-Validate-Set-GrossProfit
Set Gross Profit on server-side validation of Sales Order
|
2018-11-27 11:19:15 +05:30 |
|
Nabin Hait
|
f806cfecaa
|
Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit
|
2018-11-27 11:18:54 +05:30 |
|
Kanchan Chauhan
|
2d0b788105
|
[Minor] Indicators in Leave Application
|
2018-11-27 10:37:23 +05:30 |
|
Nabin Hait
|
0695ea21b5
|
Merge pull request #16019 from frappe-pr-bot/translations-2018-11-19
[Translation] Updated Translations
|
2018-11-26 21:04:13 +05:30 |
|
deepeshgarg007
|
bc513a8828
|
Removed paid amount form Fees doctype
|
2018-11-26 20:43:39 +05:30 |
|
deepeshgarg007
|
a9525de0da
|
paid amount fix in fees
|
2018-11-26 20:34:32 +05:30 |
|
Saif
|
6a9d9d76ef
|
Company rename abbr to consider more DocTypes
|
2018-11-26 19:56:13 +05:00 |
|
Nabin Hait
|
78d9fac0ce
|
Merge branch 'staging-fixes' into pr_staging_fixes
|
2018-11-26 20:25:34 +05:30 |
|
Nabin Hait
|
15951e6e93
|
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
|
2018-11-26 20:25:29 +05:30 |
|
Nabin Hait
|
93595fa60a
|
Merge branch 'staging-fixes' into hotfix-child-task-error
|
2018-11-26 20:24:47 +05:30 |
|
Nabin Hait
|
91c811f170
|
Merge branch 'staging-fixes' into new-fix-branch
|
2018-11-26 20:23:37 +05:30 |
|
Nabin Hait
|
c5064069c7
|
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue
|
2018-11-26 20:23:11 +05:30 |
|
Nabin Hait
|
218fa51dba
|
Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice
|
2018-11-26 20:23:00 +05:30 |
|
Nabin Hait
|
9fba32a917
|
Merge pull request #16098 from rohitwaghchaure/on_uncheck_is_return_clear_reference_number
On disabled is return field clear the reference field
|
2018-11-26 20:20:30 +05:30 |
|
Nabin Hait
|
73e3138a5b
|
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number
|
2018-11-26 20:20:22 +05:30 |
|
deepeshgarg007
|
05c2989698
|
removed total from graph
|
2018-11-26 20:19:57 +05:30 |
|
Nabin Hait
|
0ccc05bdf7
|
Merge pull request #15997 from rohitwaghchaure/address_not_set_from_api
[Fix] Address not set from the API
|
2018-11-26 20:17:03 +05:30 |
|