Commit Graph

16651 Commits

Author SHA1 Message Date
Rushabh Mehta
463808ef9e [fix] ignore duplicate names for program, academic term, academic year, course, instructor 2016-11-14 11:21:11 +05:30
Nabin Hait
4dc263ee12 Merge branch 'hotfix' 2016-11-03 15:17:38 +05:30
Nabin Hait
bb2ede8fab bumped to version 7.1.6 2016-11-03 15:47:38 +06:00
Nabin Hait
a3f393918d Merge pull request #6807 from nabinhait/hotfix
[fix] Get data in opportunity dashboard
2016-11-03 15:13:03 +05:30
Nabin Hait
9f5f534900 set item rate on first selection of item 2016-11-03 14:54:06 +05:30
Nabin Hait
1ac67b873c [fix] Get data in opportunity dashboard 2016-11-03 11:00:09 +05:30
Nabin Hait
ceca7fbc87 Merge pull request #6780 from rohitwaghchaure/float_issue
Change fieldtype from float to currency
2016-11-03 10:49:05 +05:30
Nabin Hait
4c5bd43ec0 Merge pull request #6794 from neilLasrado/hotfix
Documentation Cleanup
2016-11-03 10:41:23 +05:30
Neil Trini Lasrado
f905ee9f0f Updated documentation for warehouse 2016-11-01 18:58:29 +05:30
Neil Trini Lasrado
8b99a06477 Projected qty image cleanup in documentation 2016-11-01 18:48:52 +05:30
Nabin Hait
e0038b428b Merge pull request #6791 from rohitwaghchaure/documentation_issue
[Fix] jinja syntax in documentation
2016-11-01 18:10:18 +05:30
Rohit Waghchaure
c84072b16f [Fix] jinja syntax issue 2016-11-01 17:58:10 +05:30
Nabin Hait
51eed9a128 Merge branch 'hotfix' 2016-11-01 17:44:43 +05:30
Nabin Hait
74874d5785 bumped to version 7.1.5 2016-11-01 18:14:43 +06:00
Nabin Hait
06fe0c7c9d Merge pull request #6790 from neilLasrado/hotfix
Hotfixes for demo
2016-11-01 17:40:03 +05:30
Nabin Hait
8015d60e97 Merge pull request #6772 from frappe/bcornwellmott-patch-3
[fix] Change communication to Linked
2016-11-01 17:31:38 +05:30
Nabin Hait
6dc30c97bc Merge pull request #6788 from rohitwaghchaure/documentation
Article for adjust withhold amount using payment entry
2016-11-01 17:27:18 +05:30
Nabin Hait
508ca3a1ab Merge pull request #6789 from saurabh6790/hotfix
[fix] set default value as empty frappe dict
2016-11-01 17:26:16 +05:30
Nabin Hait
dec9f2558e Update purchase_receipt.py 2016-11-01 17:24:46 +05:30
Neil Trini Lasrado
6da2b08cea Fixes for demo 2016-11-01 17:05:53 +05:30
Neil Trini Lasrado
9dde085144 Fixes to demo 2016-11-01 17:05:43 +05:30
Neil Trini Lasrado
1569cf8eb3 Fix user for demo 2016-11-01 17:05:35 +05:30
Rohit Waghchaure
60e5e4ac2d change fieldtype from float to currency 2016-11-01 16:32:33 +05:30
Saurabh
0cf7f7aee0 [fix] set default value as empty frappe dict 2016-11-01 16:19:33 +05:30
Rohit Waghchaure
2647c9a6ea article for adjust withhold amount using payment entry 2016-11-01 16:04:00 +05:30
Nabin Hait
4dd76f21c9 Merge branch 'hotfix' 2016-11-01 15:05:53 +05:30
Nabin Hait
c538a55a5a bumped to version 7.1.4 2016-11-01 15:35:53 +06:00
Nabin Hait
aa7a329633 Merge pull request #6783 from rohitwaghchaure/v7_1_issue
Hotfix issues
2016-11-01 14:48:06 +05:30
Rohit Waghchaure
53bb687009 hotfix issues 2016-11-01 13:21:43 +05:30
Nabin Hait
22161566ed Update index.md 2016-11-01 12:36:03 +05:30
Nabin Hait
b8617cfdf9 Merge pull request #6777 from nabinhait/hotfix
[fix] Report GLE for Purchase Invoice with Update Stock option
2016-11-01 12:31:51 +05:30
Nabin Hait
c61892501c [fix] Report GLE for Purchase Invoice with Update Stock option 2016-11-01 11:45:32 +05:30
bcornwellmott
3af67fb2c3 Fix syntax 2016-10-31 08:53:37 -07:00
bcornwellmott
8d083f0d10 [fix] Change communication to Linked
Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue.

https://discuss.erpnext.com/t/open-communications-for-rfq/17184
2016-10-31 06:54:01 -07:00
Nabin Hait
07fa5f1377 Merge pull request #6769 from frappe/nabinhait-patch-4
show relevant warehouses in item dashboard
2016-10-31 17:24:25 +05:30
Nabin Hait
b9f708663c Update item.py 2016-10-31 16:52:17 +05:30
Nabin Hait
6ece870b6e Merge branch 'hotfix' 2016-10-31 16:37:29 +05:30
Nabin Hait
60aa3898c7 bumped to version 7.1.3 2016-10-31 17:07:29 +06:00
Nabin Hait
fd3aefd73d Merge pull request #6763 from rohitwaghchaure/documentation
[Fix] Documentation
2016-10-31 16:35:54 +05:30
Nabin Hait
1764da7ba8 Merge pull request #6766 from nabinhait/hotfix
repost gle for Purchase Invoice with update stock
2016-10-31 16:34:35 +05:30
Nabin Hait
f5f3ef1bae repost gle for Purchase Invoice with update stock 2016-10-31 16:17:10 +05:30
Rohit Waghchaure
4fe4f267f4 [Fix] Documentation 2016-10-31 15:40:59 +05:30
Nabin Hait
1e45ec9237 Merge branch 'hotfix' 2016-10-31 15:04:31 +05:30
Nabin Hait
9a8be357e6 bumped to version 7.1.2 2016-10-31 15:34:31 +06:00
Nabin Hait
44281b7a01 Merge pull request #6719 from frappe/bcornwellmott-patch-1
Fix calendar view for Timesheet
2016-10-29 14:41:42 +05:30
Nabin Hait
e585683db3 Merge pull request #6750 from rohitwaghchaure/country_wise_tax_issue
[Fix] country wise tax, country name issue
2016-10-29 14:37:32 +05:30
Rohit Waghchaure
7488cf1ce1 [Fix] country wise tax, country name issue 2016-10-28 18:01:43 +05:30
Nabin Hait
6f0897c258 Merge branch 'hotfix' 2016-10-27 19:14:54 +05:30
Nabin Hait
9dcb778f17 bumped to version 7.1.1 2016-10-27 19:44:54 +06:00
Nabin Hait
5ad56ef446 Merge pull request #6727 from saurabh6790/hotfix
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 19:06:32 +05:30