Commit graph

14206 commits

Author SHA1 Message Date
mbauskar
025baf5b9f Merge branch 'master' into develop 2017-10-09 15:17:33 +05:30
mbauskar
9439a808a1 Merge branch 'hotfix' 2017-10-09 15:17:32 +05:30
mbauskar
14898d1126 bumped to version 9.1.3 2017-10-09 15:47:32 +06:00
tundebabzy
546c251e56 Empty Child Table Row Should Delete On Save (#4202) (#4243)
* add new function `remove_empty_rows`

* removes empty rows before `check_name` in `save`

* codacy clean up
2017-10-09 13:22:16 +05:30
Makarand Bauskar
91a6c5b246 [minor] create __init__ file, passed create_init=True explicitly (#4265) 2017-10-09 13:17:03 +05:30
Makarand Bauskar
ad596b56d7 [minor] don't update the parent's status to Replied on Communication Update (#4266) 2017-10-09 13:16:25 +05:30
rohitwaghchaure
60078d61a3 Custom Attach field, user not able to attach file (#4274) 2017-10-09 13:14:21 +05:30
Makarand Bauskar
ecd1550c3b [minor] fixes for delete chat button (#4277) 2017-10-09 13:10:23 +05:30
Makarand Bauskar
229f676645 [hotfix] minor fixes in the Email Communication subject field (#4278) 2017-10-09 13:09:41 +05:30
Faris Ansari
e83959a345 Fixes for Data Migration Tool (#4275) 2017-10-09 13:08:50 +05:30
Achilles Rasquinha
7d44cef80c updated travis (#4281) 2017-10-09 13:07:27 +05:30
rohitwaghchaure
705d48619c [Fix] Signature not displying in the PDF (#4271) 2017-10-09 08:46:35 +05:30
Saurabh
5cd9e167d8 Merge branch 'hotfix' 2017-10-06 17:28:04 +05:30
Saurabh
54c989b247 Merge branch 'master' into develop 2017-10-06 17:28:04 +05:30
Saurabh
8526299650 bumped to version 9.1.2 2017-10-06 17:58:03 +06:00
Saurabh
52d1e7300b [fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters (#4269) 2017-10-06 17:23:12 +05:30
Makarand Bauskar
36a0782564 [minor] moved the Website Name field to top (#4258) 2017-10-06 11:48:13 +05:30
Revant Nandgaonkar
d80a8e8804 Oauth2 implicit grant fixes tests (#4261)
* [Fix] Implicit Grant / Token

* test for oauth2 implicit grant
2017-10-06 11:47:33 +05:30
Faris Ansari
e55205fba5 Autocomplete control (#4259)
* Add Autocomplete control

* fix onchange event

* Fix sidebar.js

* Update autocomplete.js
2017-10-05 19:38:24 +05:30
Makarand Bauskar
946137717b [hotfix] check if doc has valid title value (#4255) 2017-10-05 15:28:30 +05:30
mbauskar
52a7b5b0b9 Merge branch 'hotfix' 2017-10-05 13:35:51 +05:30
mbauskar
2882a0193d Merge branch 'master' into develop 2017-10-05 13:35:51 +05:30
mbauskar
5830b52321 bumped to version 9.1.1 2017-10-05 14:05:51 +06:00
rohitwaghchaure
192fae169c [Fix] Letter head not displaying proper in the pdf (#4251) 2017-10-05 13:01:35 +05:30
Prateeksha Singh
a9783a2e98 Upgrade button in sidebar, cleanup usage page (#4227)
* upgrade button in sidebar, cleanup usage page

* [fix] check if in trial for sidebar

* make upgrade box dismissable

* Update list_sidebar.js
2017-10-05 11:22:51 +05:30
Makarand Bauskar
a5bc359b10 [hotfix] validate the image field on doctype or customize form update (#4244) 2017-10-05 11:21:01 +05:30
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Nabin Hait
dfbff09b52 Merge branch 'master' into develop 2017-10-04 18:20:51 +05:30
Nabin Hait
311dff662a Merge branch 'staging' 2017-10-04 18:20:50 +05:30
Nabin Hait
7bf5b6eec2 bumped to version 9.1.0 2017-10-04 18:50:49 +06:00
Nabin Hait
fde8080e6a Merge branch 'master' into staging 2017-10-04 18:18:06 +05:30
Nabin Hait
678f29329c Merge branch 'master' into develop 2017-10-04 18:18:05 +05:30
Nabin Hait
143032065c Merge branch 'hotfix' 2017-10-04 18:18:05 +05:30
Nabin Hait
fafab5620f bumped to version 9.0.10 2017-10-04 18:48:05 +06:00
Makarand Bauskar
58fd830b92 [revert] pull emails from all incoming email accounts instead of enqueuing single email account (#4247) 2017-10-04 18:17:05 +05:30
Nabin Hait
5d3f41bb26 Merge branch 'develop' into staging 2017-10-04 18:13:46 +05:30
Nabin Hait
86e283ecdb Merge branch 'master' into staging 2017-10-04 18:12:10 +05:30
Nabin Hait
936e84f345 Merge branch 'master' into develop 2017-10-04 18:12:10 +05:30
Nabin Hait
4d38e4e435 Merge branch 'hotfix' 2017-10-04 18:12:09 +05:30
Nabin Hait
f587f3a4a9 bumped to version 9.0.9 2017-10-04 18:42:09 +06:00
Makarand Bauskar
9b32196c11 [minor] don't update the parent status if comment is added (#4241) 2017-10-04 17:59:32 +05:30
Rushabh Mehta
cea04fae17 [fix] locking for set_default (#4245) 2017-10-04 15:29:16 +05:30
Nabin Hait
4140bf809f minor fix in old patch 2017-10-04 15:19:53 +05:30
Rushabh Mehta
550acb5e1c Revert "[fix] Disabled document not validated on save/submit #10571" (#4240)
* Revert "Force uploads to be private by default (#4159)"

This reverts commit 2191a7d3a4.

* Revert "[fix] Disabled document not validated on save/submit #10571 (#4195)"

This reverts commit 13a3205277.
2017-10-04 10:55:54 +05:30
bcornwellmott
2191a7d3a4 Force uploads to be private by default (#4159)
* Make uploads private by default

* Fixed first attempt private

* Removed accidental debugger

* Added check for image

* Added public option for attaching

* Get rid of whitespace
2017-10-02 17:04:14 +05:30
Utkarsh Goswami
13a3205277 [fix] Disabled document not validated on save/submit #10571 (#4195)
* validation for disabled document

* Update utils.py
2017-10-02 16:56:59 +05:30
KanchanChauhan
8c8e9fdd98 No Tags was not counting emtpy tags (#4231) 2017-10-02 16:56:27 +05:30
Achilles Rasquinha
612b94c367 [FIX] new babel-presets (#4232)
* [FIX] babel-presets

* comment out minify

* Update build.js
2017-10-02 16:55:31 +05:30
Nabin Hait
ee70e152f0 return in set_value_if_null 2017-10-02 16:20:09 +05:30
Nabin Hait
451b48e4e2 Update document status via communication if not feed (#4234) 2017-10-02 15:55:46 +05:30