Commit graph

222 commits

Author SHA1 Message Date
Aditya Hase
ad0086c7ea feat: Add Track Views field to Customize Form (#7465) 2019-05-14 16:07:53 +05:30
Shivam Mishra
b79d35033f feat: disable customize option for single doctypes 2019-05-06 18:42:28 +05:30
Rushabh Mehta
ac721a6f34 feat(grid): Move row to a particular id 2019-04-21 21:06:06 +05:30
Faris Ansari
c9fac081b8
Merge pull request #7128 from Mangesh-Khairnar/rating-control
Feature: Rating control
2019-03-28 14:16:12 +05:30
Faris Ansari
8081ad1c38
fix: Remove deprecated fields from Customize Form (#7143) 2019-03-27 15:42:21 +05:30
Mangesh-Khairnar
dfe55b6d97 feat: add rating control in docfield, custom docfield, custom form field 2019-03-25 16:47:28 +05:30
Suraj Shetty
fda05cab83
Merge pull request #7097 from netchampfaris/refactor-custom-script
fix: Custom Script form and UX
2019-03-22 10:17:09 +05:30
Faris Ansari
13512a4444 fix: Missing semicolon 2019-03-21 14:43:21 +05:30
Faris Ansari
9d1b8f896a fix: Custom Script form helpers and UX 2019-03-21 14:30:43 +05:30
Faris Ansari
dbd478dea4 fix(Custom Script): Remove script_type field 2019-03-21 14:29:57 +05:30
Faris Ansari
19c4f6086e fix: Remove cscript and cur_frm from all client scripts
- DocType
- Report
- Property Setter
- Newsletter
- Currency
- Contact
- Address and Contact
2019-03-20 17:29:43 +05:30
Frappe Bot
94ea028db3 Merge branch 'master' into develop 2019-03-08 09:38:18 +00:00
Suraj Shetty
d04188283c
Merge pull request #6991 from sagarvora/fetch_only_once
feat(core): New DocField "Fetch If Empty"
2019-03-04 12:31:18 +05:30
Sagar Vora
0483877c9d feat: New DocField "Fetch If Empty" 2019-02-26 21:46:15 +05:30
Saurabh
f638a500ae Merge branch 'master' into develop 2019-02-20 18:12:48 +05:30
Faris Ansari
82036241e2 fix: Dont set doctype if it is not set (#6966) 2019-02-20 17:36:07 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Sagar Vora
4e3684ee2a
fix: there are 28 fields in Event, not 30 (#6850) 2019-01-29 21:31:11 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Sagar Vora
fe3fe0a4b8 Merge branch 'master' into staging-fixes 2019-01-29 17:08:58 +05:30
Zarrar
94d0489674 fix: Customize Form and Custom DocType related fixes (#6645)
* display Customize option in menu bar only for standard DocType

* disallow opening of custom doctype in Customize Form

* make fields dependent on is_submittable property visible for child table

* throw message that custom fields can only be added to standard doctype

* set query similar to the one in Customize Form for DocType selection

* only hide customize option [fix]

* add core doctypes list in model and use it from there

* avoid editing of core doctype from Customize Form or Custom Field

* test case updated and additional test for core doctypes added

* codacy fix
2019-01-25 11:21:10 +05:30
Faris Ansari
3b86f16b73 New Control: Table MultiSelect (#6675)
* feat(control): Add Table MultiSelect control

* fix: Use btn-group instead of span

* fix: Remove functionality

* fix: Add 'Table MultiSelect' to Field doctypes

* fix: Replace usage of string 'Table' with array `table_fields`

* fix: Use internal array to store values instead of building from HTML elements

* fix(style): Add semicolon

* fix: Read only mode and click to navigate to form

* style: indent

* fix: fallback to empty array

* fix: Add formatters in js and py

* style: missing semicolon

* fix: Add docfield validation
2018-12-28 15:36:59 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Prateeksha Singh
c964d1420c [custom-field] Admin-owned programmed fields 2018-12-11 16:10:02 +05:30
Faris Ansari
5562134990 fix: Add to Custom Field 2018-11-26 13:06:35 +05:30
Aditya Hase
02d8edd332 [Feature] Markdown Editor (#6383)
* feat(markdown-editor): Add new fieldtype - MarkdownEditor

* feat(markdown-editor): Add MarkdownEditor control

* fix(markdown-editor): Fix placement of "Show Preview" button

* fix(markdown-editor): Render HTML in prints
2018-11-22 11:37:50 +01:00
Faris Ansari
48c5345ce6 fix: Set Code options to JS
For Custom Script, DocField and Customize Form Field
2018-11-06 12:30:56 +05:30
Ameya Shenoy
63c5613f92
Merge branch 'staging' into develop 2018-10-11 10:11:26 +00:00
Suraj Shetty
e85589f46c HTML Editor control (#6237)
* Add HTML editor

* Add HTML editor map to db_schema.py

* Revert permission change
- ref #6218

* Fix typo

* Add HTML Editor entry to customize form field

* Update customize_form_field.json

* Update permissions.py

* Debounce preview generation

* Translate strings
2018-10-11 14:07:16 +05:30
Ameya Shenoy
960d568427
Merge branch 'staging' into develop 2018-10-05 09:08:07 +00:00
Sagar Vora
30a0592feb fix create_custom_field to accept all parameters of df (#6186) 2018-10-05 11:30:32 +05:30
Ameya Shenoy
387f556dd5
Merge branch 'staging' into develop 2018-10-04 11:41:29 +00:00
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133)
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
2018-10-02 10:12:55 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +05:30
Rushabh Mehta
be61b74c2a [minor] remove check from update password, default dropbox broker 2018-07-17 18:14:57 +05:30
Suraj Shetty
6e874fbac4 Fix custom script help (#5635) 2018-06-01 12:09:31 +05:30
Zarrar
e76b3eef4e [Enhance] New DocField - 'Fetch From' (#5563)
* add new docfield fetch_from - serves as add_fetch

* replace options.split with fetch_from.split

* copied data from options to fetch_from

* patch to update fetch_from for docfield, custom_field and property_setter

* update tests according to fetch_from change
2018-05-23 11:07:57 +05:30
Rushabh Mehta
b4650f42a1 [minor] remove in_dialog old property 2018-05-16 12:51:01 +05:30
Rushabh Mehta
e5d2c82760 [minor] ignore_validate option while creating custom fields 2018-04-26 10:09:40 +05:30
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Sunny
fa46d65754 set fieldname for Section Break and Column Break, only if fieldname is not set, else it breaks existing custom fields. Also Use label for creating fieldname if user has entered label 2018-03-14 08:52:56 +05:30
schilgod
a01275d71c set fieldname for Section Break and Column Break, only if fieldname is not set, else it breaks existing custom fields. Also Use label for creating fieldname if user has entered label (#5171) 2018-03-12 11:50:02 +05:30
Nabin Hait
1e55b7cc68 Fixed merge conflict 2018-03-09 16:37:43 +05:30
Zarrar
d49f9e417b Allow col_break & sec_break without label (#5123) 2018-03-08 10:52:57 +05:30
Achilles Rasquinha
abb7f14bbd self.assertEqual 2018-02-28 21:19:01 +05:30
Faris Ansari
e581be9fa8 Add translation support for DocFields (#5002)
* Initial changes for Translation

* Merged translate app into frappe core

* Minor typo fix

* Fixes while syncing translations

* Set defaults

* Fixes on setup

* Improve Code Quality

* Could Code Quality be Improved?

* Small code tweaks

* Minor typo fix

* Addition of Translatable Property

* Small fixes for Codacy Comments

* Simplify code

* Show translations in grid

* Remove enabled from Language

* Revert render_template logic

* typo

* Cleanup unused methods

* move patch to erpnext

* fix codacy

* Update patches.txt

* Update patches.txt
2018-02-16 15:12:12 +05:30
Manas Solanki
267d16575c throw message for the bad add fetch (#4939)
* throw message for the bad add fetch

* wrong fieldname in the error message of add fetch configuration
2018-02-02 11:32:57 +05:30
Prateeksha Singh
2bb25442fd
Merge pull request #4876 from pratu16x7/hotfix
ignore xss on barcode by default, fixes frappe/erpnext#11973
2018-01-19 15:16:19 +05:30
Prateeksha Singh
077230c922 ignore xss on barcode by default, fixes frappe/erpnext#11973 2018-01-19 15:11:27 +05:30
Harsh Patel
b1bbc16c99 Fixed ERPNext issue #12282 (#4754)
* Proposed fix for issue #12282

* [Mod] Modified the get_value in test_customize_form.py for method "test_save_customization_field_property"

* [Fix] Does not allow changing the property of standard fields only.

* [Mod] Code documentation in test_customize_form.py
2018-01-09 15:43:22 +05:30