vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
21977 commits 1 branch 0 tags 587 MiB
Commit graph

21977 commits

This branch
This branch
All branches
Author SHA1 Message Date
Himanshu
c8ff4c8fe2
Merge pull request #8525 from nick9822/nick9822-fixes 
[Patch issue] Move email and phone to child table
 2019-10-07 19:11:22 +05:30
rohitwaghchaure
f2f49ef3bb fix: rate auto changing from 3.9 to 39 (#8560) 
* fix: rate auto changing from 3.9 to 39

* fix: codacy
 2019-10-07 13:40:05 +00:00
Suraj Shetty
86263e05f4 perf: Cache db columns to avoid redundant database calls (#8543) 
* perf: Cache db columns to avoid redundant database calls

* fix: Move cache clearing code from doctype to schema.py

* fix: self.table_name instead of self.name

* fix: Cache columns in  "table_columns" key

`table_columns` was cached in meta but columns were also getting accessed
directly using frappe.db.get_table_columns. Now, it is cached at
`frappe.db` layer

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-10-07 13:39:40 +00:00
Faris Ansari
f926a2aa48
Merge pull request #8488 from hrwX/global_tags 
feat(Desk): Global Tags
 2019-10-07 19:05:28 +05:30
Himanshu Warekar
6fc5cb584f fix: codacy 2019-10-07 17:18:11 +05:30
mergify[bot]
3b32c4d613
Merge pull request #8557 from frappe/clarkejj-patch-2 
fix: report the DocType's name when its associated table is missing
 2019-10-07 07:30:30 +00:00
mergify[bot]
6314769705
Merge pull request #8547 from marination/link-field 
fix: Link field validation via set_value
 2019-10-07 07:29:02 +00:00
Faris Ansari
f5792ffefa
fix: Add a check for Dynamic Link 2019-10-07 12:47:48 +05:30
Deepesh Garg
5666429a88 fix: Allow searching in multiselect field by fields in search fields and show search field related info (#8558) 
* fix: Allow searching in multiselect field by fileds in search fields and show search field related info

* fix: Check icon alignment
 2019-10-07 06:30:26 +00:00
Sun Howwrongbum
b47b9ef5a8 fix: pdf report js issues (#8554) 
* fix: pdf report js issues

* fix: template being set to null
 2019-10-07 05:42:42 +00:00
Himanshu Warekar
254ce39cc5 chore: return empty string 2019-10-07 09:32:51 +05:30
John Clarke
118bba4a83
report the name of the DocType when the associated table is missing 
Reported here https://discuss.erpnext.com/t/bench-migrate-fails-with-pymysql-err-programmingerror-it-doesnt-print-what-is-the-error/53540
 2019-10-06 10:34:19 -06:00
Himanshu Warekar
b4fcadca2f fix: codacy fixes 2019-10-06 21:58:48 +05:30
Himanshu Warekar
1553426807 fix: do not capitalize tag name 2019-10-06 16:30:16 +05:30
Himanshu Warekar
014c0360dd fix: list filters for tags 2019-10-06 16:09:30 +05:30
mergify[bot]
b58ce7e963
Merge pull request #8472 from hrwX/assn-fix 
Feat(Assignment Rule): Apply Assignment Rule based on day of the week
 2019-10-06 08:20:13 +00:00
Himanshu Warekar
b100b59ee0 chore: rename file 2019-10-05 18:59:01 +05:30
mergify[bot]
11dfa09ffd
Merge pull request #8555 from alyf-de/test_api 
feat(tests): test api/resources via cypress
 2019-10-05 05:37:50 +00:00
Himanshu Warekar
fc131e55c5 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-10-05 10:00:27 +05:30
Himanshu Warekar
181a2ad992 Merge branch 'global_tags' of https://github.com/hrwx/frappe into global_tags 2019-10-05 09:59:29 +05:30
Himanshu Warekar
13321ec5f4 chore: rename global_tags to tags 2019-10-05 09:57:43 +05:30
Raffael Meyer
d823417d2f feat(tests): add api/resources 2019-10-05 02:26:21 +02:00
marination
12dd61db38 fix: Minor change 2019-10-04 22:03:43 +05:30
mergify[bot]
e32efa295e
Merge pull request #8548 from ruchamahabal/fix_webhook 
fix: include table fields in webhook data
 2019-10-04 07:06:45 +00:00
Rucha Mahabal
0d0581cb3f fix: include table fields in webhook data 2019-10-03 19:04:53 +05:30
marination
b891b0c67f fix: Link field validation for set_value 
Updates fields dependent on Link field via Fetch From when Link Field is set through set_value.
 2019-10-03 18:17:42 +05:30
Himanshu
18516788f7
Update frappe/model/delete_doc.py 
Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
 2019-10-03 16:45:39 +05:30
Himanshu Warekar
02cebdd7d3 fix: use frappe.tags 2019-10-03 16:43:36 +05:30
Nickesh
68b30ebbcd [Patch Fix] Move email and phone to child table 2019-10-03 15:49:44 +05:30
mergify[bot]
c967e335be
Merge pull request #8545 from sahil28297/create_contact 
fix(patch): reload Call Log
 2019-10-03 08:25:11 +00:00
Sahil Khan
e8e8aca4f7 fix(patch): reload Call Log 2019-10-03 13:15:40 +05:30
Himanshu Warekar
c0a5ad1456 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-10-03 12:30:53 +05:30
ci2014
f0b59df21c Let developers choose the margins (#8513) 
* Let developers choose the margins

Let the developers choose the margins

* fix: remove trailing whitespace
 2019-10-03 06:25:38 +00:00
Faris Ansari
70e11cdb91
fix: Show Text Editor for Content Type Rich Text (#8537) 2019-10-03 11:47:41 +05:30
Bob Schulze
14222cb078 handle case that df is None for this branch too (#8529) 2019-10-03 06:17:34 +00:00
Deepesh Garg
198e999baf fix: Show maximum 5 values for a field in filter description (#8539) 2019-10-03 11:22:32 +05:30
Himanshu
9dfce7bbbf fix: run specific code only if auto linking is onn (#8542) 
* fix: run specific code only if auto linking is onn

* fix: rerun comm patch again

* chore: remove extra comma from dict

* fix: change email_account name
 2019-10-03 05:50:36 +00:00
Himanshu
09b8750d47
Update frappe/automation/doctype/assignment_rule/assignment_rule.py 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-10-02 23:53:13 +05:30
mergify[bot]
997dff896d
Merge pull request #8518 from ruchamahabal/fix-webhook-fields 
fix: webhook data
 2019-10-02 13:21:35 +00:00
mergify[bot]
172ce12fe9
Merge pull request #8540 from adityahase/fix-ugly-ui 
fix(list-view): Remove ugly scroll from list view
 2019-10-02 13:18:48 +00:00
Aditya Hase
2ec267f63b
fix(list-view): Remove ugly scroll from list view 2019-10-02 18:37:27 +05:30
Rucha Mahabal
6a56349173 fix: webhook label changes 2019-10-02 17:59:38 +05:30
Himanshu
3f980dbd79 fix(Global Search Settings): Show progress while setting global search doctypes (#8515) 
* fix: add frm dashboard

* fix: add search for other domains

* fix: set global search doctypes for all domains

* fix: add doctypes to global search dict in hooks

* fix: Remove unused variable
 2019-10-02 11:43:42 +00:00
Sahil Khan
0d77727789 Merge branch 'develop' into version-12 2019-10-02 16:35:43 +05:30
Sahil Khan
bd5cc03f4a bumped to version 12.0.16 2019-10-02 16:55:43 +05:50
mergify[bot]
063786c498
Merge pull request #8536 from scmmishra/raw-printing-check 
fix: validate conditions for raw printing
 2019-10-02 09:18:39 +00:00
mergify[bot]
9b9c046c80
Merge pull request #8530 from frappe-pr-bot/translations-2019-10-01 
feat: Updated translation
 2019-10-02 08:42:08 +00:00
Faris Ansari
fcd638020c fix: Show Text Editor for Content Type Rich Text 2019-10-02 14:00:46 +05:30
Shivam Mishra
8cb6528c03 fix: validate conditions for raw printing 2019-10-02 13:19:52 +05:30
mergify[bot]
4acf9ad543
Merge pull request #8514 from saurabh6790/handle_SMTPRecipientsRefused_exception 
fix: handle smtp recipients refused exception
 2019-10-02 07:07:36 +00:00