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
|
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 |
|
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 |
|
Nabin Hait
|
7f02659425
|
Merge branch 'hotfix' into address_not_set_from_api
|
2018-11-26 20:16:54 +05:30 |
|
Nabin Hait
|
9170c2daab
|
Merge pull request #15989 from deepeshgarg007/bug-fixes
Minor issue fixes
|
2018-11-26 20:05:25 +05:30 |
|
Nabin Hait
|
b32abde2ac
|
Merge branch 'staging-fixes' into bug-fixes
|
2018-11-26 20:05:09 +05:30 |
|
Nabin Hait
|
2598c475ed
|
Merge pull request #15999 from codingCoffee/css
css: build files in v10
|
2018-11-26 20:02:18 +05:30 |
|
Saif Ur Rehman
|
5fdbc68ca3
|
Set Gross Profit on server-side validation of Sales Order
|
2018-11-26 19:32:16 +05:00 |
|
Rohit Waghchaure
|
b4a5993ece
|
On uncheck is return field clear the reference field
|
2018-11-26 20:02:01 +05:30 |
|
Nabin Hait
|
21983b8432
|
Merge pull request #16001 from jsukrut/staging-fixes
[FIX][#15018][PATIENT Relation should be unique]
|
2018-11-26 20:01:19 +05:30 |
|
Nabin Hait
|
bcd0ba0d69
|
Merge pull request #16041 from surajshetty3416/pos-profile-fix
fix: Add additional condition to get_pos_profile
|
2018-11-26 19:59:17 +05:30 |
|
Nabin Hait
|
56dc5c1be3
|
Merge branch 'staging-fixes' into pos-profile-fix
|
2018-11-26 19:59:07 +05:30 |
|
Nabin Hait
|
212a29ae2c
|
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
[Fix] Not able to view general ledger for purchase invoice
|
2018-11-26 19:57:24 +05:30 |
|
Nabin Hait
|
25e60f3934
|
Merge pull request #16044 from ESS-LLP/fix-trial-balance
fix: Trial Balance print
|
2018-11-26 19:56:27 +05:30 |
|
Nabin Hait
|
4191d7eb52
|
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
Fixed get_buying_amount in Gross Profit report:
|
2018-11-26 19:55:06 +05:30 |
|
Nabin Hait
|
d0af0887be
|
Merge pull request #16051 from SaiFi0102/patch-1
Remove "Test" Letter Head
|
2018-11-26 19:47:07 +05:30 |
|
Nabin Hait
|
70642a0ae4
|
Merge pull request #16055 from rohitwaghchaure/fixed_holiday_list_not_working
[Fix] New holiday list form is not working
|
2018-11-26 19:44:19 +05:30 |
|
Nabin Hait
|
36f266355d
|
Merge branch 'staging-fixes' into fixed_holiday_list_not_working
|
2018-11-26 19:44:11 +05:30 |
|
Nabin Hait
|
736ce9a176
|
Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation
Fixed error due to incorrect use of 'this' while calculating rate
|
2018-11-26 19:31:25 +05:30 |
|