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
|
9a06543453
|
Merge branch 'staging-fixes' into indicators-in-leave-applications
|
2018-11-27 11:38:29 +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
|
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
|
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
|
b32abde2ac
|
Merge branch 'staging-fixes' into bug-fixes
|
2018-11-26 20:05:09 +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
|
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
|
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 |
|
Saif Ur Rehman
|
147fa73d3f
|
Fixed incorrect use of 'this' causing errors calculating rate
|
2018-11-26 18:14:06 +05:00 |
|
deepeshgarg007
|
bd87903b56
|
Added condition for default amount
|
2018-11-26 17:13:59 +05:30 |
|
Nabin Hait
|
73ca3cfca6
|
fix(test): removed test print
|
2018-11-26 16:16:42 +05:30 |
|
deepeshgarg007
|
533066eb87
|
Salary slip bug fix
|
2018-11-26 15:04:21 +05:30 |
|
Nabin Hait
|
2665c37f38
|
temp(travis): Print statement to fix travis
|
2018-11-26 11:05:28 +05:30 |
|
Nabin Hait
|
48e0e19b03
|
fix(test): Fixed salary slip and sales analytics test cases
|
2018-11-26 11:05:28 +05:30 |
|
Nabin Hait
|
2508d11097
|
fix(test): Test cases fixed
|
2018-11-26 11:05:28 +05:30 |
|
Nabin Hait
|
f77cd54a6c
|
fix(tds): Create tds payable under correct parent
|
2018-11-26 11:05:28 +05:30 |
|
deepeshgarg007
|
9cdece4ca2
|
Test case fix and other minor bug fix
|
2018-11-26 11:05:28 +05:30 |
|
Rohit Waghchaure
|
037a151ef5
|
[Fix] New holiday list form is not working
|
2018-11-22 12:57:34 +05:30 |
|
Saif
|
2a2f2742eb
|
Remove "Test" Letter Head
|
2018-11-21 23:29:09 +05:00 |
|
Ranjith
|
1879e91148
|
fix: Trial Balance
|
2018-11-21 16:04:05 +05:30 |
|
Saif Ur Rehman
|
23eef11cf5
|
Fixed get_buying_amount in Gross Profit report:
To handle the case where there may be multiple invoices for a single delivery
|
2018-11-21 15:32:37 +05:00 |
|
Suraj Shetty
|
1eb098caf9
|
Add additional condition condition to get_pos_profile
- If we have any POS Profile related to the user,
that profile should be used
|
2018-11-21 14:36:58 +05:30 |
|
Rohit Waghchaure
|
770a13ebc3
|
[Fix] Not able to view general ledger for purchase invoice
|
2018-11-20 13:01:52 +05:30 |
|
Jsukrut
|
b9a95e29b7
|
[FIX][#15018][PATIENT Relation should be unique]
|
2018-11-16 11:30:12 +05:30 |
|
deepeshgarg007
|
795686d1cc
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes
|
2018-11-15 16:30:48 +05:30 |
|
Frappe Bot
|
d9dccaefba
|
bumped to version 11.0.3-beta.24
|
2018-11-15 09:42:35 +00:00 |
|
Frappe Bot
|
ef745b0197
|
bumped to version 11.0.3-beta.23
|
2018-11-15 09:37:17 +00:00 |
|
Nabin Hait
|
0aca5aad14
|
Merge pull request #15976 from deepeshgarg007/summary
[Fix] Accounts receivable summary print format showing zero values
|
2018-11-15 14:52:16 +05:30 |
|
Nabin Hait
|
a0a2f58a21
|
Merge pull request #15985 from adityahase/perf-patch
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
|
2018-11-15 14:50:58 +05:30 |
|
Frappe Bot
|
98b4a1bc81
|
Merge branch 'master' into staging-fixes
|
2018-11-15 09:12:04 +00:00 |
|
Frappe Bot
|
2426d00dd6
|
bumped to version 10.1.72
|
2018-11-15 09:04:14 +00:00 |
|
Rohit Waghchaure
|
704796b1cb
|
Code optimization for consolidated financial statement report
|
2018-11-15 13:46:18 +05:30 |
|
rohitwaghchaure
|
02a7f8f0b2
|
Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue
[Fix] Consolidated financial statement report currency conversion issue
|
2018-11-15 12:56:11 +05:30 |
|
Rohit Waghchaure
|
9d0f90975b
|
[Fix] Consolidated financial statement report currency conversion issue
|
2018-11-15 12:55:20 +05:30 |
|
Rohit Waghchaure
|
43920530a1
|
[Minor] Patch fixes
|
2018-11-15 12:20:27 +05:30 |
|