Commit graph

109 commits

Author SHA1 Message Date
Daniel Gerhardt
16dca0b1c1 feat: add consecutive calendar week (WW) for naming series
The calendar week is based on ISO 8601 but behaves slightly different
for the first and last days of a year to ensure consecutiveness:

* If the first days of a year would be in week 53 then 00 is used
  instead.
* if the last days of a year would be in week 01 then 53 is used
  instead.

Closes #14413
2021-11-18 17:52:36 +01:00
Gavin D'souza
e989bfa41d style: Indents & file headers 2021-11-03 16:12:27 +05:30
Aradhya-Tripathi
cd9e0ffa84 refactor: converted queries in nameing and nestedset 2021-10-26 22:20:03 +05:30
Rushabh Mehta
20dea90670 feat(minor): Packages! also cleanup of DocField and other minor fixes 2021-09-05 22:01:55 +05:30
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
2021-09-03 12:02:59 +05:30
leela
80d111baf2 refactor: set amended docname to original docname
Currently, whenever a document is amended it's name is set
to name-X(X is a counter) when amended again and so on. In this PR,
we have postfixed all cancelled document names with '-CAN' and new
cancelled documents gets a name as original_name-CANC-X.
so that amended docs can use the original name instead of name-X.
2021-08-09 14:59:07 +05:30
leela
b719e1481d Revert "refactor: set amended docname to original docname"
This reverts commit d459847ae3.
2021-07-28 17:00:12 +05:30
leela
d459847ae3 refactor: set amended docname to original docname
Currently, whenever a document is amended it's name is set
to name-X(X is a counter) when amended again and so on. In this PR,
we have changed all cancelled doc patterns to name-CAN-X,
so that amended docs can use the original name instead of name-X.
2021-07-21 10:51:32 +05:30
leela
f31d01a2a6 Revert "Merge pull request #13244 from prssanna/amended-doc-naming"
This reverts commit 58b95662c2, reversing
changes made to c553b7e23a.
2021-07-02 17:43:16 +05:30
Leela vadlamudi
4800ee8725
Merge branch 'develop' into amended-doc-naming 2021-07-02 10:47:47 +05:30
Gavin D'souza
e407b78506 chore: Drop dead and deprecated code
* Remove six for PY2 compatability since our dependencies are not, PY2
  is legacy.
* Removed usages of utils from future/past libraries since they are
  deprecated. This includes 'from __future__ ...' and 'from past...'
  statements.
* Removed compatibility imports for PY2, switched from six imports to
  standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
  versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
2021-05-26 15:31:29 +05:30
prssanna
304a771ba2 fix: check if doc has attribute amended_from 2021-05-17 17:13:48 +05:30
prssanna
1c4e1bc1df refactor: set amended docname to original docname 2021-05-17 17:12:28 +05:30
Joseph Marie Alba
c795a70897
Python 3 issue in re
Python 3 interprets string literals as Unicode strings, and therefore \d is treated as an escaped Unicode character.

