mbauskar
4b7a30b527
bumped to version 8.2.4
2017-07-05 11:55:14 +06:00
Doridel Cahanap
5ad4a6e161
Total Stock Summary ( #9465 )
...
* Total Stock Summary
* indentation fixes and removed the for loop
* minor fixes in total stock summery report
2017-07-05 10:49:09 +05:30
rohitwaghchaure
10a4a13e5e
Remove gst reports for non indian accounts ( #9553 )
...
* remove gst reports for non indian accounts
* [Fix] GSN code auto name
2017-07-04 16:45:29 +05:30
Frappe PR Bot
3ceab64bfa
[translation] translation updates ( #9611 )
2017-07-04 16:08:14 +05:30
tundebabzy
6015f0f2ec
Inspection required before delivery isn't working for item variants ( #9362 )
...
* makes `copy_attributes_to_variant` to not ignore "Table"
* fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant`
* adds test case - tables in templates should be copied to variants
* [ci] use deprecated trusty build for now
2017-07-04 15:43:02 +05:30
rohitwaghchaure
e5ca48a76a
[fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice ( #9593 )
2017-07-04 10:54:23 +05:30
rohitwaghchaure
3e4bcfe2d8
[Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' ( #9585 )
...
* [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause'
* escaped company name in get_opening_accounts
2017-07-04 10:49:37 +05:30
Prateeksha Singh
5e4c8ecd62
Setup wizard refactor ( #9441 )
...
* cleaned up slides, yet to decide on master data
* remove item_count
* [fix] refresh slides on domain bug
* UI test
* set header image here in ERPNext
* [minor] lint checks
* [wiz] change autofilled fiscal year format
* [minor] fixed date format to dd-mm-yyyy if fiscal year is not available for country
2017-07-03 18:23:57 +05:30
Makarand Bauskar
11df066ed0
Merge pull request #9586 from Arundhatii/28June
...
Added help page for Global Search and updated old images #9241
2017-07-03 16:24:39 +05:30
Makarand Bauskar
87f2848aeb
resolved conflicts
2017-07-03 16:24:01 +05:30
Makarand Bauskar
12450fa473
Merge pull request #9558 from mbauskar/domainify-school
...
[domainify] Domainification for the Education Domain
2017-07-03 16:17:21 +05:30
Frappe
67bbcf6932
Resolved conflicts in index.md
2017-07-03 16:00:07 +05:30
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
