Frappe
|
79918c66c2
|
Deleted old Images and added Global Search Help page
|
2017-07-03 15:58:14 +05:30 |
|
Makarand Bauskar
|
960208bae0
|
Merge pull request #9426 from tundebabzy/issue-9096
Gross Profit Does not display Reversal of sales invoice #9096
|
2017-07-03 15:23:21 +05:30 |
|
Makarand Bauskar
|
1bad1fcc00
|
Merge pull request #9452 from faztp12/develop
Customer Query include Search fields
|
2017-07-03 15:20:23 +05:30 |
|
Rushabh Mehta
|
43ef4e9047
|
Added first UI tests (#9532)
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
|
2017-07-03 11:53:07 +05:30 |
|
Makarand Bauskar
|
65f6f2a05e
|
Merge pull request #9568 from frappe/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
|
2017-07-03 10:48:16 +05:30 |
|
Rushabh Mehta
|
558fcc140f
|
Create CODE_OF_CONDUCT.md
|
2017-07-01 21:35:10 +05:30 |
|
mbauskar
|
ea92682cfd
|
Merge branch 'hotfix'
|
2017-07-01 14:16:46 +05:30 |
|
mbauskar
|
a06a600d0a
|
Merge branch 'master' into develop
|
2017-07-01 14:16:46 +05:30 |
|
mbauskar
|
af9d3a4db6
|
bumped to version 8.2.3
|
2017-07-01 14:46:46 +06:00 |
|
Makarand Bauskar
|
f39a9f1c5b
|
Merge pull request #9562 from mbauskar/gst-hsn-code
[minor] fix autoname for GST HSN Code (#9536)
|
2017-07-01 14:15:18 +05:30 |
|
Sagar Vora
|
067991ee30
|
[minor] fix autoname for GST HSN Code (#9536)
|
2017-07-01 14:14:14 +05:30 |
|
Makarand Bauskar
|
1589ada04d
|
Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency
[enhance] Provision to set the currency in the pricing rule for the price
|
2017-06-30 18:58:30 +05:30 |
|
mbauskar
|
ee368221cf
|
[domainify] Domainification for schools doctype
|
2017-06-30 17:58:57 +05:30 |
|
rohitwaghchaure
|
6691856d08
|
Merge pull request #9554 from mbauskar/sales-register
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
|
2017-06-30 16:48:10 +05:30 |
|
Charles-Henri Decultot
|
53de2f1b57
|
Translation correction in P&L report (#9436)
|
2017-06-30 16:45:11 +05:30 |
|
mbauskar
|
22aaf0cbd0
|
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
|
2017-06-30 16:43:25 +05:30 |
|
Sagar Vora
|
8ebc0df65f
|
[minor] fix autoname for GST HSN Code (#9536)
|
2017-06-30 16:42:26 +05:30 |
|
Makarand Bauskar
|
4095915bff
|
Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
|
2017-06-30 16:02:31 +05:30 |
|
Makarand Bauskar
|
abe8e2ecce
|
Merge pull request #9533 from rohitwaghchaure/total_amount_issue
[minor] Total amount not showing value in bank reconcillation
|
2017-06-30 14:50:23 +05:30 |
|
Makarand Bauskar
|
b053674781
|
Merge pull request #9534 from manassolanki/report
Course wise assessment result tool
|
2017-06-30 14:47:46 +05:30 |
|
Manas Solanki
|
bb68f8ca01
|
cleanup for the assessment report and added chart
|
2017-06-30 12:22:51 +05:30 |
|
mbauskar
|
943637e06c
|
Merge branch 'hotfix'
|
2017-06-30 12:00:23 +05:30 |
|
mbauskar
|
0407cb0d92
|
bumped to version 8.2.2
|
2017-06-30 12:30:22 +06:00 |
|
Makarand Bauskar
|
d192a420d1
|
Merge pull request #9549 from rohitwaghchaure/patch_fix_gst
[Fix] Options must be a valid DocType for field Customs Tariff Number
|
2017-06-30 11:59:47 +05:30 |
|
Rohit Waghchaure
|
3856d14ae6
|
[Fix] Options must be a valid DocType for field Customs Tariff Number
|
2017-06-30 11:57:41 +05:30 |
|
Manas Solanki
|
85480b3af7
|
Added report in config/schools.py
|
2017-06-30 11:36:57 +05:30 |
|
Manas Solanki
|
c4125b32ee
|
Course wise assessment reports
|
2017-06-30 11:36:57 +05:30 |
|
Sagar Vora
|
7640858510
|
[minor] fix bom price resetting on validation
|
2017-06-29 22:20:07 +05:30 |
|
mbauskar
|
4e08dfc72f
|
Merge branch 'develop'
|
2017-06-29 21:58:08 +05:30 |
|
mbauskar
|
53e34f5c1c
|
bumped to version 8.2.1
|
2017-06-29 22:28:08 +06:00 |
|
Makarand Bauskar
|
c6e1c3c048
|
Merge pull request #9537 from mbauskar/patch
[minor] fixed the report value for deprecated report patch
|
2017-06-29 21:57:09 +05:30 |
|
mbauskar
|
0c2de6e07a
|
[minor] fixed the report value for deprecated report patch
|
2017-06-29 21:47:14 +05:30 |
|
Rohit Waghchaure
|
b801357ecf
|
[minor] Total amount not showing value in bank reconcillation
|
2017-06-29 18:40:01 +05:30 |
|
mbauskar
|
1508267fd6
|
Merge branch 'develop'
|
2017-06-29 15:07:26 +05:30 |
|
mbauskar
|
8f1f93603d
|
bumped to version 8.2.0
|
2017-06-29 15:37:26 +06:00 |
|
Aditya Duggal
|
f1bd39c937
|
Allow NA values in GSTIN number (#9503)
-Reason for allowing NA value is that if a user wants to make GSTIN number mandatory then they can do the same easily
|
2017-06-29 14:25:19 +05:30 |
|
Manas Solanki
|
800c69eec3
|
validate the duplicate assessment criteria
|
2017-06-29 13:00:22 +05:30 |
|
mbauskar
|
ec252c806f
|
resolved merge conflicts
|
2017-06-29 12:11:07 +05:30 |
|
mbauskar
|
2a903a0608
|
Merge branch 'hotfix'
|
2017-06-29 12:09:40 +05:30 |
|
mbauskar
|
71b4e48ea5
|
bumped to version 8.1.7
|
2017-06-29 12:39:39 +06:00 |
|
Makarand Bauskar
|
ae2d92ee76
|
Merge pull request #9523 from saurabh6790/setup_wiz_fix
[fix] translate domain
|
2017-06-29 12:07:19 +05:30 |
|
Saurabh
|
21cf1fd851
|
[fix] translate domain
|
2017-06-29 12:04:45 +05:30 |
|
Makarand Bauskar
|
02c281cc2f
|
Merge pull request #9522 from rmehta/update-gstin-2
[fix] update-gstin
|
2017-06-29 12:01:20 +05:30 |
|
Makarand Bauskar
|
a938d3956a
|
[minor] get doc using party_name instead of party
|
2017-06-29 11:58:50 +05:30 |
|
Rushabh Mehta
|
02b0ed4199
|
[fix] update-gstin
|
2017-06-29 11:56:14 +05:30 |
|
Vishal Dhayagude
|
76f93d05b7
|
display image in supplier's list view (#9500)
* [fix]display supplier image in desk
* Supplier image displayed in desk
* Show image in supplier desk page
* [minor] removed whitespaces
|
2017-06-29 11:23:13 +05:30 |
|
Makarand Bauskar
|
24ab20fe11
|
Merge pull request #9467 from rohitwaghchaure/support_hours_report
[enhance] Report for analysis of support hours count
|
2017-06-29 11:19:41 +05:30 |
|
Makarand Bauskar
|
1eb31db71f
|
Merge pull request #9466 from manassolanki/validation
changes in student settings for validating the students in the student groups
|
2017-06-29 10:48:59 +05:30 |
|
Makarand Bauskar
|
ef95b4d6e3
|
Merge pull request #9468 from manassolanki/issue-11
in program enrollment filter out students which are already enrolled
|
2017-06-29 10:48:12 +05:30 |
|
Makarand Bauskar
|
514c0417dd
|
Merge pull request #9483 from manassolanki/fix-student-fetch
fetch queries for the students in the student group
|
2017-06-29 10:47:05 +05:30 |
|