Commit graph

165 commits

Author SHA1 Message Date
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Chinmay Pai
6377bdf6db fix(data_import): use absolute url (#6875)
there is no need to prepend the sitename to the url, since browsers/html are/is smart enough to handle absolute urls.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-05 10:53:31 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Faris Ansari
5ffdeb19fc feat: New filter type "Is Set", "Is Not Set" 2019-01-24 14:26:27 +05:30
Aditya Hase
6b72faf44f style: Linting fixes (#6809)
* style: Remove unused imports

* style: Remove unused local variables
2019-01-23 16:39:55 +05:30
Deepesh Garg
2ecd805e0e fix: Router options for multiple values (#6779)
* fix(list_view): Router option support for multiple filters

* fix(utils): fix in get_link_to_report for route options

* fix(Codacy): Added semicolon and fixed indentation

* fix(route_options): Bug fix

* fix(router_options): Added safe encoding for get_link_to_report

* fix(router_options): fixed encoding issue

* Remove encoding

* fix(list_view): fix for find in awesomebar
2019-01-22 14:27:30 +05:30
sahil28297
3644f5f4cd feat: relative timeframe filters (#6792)
* feat: relative timeframe filters

* fix: resolve syntax errors

* fix: Translated options
2019-01-21 16:02:40 +05:30
Deepesh Garg
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Faris Ansari
ae57e75b0e fix(is_html): Return false if text is not string 2018-12-30 22:43:21 +05:30
Faris Ansari
041e8dd4b2 fix(is_html): Return false if not string 2018-12-30 12:35:08 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647)
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
2018-12-24 15:17:38 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Zarrar
863c54b0fa [Fix] Json data for Report Builder based reports (#6624)
* replace doctype name if already present

* patch to update json data for report builder based reports

* minor fix for auto email
2018-12-18 08:56:10 +05:30
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
Ameya Shenoy
79bd1ed9d6 fix: identify production mode for PDF generation (#6559)
In regards to PDF generation, if developer_mode was set to true, the PDF
generated used to lack css styling. This was because the URL to the CSS
assets used to contain the webserver port number, but given the system
was running in production, the URL was invalid, thereby not being able
to load CSS assets. This fix does not rely on the value of
developer_mode to identify if the system is running in production,
rather, it uses the value of restart_superviosor or systemd_on_update,
to check for the same.
2018-11-29 10:31:53 +05:30
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Rushabh Mehta
1f1a1ec810 fix(formatdate): always replace mm by MM for babel.dates 2018-10-15 10:34:17 +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
Faris Ansari
e7c79b713e fix(md_to_html): Add class screenshot to img elements 2018-09-14 11:05:12 +05:30
Saurabh
dbb7ecb7fe [fix] check for developer mode before adding port to URL 2018-09-07 13:23:17 +05:30
Faris Ansari
73c7984fcd fix: frappe.utils.get_url 2018-09-05 14:06:43 +05:30
Benji
8ef433ef45 Add safe_div() (#6006)
* Update receive.py

* Update receive.py

* Update receive.py

* Added safemath_div()

* Update data.py

* style: fix trailing whitespace
2018-09-03 10:59:23 +05:30
Faris Ansari
505a55474a feat: Add is_subset utility 2018-09-01 22:44:31 +05:30
sivankar
a48b76b940 refactored code to add support in filters to get descendant or ancest… (#5847)
* refactored code to add support in filters to get descendant or ancestor for tree type documents

* added semicolon and comments to imporve code quality

* refactored code to add not ancestor and not descendants of filters

* added test cases for ancestors of and descendants of

* Translate labels
2018-08-14 12:19:18 +05:30
Rushabh Mehta
e7c8b0c138 optimize(various): optimize with frappe.get_cached_value 2018-08-08 16:33:40 +05:30
Faris Ansari
0a6deadc91 fix(syntax highlighting): Better syntax highlighting
- Update markdown2 to 2.3.5
- Only load syntax files for languages we support
- Enable highlightjs-lang extra to add class to code blocks
2018-08-05 20:04:13 +05:30
Faris Ansari
60f9e2c973 Add utility frappe.utils.md_to_html
- Replace all occurences of manual imports with this utility
- Also enable extras
  - fenced-code-blocks
  - tables with class 'table table-bordered'
  - header-ids
2018-08-05 18:19:25 +05:30
Faris Ansari
24b1f2bbc4 Pick port from webserver_port in get_url 2018-07-31 23:03:41 +05:30
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
rohitwaghchaure
7293311f72 [Fix] Handle the OverflowError exception in the in_words method (#5769) 2018-07-11 11:56:01 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Saurabh
e2b1ebe84c [Security][fix] To avoid possible sql injection via filters and or_filters parameters and tighten the field level checks (#5721)
* [fix] sanitize filters and or_filters to avoid sql injection

* add test cases for filter sanitizer

* codacy fix

* added test cases to test valid scenarios
2018-06-27 09:15:42 +05:30
Prateeksha Singh
a0f497edcf [Refactor] Webforms (#5537)
* [webform] login and date control working

* [webform] text editor and autocomplete imports

* [webform] add utils (before commons) to web js

* [website][init] messages in website

* [webform][wip] date field

* [webform][purge] form via controls and values

* [webform] remove old extraneous get_data code

* [webform][purge] remove upload handler and other listeners

* [webform][new] WebForm object

* [webform] save docs

* [webform] edit profile

* [controls] import awesomplete in multiselect

* [webform] handle existing doc or new form

* [es-module] independence of grid control by import structure

* [webform] grid on website! Stage I

* [webform][grid] include meta, model and perm on website >.<

* [webform] fix payment details

* [webform][fix] get table fields

* [webform][test] remove server field html test as not required

* [webform] check document permission

* Rename WebForm.js to webform.js
2018-06-22 11:35:52 +05:30
Nabin Hait
6737f1912c Fixed merge conflict 2018-05-08 15:27:37 +05:30
Ameya Shenoy
09e71d0d77 added floor and ceil to frappe.utils (#5536)
Added frappe wrappers to math.ceil and math.floor, since they are widely
used functions. Also added their docstrings for documentation and wote
test cases. And some minor typo fixes
2018-05-08 15:13:50 +05:30
Saurabh
56b6167c1f [fix] merge conflicts 2018-04-19 11:16:28 +05:30
Shreya Shah
c007c0c225 Fix for unknown locale languages in print format (#5424)
* fix for unknown locale in dates

* formatting fix
2018-04-17 11:29:22 +05:30
KanchanChauhan
4232013e65 Check number format only if precision missing (#5357)
* Check number format only if precision missing

* handle string inputs
2018-04-13 11:11:09 +05:30
Suraj Shetty
fb25fdb609 Auto email report fixes (#5410)
* fixes https://github.com/frappe/erpnext/issues/13319

* fixes https://github.com/frappe/erpnext/issues/13422

* change auto email report template

* change auto email report template

* Update data.py

* Update data.py
2018-04-10 10:53:05 +05:30
Achilles Rasquinha
cd13493952 fix fmt_moeny 2018-04-01 01:21:49 +05:30
Achilles Rasquinha
6c7ea22329 fix fmt_moeny 2018-04-01 01:06:20 +05:30
Achilles Rasquinha
1ac98702dd fix fmt_moeny 2018-04-01 00:46:57 +05:30
Achilles Rasquinha
701d59b5ae fix decimal split 2018-04-01 00:44:31 +05:30
Achilles Rasquinha
2396b105fc fix fmt_moeny 2018-04-01 00:31:37 +05:30