Commit graph

14692 commits

Author SHA1 Message Date
Nabin Hait
5624047d31 Version 10 change log 2017-12-25 12:26:43 +05:30
rohitwaghchaure
9bb4239dd5 [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#4672) 2017-12-25 11:27:56 +05:30
Prateeksha Singh
ae0234e7e6 [export-fields] export comma separated lines for long values (#4667)
* [export-fields] export comma separated lines for long values, fixes frappe/erpnext#12085

* Update xlsxutils.py
2017-12-22 11:11:13 +05:30
Prateeksha Singh
b9604a1ebb
Merge pull request #4665 from rohitwaghchaure/precision_issue
[Fix] Decimal issue
2017-12-22 11:02:51 +05:30
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Prateeksha Singh
d5ad0ff2e8 Setup stages (#4618)
* setup complete stages

* [setup] better setup-in-progress card

* restructure setup exception flow

* use setup_stages hook

* Add message for non-dev mode, fail instead of error

* message to not include commits in app setup stages
2017-12-21 11:55:49 +05:30
Prateeksha Singh
56bf54322f
Merge pull request #4659 from netchampfaris/fast-bench-build
Faster bench build in development
2017-12-20 14:22:54 +05:30
Prateeksha Singh
a3669c86a5
Merge pull request #4645 from netchampfaris/handle-json-request
Handle content_type application/json in request
2017-12-20 13:16:38 +05:30
Faris Ansari
1de429f275 Faster bench build in development 2017-12-20 12:36:35 +05:30
Manas Solanki
4e95459410 set the desktop icon while saving the domain settings (#4657)
* set the desktop icon while saving the domain settings

* delete the custom icon only if the setup not complete
2017-12-20 11:53:27 +05:30
Nabin Hait
8463937acd Enqueued communication patch if more than 1 lakh records 2017-12-20 11:48:30 +05:30
Saurabh
3ea9f02de2
Merge pull request #4656 from manassolanki/fix-12
fix the key error and add the default date-format in template
2017-12-19 20:02:07 +05:30
Saurabh
65c68f357e
Merge pull request #4655 from manassolanki/fix-import
fix the opening invoice creation tool
2017-12-19 20:01:35 +05:30
Manas Solanki
54b590653b fix the key error and add the default date-format in template 2017-12-19 16:09:43 +05:30
Manas Solanki
4fd6e14275 fix the opening invoice creation tool 2017-12-19 15:39:36 +05:30
Manas Solanki
66a179507c fix for the new docs with the child table (#4654)
* fix for the new docs with the child table

* Update data_import.py
2017-12-19 15:11:42 +05:30
Achilles Rasquinha
41d2f92cfb [MIN] Fix List Renderer (#4652)
* fixed multiple dialog render

* minor fix list renderer
2017-12-19 11:57:00 +05:30
Manas Solanki
50d7caedbb include the error data of the last row (#4649)
* include the error data of the last row

* set the attachment for each doc
2017-12-19 11:49:25 +05:30
Faris Ansari
dfbb47e391 [fix] Multiple uploaded attachments (#4653)
* [fix] Multiple uploaded attachments

* minor
2017-12-19 11:44:23 +05:30
Zarrar
dda8ca42b0 add roles to the user (#4646) 2017-12-18 17:45:21 +05:30
mist-01
e5771e508e Updated docs - add notice about needing to be logged in as Administrator to view developer options. (#4651) 2017-12-18 17:44:32 +05:30
Zarrar
1f1cd101cc remove print statements (#4650) 2017-12-18 17:44:10 +05:30
Faris Ansari
5358f3d927
[fix] Edit Comment (#4648)
fixes frappe/erpnext#12012
2017-12-18 15:02:02 +05:30
Achilles Rasquinha
c4e1ba8bbf Fixed multiple dialog render (#4642) 2017-12-18 15:01:36 +05:30
Faris Ansari
2760f049ac
Fix email_alert test (#4620)
* Test debugging

* Remove test_scheduler user after test

* Set user Administrator

* Remove debugging lines

* Set email user

* more debugging

* set_user Administrator

* minor
2017-12-18 12:55:45 +05:30
Zarrar
9cf4a3a38d correct variable name (#4647) 2017-12-18 12:28:58 +05:30
Nabin Hait
7dad1a35e9
Update add_sms_sender_name_as_parameters.py 2017-12-18 11:50:46 +05:30
Achilles Rasquinha
b31c4ed029 Remove jrumble from build.json, wiggle cleanup (#4643) 2017-12-18 11:40:21 +05:30
Faris Ansari
2724205955 Handle content_type application/json in request 2017-12-17 00:31:11 +05:30
Nabin Hait
7888805f35 Data Import: Fixes in handling errored data 2017-12-15 20:01:36 +05:30
Makarand Bauskar
ecee1825e5 [minor] mapped the __newname field value while editing doc in quick entry (#4615) 2017-12-15 16:39:28 +05:30
Prateeksha Singh
0b84b352e9
Merge pull request #4637 from netchampfaris/more-misc-fixes
Multicheck fixes
2017-12-15 16:05:39 +05:30
Faris Ansari
f307f2a36b Multicheck fixes 2017-12-15 15:54:30 +05:30
Prateeksha Singh
4c795a248d
Merge pull request #4635 from netchampfaris/misc-fixes
Various
2017-12-15 15:43:25 +05:30
Faris Ansari
7576c01172 Various
- Data Import Status in listview
- Commit desk.css
- Remove refresh_fields from set_read_only
2017-12-15 14:50:47 +05:30
Prateeksha Singh
3030c6d212 replace rumble with simple cute wiggling (#4628) 2017-12-15 14:20:24 +05:30
Prateeksha Singh
5763766248 [tags] Remove taggle (#4631) 2017-12-15 14:18:53 +05:30
Prateeksha Singh
db687a2779
Merge pull request #4632 from achillesrasquinha/fix-hr-module-page
[FIX] HR Module Page
2017-12-15 13:48:06 +05:30
Prateeksha Singh
982d6bce54
Merge pull request #4633 from pratu16x7/progress-tooltips
[minor][enhance] Add tooltips for progress and targets
2017-12-15 13:45:52 +05:30
Prateeksha Singh
4fba84f93e [enhance] Add tooltips for progress and targets 2017-12-15 13:44:03 +05:30
Achilles Rasquinha
c4912135cf Fixed HR Module Page 2017-12-15 13:41:43 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Nabin Hait
cc09d3f97b Merge branch 'hotfix' 2017-12-15 12:52:54 +05:30
Nabin Hait
b41bc5c1f9 bumped to version 9.2.24 2017-12-15 13:22:54 +06:00
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
Shreya Shah
e44ee0ae7f disabled user not allowed to reset password (#4630) 2017-12-15 12:15:58 +05:30
Prateeksha Singh
a4ced6e4f2 [modules-page] route if module exists, fixes #4117, fixes frappe/erpnext#11548 (#4621) 2017-12-15 11:39:56 +05:30
tundebabzy
d5dcc0b98f Issue 4616 (#4617)
* fail silently when key not found

* PEP 8: spacing, docstrings

* codacy
2017-12-14 14:57:05 +05:30
Makarand Bauskar
6f164ed975 [minor] removed the default for party type field in address and contacts report (#4614) 2017-12-14 14:53:22 +05:30
Faris Ansari
92c8050527
Checkbox height fix (#4619) 2017-12-14 11:53:15 +05:30