Nabin Hait
346a6a5d84
Update set_sales_person_status.py
2016-12-13 11:27:46 +05:30
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +05:30
Nabin Hait
10de98c0be
bumped to version 7.1.23
2016-12-09 16:15:45 +06:00
Nabin Hait
00ae31bd1c
Merge pull request #7172 from nabinhait/hotfix
...
Issue fixed in Quality Inspection, P&L period and purchase register
2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8
Merge pull request #7171 from rohitwaghchaure/payment_entry_issue
...
[Fix] Payment entry showing wrong invoice amount
2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0
Fixed period end date if year starts in the middle of the month
2016-12-09 15:09:11 +05:30
Nabin Hait
76a8508d2b
Unlink Quality Inspection from PR while cancelling QI
2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176
Fixed renamed fieldname
2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887
[Fix] Payment entry showing wrong invoice amount
2016-12-09 12:55:29 +05:30
Nabin Hait
abd5a92bcc
Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1
...
Exchange rate base on date
2016-12-09 12:34:15 +05:30
Nabin Hait
a0fc404eb8
Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix
...
[Fix] Quoted Item Comparison
2016-12-09 12:18:06 +05:30
Nabin Hait
8e885163a3
Update quoted_item_comparison.py
2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0
Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups
...
[Minor]Added type to Salary Components
2016-12-09 11:50:43 +05:30
Viet Pham
ddb856377c
Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null
2016-12-08 20:02:39 +07:00
Kanchan Chauhan
13f19993c5
[Minor]Added type to Salary Components
2016-12-08 17:50:15 +05:30
Kanchan Chauhan
5c031a3512
[Fix] Quoted Item Comparison
2016-12-08 17:29:04 +05:30
Kanchan Chauhan
0ece9e0e2e
[Fix] Salary Slip Test cases fix
2016-12-08 17:02:36 +05:30
Nabin Hait
352d95344e
Set exchange rate on change of date for Journal/Payment Entry
2016-12-08 16:06:47 +05:30
Nabin Hait
aa0d174d3d
Replaced spaces with tabs
2016-12-08 15:44:16 +05:30
Nabin Hait
3113f00c46
Replaced spaces with tabs
2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
b267a6c90e
Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1
2016-12-08 14:45:12 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
32e5b7af20
Update set_budget_against_as_cost_center.py
2016-12-08 14:42:04 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b
Merge pull request #7094 from manassolanki/budget
...
[Enhancement] Budget Against Project #7036
2016-12-08 13:52:33 +05:30
Nabin Hait
f5460e9e6f
Merge pull request #6846 from KanchanChauhan/payroll-updates
...
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
2016-12-08 13:51:55 +05:30
Nabin Hait
ded059b253
[fix][tests] Fetching serial nos via get item details
2016-12-08 13:20:43 +05:30
Nabin Hait
1b9caf90dd
Merge branch 'master' into develop
2016-12-08 12:33:54 +05:30
Nabin Hait
7b513891e3
bumped to version 7.1.22
2016-12-08 13:03:53 +06:00
Kanchan Chauhan
f7b25cbb6b
[WIP] Payroll Updates
2016-12-08 12:20:20 +05:30
Manas Solanki
482fa672c2
[Fix] Patch for budget_against
2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Rohit Waghchaure
0327b35b5e
[fix] timesheet datetime issue
2016-12-07 18:32:36 +05:30
Manas Solanki
2e0fbdeebe
[Fix] Test Case
...
- Previous test case fixed
- Additional test case for project against budget
2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf
[Fix] More optimized code
2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932
[Fix] Budget against Projects
...
- Test case fixed
- Either cost center or project is mandatory
2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482
[Enhancement] Budget against Project
2016-12-07 18:17:26 +05:30
Rushabh Mehta
b78fc37ce9
[minor] Add button to add help article from Issue #7132 ( #7154 )
2016-12-07 14:41:23 +05:30
James Robertson
e4b9473f83
Fixes erpnext issue 6891 ( #7128 )
...
* Fixes erpnext issue 6891
Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.
* Update to Pull Request #7128
Changes to images to comply with guidelines.
2016-12-07 12:14:51 +05:30
Rushabh Mehta
2167ff589c
[minor] update font awesome icons
2016-12-07 11:09:02 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
bc2deafcf9
bumped to version 7.1.21
2016-12-06 16:44:44 +06:00
Nabin Hait
45fda8a257
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
...
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
...
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-06 15:48:47 +05:30
Nabin Hait
cb3f44716a
Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue
...
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
2016-12-06 15:42:37 +05:30
Nabin Hait
9313a7408c
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
...
[Enhancement] Total row added for report builder
2016-12-06 15:42:19 +05:30
Nabin Hait
e644ca8992
Merge pull request #7146 from RobertSchouten/digest_cache_dev
...
[fix] email digest cache by frequency
2016-12-06 15:41:33 +05:30