Declare RegEx pattern as a raw string instead by prepending r or double escape \d
2021-05-16 05:52:05 +08:00
shariquerik
9919ddff2a fix: sider fix 2021-05-10 12:56:15 +05:30
shariquerik
e0efefd9e5 refactor: Used re.search also added examples 2021-05-10 12:54:04 +05:30
shariquerik
8995e8e9db refactor: remove unnecessary code 2021-05-09 06:24:20 +05:30
shariquerik
e7552413b4 refactor: minor fix 2021-05-07 18:10:59 +05:30
shariquerik
483cd85eba fix: Revert naming for custom naming series 2021-05-06 16:44:18 +05:30
hasnain2808@gmail.com
e95f7d201a fix: backwards compatibility 2021-04-07 11:15:34 +05:30
Saqib Ansari
a93c2caab2 fix: reverting of series with a variable 2021-04-06 20:48:33 +05:30
Rushabh Mehta
4c32dc3765 fix(tests): routing, permission and other fixes 2020-12-24 14:48:40 +05:30
Rushabh Mehta
742605542c fix(minor): added ignore_ddl in frappe.db.get_all to ignore missing tables, columns 2020-10-26 10:02:04 +05:30
Rushabh Mehta
282194ef13 fix(document_naming_rule): added priority and removed field based naming 2020-09-21 10:28:11 +05:30
Rushabh Mehta
cf1fd732c4 fix(naming): give first priority to rule, try and fix recorder test 2020-09-21 10:28:11 +05:30
Rushabh Mehta
542553b401 fix(naming): ignore table missing + linting 2020-09-21 10:28:11 +05:30
Rushabh Mehta
8696bc3cd1 fix(naming): ignore table missing + linting 2020-09-21 10:28:11 +05:30
Rushabh Mehta
21419645f8 feat(document naming): [wip] rule based naming of documents 2020-09-21 10:28:11 +05:30
Rushabh Mehta
1b73602a17 feat(system console): Added a System Console to help in debugging and Console Log 2020-08-31 11:29:18 +05:30
Suraj Shetty
284c70809b fix: Translatable strings with trailing spaces 2020-04-08 14:20:52 +05:30
Gavin D'souza
539fe0aaa0 chore(style): consistencies in formatting 2019-11-04 11:47:52 +05:30
Gavin D'souza
50cee0f32e fix(naming): empty string isnt accepted for rename 2019-11-04 11:45:32 +05:30
Sahil Khan
f085765abd Merge branch 'master' into develop 2019-03-28 13:44:14 +05:30
Himanshu Mishra
4da80bae91 fix: doctype passed but not used (#7112) 2019-03-28 11:57:15 +05:30
Himanshu
7dc1fec27c feat(Naming Series): Option to Add field_value in Naming Series (#7027)
To use field_value in naming_series, just add field_name in curly braces instead of the old naming convention which was kinda confusing and not easily understandable.
eg: {field_name}.-.YYYY.-.MM.-.DD.-.####
2019-03-25 11:43:08 +05:30
Ameya Shenoy
742f0d2602
Merge branch 'staging' into develop 2018-10-31 07:29:46 +00:00
Shreya
a4f0316119 fix(series): Revert series count after doc deletion 2018-10-25 14:43:31 +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
Prateeksha Singh
eb5b7a77c9 [Feature] Format Autoname (#6017)
* [Feature] Format Autoname

- Generate autoname by replacing all instances of braced params
- Independent of remaining string or separators.
- Remove autoname Concatenate option

* [autoname] add test for format autoname
2018-09-03 10:58:56 +05:30
Sushant Nadkar
f8dc45c3c1 Convert doc field value to string type before using (#5795) 2018-07-11 11:11:55 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Ameya Shenoy
5c6b02515a regex fix (#5765)
courtesy: @netchanpfaris
initally the regex used to allow only digits 0-9, not it considers the
entire number range
2018-07-03 14:55:21 +05:30
Rushabh Mehta
dd189d4c99 [fix] set default naming_series in naming.py if not set 2018-06-06 12:00:27 +05:30
Rushabh Mehta
c32bcca4e8 [fix] set default naming_series in naming.py if not set 2018-06-06 11:24:20 +05:30
tundebabzy
2efcea9bbd DocType Naming With Multiple Fields (#5497)
* Update README.md

* refactor for better readability

adds ability to name by concatenating fields

add comments

PEP 8 fixes

throw error when field option autoname fails

adds concatenation option description to DocType doctype

* codacy

* remove explicit cast to `str`

* more pep8 fixes

* revert incorrect link

* code review - move internal functions to bottom of module
2018-05-30 11:37:49 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Shreya Shah
e2732751a2 able to pass filters (#5323) 2018-04-02 10:43:04 +05:30
Nabin Hait
3f3d9e52c8 Fixed merge conflict 2018-03-23 15:16:18 +05:30
Nabin Hait
3dab3478db Minor fix in autonaming 2018-03-22 12:14:21 +05:30
Nabin Hait
0a8664c3b7 Merge branch 'master' into develop 2018-01-30 19:02:36 +05:30