Neil Trini Lasrado
|
8979e1c7a5
|
Allow Data Import for Student Guardian
|
2016-12-20 11:53:52 +05:30 |
|
Nabin Hait
|
f573d43b90
|
fixed version conflict
|
2016-12-20 11:40:15 +05:30 |
|
Nabin Hait
|
0c10e3b210
|
Merge branch 'hotfix'
|
2016-12-20 11:39:46 +05:30 |
|
Nabin Hait
|
1cc2d7403b
|
bumped to version 7.1.27
|
2016-12-20 12:09:46 +06:00 |
|
Nabin Hait
|
778c1a022d
|
Merge pull request #7236 from rohitwaghchaure/item_variant_issue
[Fix] Timeout error in item attribute validation
|
2016-12-20 11:31:50 +05:30 |
|
Nabin Hait
|
6c433a3012
|
Merge pull request #7264 from rmehta/sms-fix
[fix] https for SMS gateway, now using requests fixes #5404
|
2016-12-20 11:31:17 +05:30 |
|
Rushabh Mehta
|
f944fb9e46
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-19 17:06:56 +05:30 |
|
Rushabh Mehta
|
827588adf2
|
[minor] fixes to job opening
|
2016-12-19 17:06:26 +05:30 |
|
Rushabh Mehta
|
4c210527b2
|
[fix] https for SMS gateway, now using requests fixes #5404
|
2016-12-19 16:22:34 +05:30 |
|
Rushabh Mehta
|
688f2284af
|
[minor] [patch]
|
2016-12-19 13:15:52 +05:30 |
|
Rushabh Mehta
|
a320b1a494
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-19 12:32:44 +05:30 |
|
Rushabh Mehta
|
c3d8479443
|
[minor] allow website user to be selected as employee
|
2016-12-19 12:32:11 +05:30 |
|
Rushabh Mehta
|
e80208e6e5
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-19 12:02:14 +05:30 |
|
Rushabh Mehta
|
6fc6670a25
|
Delete zh-tw.csv (#7260)
|
2016-12-19 11:57:59 +05:30 |
|
Rushabh Mehta
|
99c814b360
|
[fix] paging for products (support)
|
2016-12-19 11:55:10 +05:30 |
|
Rushabh Mehta
|
43d81063f8
|
Delete zh-tw.csv
|
2016-12-19 11:52:09 +05:30 |
|
Nabin Hait
|
7feef1f158
|
test case fixed
|
2016-12-16 16:50:03 +05:30 |
|
Nabin Hait
|
4d76d27dd2
|
translations
|
2016-12-16 16:18:45 +05:30 |
|
Nabin Hait
|
3fe99559ef
|
Fixed negative stock validation message for translation and fixed test cases
|
2016-12-16 15:30:43 +05:30 |
|
Rohit Waghchaure
|
6500ef404d
|
[Fix] Timeout error in item attribute validation
|
2016-12-16 13:35:50 +05:30 |
|
Nabin Hait
|
76d1ec8ca7
|
Merge pull request #7245 from rohitwaghchaure/salary_test_case
[Fix] Test case
|
2016-12-16 12:41:19 +05:30 |
|
Rushabh Mehta
|
9277f3250d
|
[minor] partiall ordered in material request #6858
|
2016-12-16 12:36:50 +05:30 |
|
Rohit Waghchaure
|
61fb496be6
|
[Fix] Test case
|
2016-12-16 12:19:56 +05:30 |
|
Nabin Hait
|
43594b245c
|
changed version to beta
|
2016-12-15 19:37:53 +05:30 |
|
Nabin Hait
|
d25db23fdb
|
[translations]
|
2016-12-15 18:33:39 +05:30 |
|
Nabin Hait
|
565844cfac
|
Change log for v7.2.0
|
2016-12-15 17:49:31 +05:30 |
|
Nabin Hait
|
6eda07e445
|
Fixed merge conflict
|
2016-12-15 16:35:58 +05:30 |
|
Nabin Hait
|
b628971a80
|
Merge branch 'hotfix'
|
2016-12-15 16:35:32 +05:30 |
|
Nabin Hait
|
8a321406b2
|
bumped to version 7.1.26
|
2016-12-15 17:05:32 +06:00 |
|
Nabin Hait
|
f89c96c7a3
|
Merge branch 'standard_filters' into develop
|
2016-12-15 14:57:41 +05:30 |
|
Nabin Hait
|
f02f1bb0c7
|
Added standard filters
|
2016-12-15 14:57:20 +05:30 |
|
Nabin Hait
|
8c61f343b3
|
Validate negative stock on delivery while missing valuation rate for booking expenses
|
2016-12-15 13:46:03 +05:30 |
|
Nabin Hait
|
0c9c6c9608
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2016-12-15 11:52:59 +05:30 |
|
Nabin Hait
|
b08aaa5e20
|
Merge branch 'aruizramon-status-updates-crm' into develop
|
2016-12-15 11:52:18 +05:30 |
|
Nabin Hait
|
f49bbe1142
|
Cleanup of lead and opportunity status updating logic
|
2016-12-15 11:51:54 +05:30 |
|
Rushabh Mehta
|
01fab2ae1c
|
[minor] fix salary slip test
|
2016-12-15 11:43:29 +05:30 |
|
Nabin Hait
|
6a1c0665bc
|
Merge pull request #7227 from nabinhait/country_coa
Chart of accounts for few countries, added test cases for each country
|
2016-12-15 11:31:07 +05:30 |
|
Nabin Hait
|
a107302224
|
Merge pull request #7221 from bhupennewalkar1337/production
Fix#7085 Issue Items Against Production Order
|
2016-12-15 11:30:31 +05:30 |
|
Rushabh Mehta
|
e9d9b8e6f0
|
[fix] demo and process payroll for demo (#7224)
* [fix] demo and process payroll for demo
* [fix] set payroll dates
|
2016-12-15 11:27:35 +05:30 |
|
Nabin Hait
|
1ae8e2c8fa
|
Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232)
|
2016-12-15 11:27:02 +05:30 |
|
Nabin Hait
|
e3edfe2b12
|
Removed quick entry for tax rule
|
2016-12-14 18:44:27 +05:30 |
|
Nabin Hait
|
a756d64fca
|
Chart of accounts for some countries, added test cases for each country
|
2016-12-14 18:40:29 +05:30 |
|
Rushabh Mehta
|
9b049ee154
|
Revert "[Fixes]Payroll Fixes" (#7225)
|
2016-12-14 18:25:11 +05:30 |
|
bhupen
|
9e146669d3
|
Issue Items Against Production Order
|
2016-12-14 17:40:32 +05:30 |
|
Nabin Hait
|
42b6e37d15
|
Merge pull request #7216 from KanchanChauhan/salary-fixes
[Fixes]Payroll Fixes
|
2016-12-14 16:20:08 +05:30 |
|
Kanchan Chauhan
|
c292dd7213
|
[Fixes]Payroll Fixes
|
2016-12-14 15:50:54 +05:30 |
|
Nabin Hait
|
7ac0d294e1
|
Merge branch 'hotfix'
|
2016-12-14 14:33:06 +05:30 |
|
Nabin Hait
|
a9ecc0b700
|
Merge branch 'master' into develop
|
2016-12-14 14:33:06 +05:30 |
|
Nabin Hait
|
673d43cc8e
|
bumped to version 7.1.25
|
2016-12-14 15:03:06 +06:00 |
|
Nabin Hait
|
450a94c6b4
|
Merge pull request #7214 from rohitwaghchaure/pricing_rule_issue_latest
[Fix] Pricing rule issue
|
2016-12-14 14:31:34 +05:30 |
|