Commit graph

1293 commits

Author SHA1 Message Date
mergify[bot]
62ea837d07
Merge pull request #9363 from prssanna/workflow-fix
fix(Workflow): Set workflow state when some action is performed on a …
2020-02-05 10:04:49 +00:00
prssanna
44cbdb0ebd fix: iff workflow state of doc is already correct, don't set workflow state 2020-02-05 11:57:23 +05:30
Suraj Shetty
dee4a7336c fix(translations): Incorrect syntax 2020-01-29 15:22:35 +05:30
Faris Ansari
2e2c038f35 fix: Skip Email Queue doctype in delete_doc (#9364) 2020-01-27 21:33:47 +05:30
mergify[bot]
f11b8fc476
Merge pull request #8567 from ruchamahabal/offline-erpnext
feat: Events Streaming
2020-01-27 11:58:15 +00:00
Rucha Mahabal
8147fa45dd fix: anti-pattern code 2020-01-27 14:07:13 +05:30
Rucha Mahabal
c0b22871fb fix: set parent in child table row dependency 2020-01-27 13:38:50 +05:30
Rucha Mahabal
19c69e5316 fix: anti-pattern code 2020-01-27 12:26:12 +05:30
prssanna
9202997cb8 fix(Workflow): Set workflow state when some action is performed on a document from the backend if workflow exists 2020-01-27 12:09:07 +05:30
marination
e65486f0c7 fix: Removed annotations due to py>=3.7 compatibility. 2020-01-27 11:59:40 +05:30
mergify[bot]
308971928e
Merge pull request #9334 from marination/map_current_doc
fix: Allow map_docs to accommodate 'args' sent from client call
2020-01-27 04:13:48 +00:00
marination
f61ae3fd1a fix: Comment to docstring and minor changes
- added description for args with example
- 'yield' might not be the best idea, barely any improvement, so changed back to 'return'
2020-01-24 12:02:46 +05:30
Suraj Shetty
a25f5d207a
Merge branch 'develop' into offline-erpnext 2020-01-24 09:23:15 +05:30
Saif Ur Rehman
dd72d5e022 chore: No need for frappe._dict() 2020-01-22 12:51:47 +05:30
Saif Ur Rehman
69d7649969 fix(get_permlevel_access): Lazy load handle different permission types 2020-01-22 12:51:47 +05:30
marination
d110b744d9 fix: Modified map_docs to accomodate 'args' sent from client call 2020-01-21 15:13:30 +05:30
Rucha Mahabal
9dbc0e2793 fix: docstatus not syncing 2020-01-13 23:50:38 +05:30
Rucha Mahabal
44b0049aff fix: Merge branch 'develop' of https://github.com/frappe/frappe into offline-erpnext 2020-01-03 12:04:10 +05:30
Suraj Shetty
28d5d39acf
Merge branch 'develop' into dev-webhook-tables 2020-01-01 12:02:53 +05:30
Suraj Shetty
25c66b384b
Merge branch 'develop' into rename-doc-merge-alert 2019-12-31 20:37:04 +05:30
Rohan Bansal
547a4d3ca0 fix: allow tables to be sent in webhook 2019-12-31 13:28:44 +05:30
Gavin D'souza
43ae8adeb4 feat: show_alert flag in rename_doc API 2019-12-30 12:52:35 +05:30
Prssanna Desai
8425110af5 fix: hide Cancel button if workflow state and action for Cancel… (#9151) 2019-12-29 18:12:45 +05:30
Rucha Mahabal
589772f7bd fix: rename Events Streaming to Event Streaming 2019-12-26 14:29:08 +05:30
Rucha Mahabal
cfe2631864 fix: rename Producer and Consumer child doctypes 2019-12-26 13:50:33 +05:30
Rucha Mahabal
f99cbf9690 fix: rename Update Log to Event Update Log for consistency 2019-12-26 12:53:58 +05:30
Rucha Mahabal
ccb99d5e51 Merge branch 'develop' of https://github.com/frappe/frappe into offline-erpnext 2019-12-23 14:58:36 +05:30
prssanna
3f002e6320 before setting user default value, if fieldtype is Link check if doc exists 2019-12-17 18:25:52 +05:30
Suraj Shetty
cda63fa867
Revert "fix: user default value for Link fields" 2019-12-17 18:19:07 +05:30
prssanna
c83ff2679f fix: before setting user default value, if fieldtype is Link check if doc exists 2019-12-16 16:26:20 +05:30
Shridhar
b3b70f3b7f Bug fixed ID value should not be set to 0 by default 2019-12-11 09:21:17 +05:30
Rucha Mahabal
199291e9c5 fix: conflicts 2019-12-09 17:16:18 +05:30
mergify[bot]
ae5ba4bdaa
Merge pull request #8952 from ruchamahabal/onboarding-ui-fixes
fix: Onboarding Wizard Multiple Fixes
2019-12-06 07:14:36 +00:00
Rucha Mahabal
e07f5ffafe
fix: spacing
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-12-06 12:29:09 +05:30
mergify[bot]
ac7c5837c5
Merge pull request #8861 from alias/frappe_org_dev
fix: Allow to delete custom doctype with custom module
2019-12-03 16:17:45 +00:00
Shivam Mishra
1898b2fb0e fix: use hasattr to verify links (#8938)
* fix: use hasattr to verify links

* fix: verify length explicitly

* style: remove unnecessary call to len
2019-12-03 07:11:04 +00:00
Rucha Mahabal
5b16efd1e7 chore: code cleanup for the old doctype Setup Wizard Slide 2019-12-02 17:23:13 +05:30
Faris Ansari
488c68df96
Merge branch 'develop' into refactor-scheduler 2019-12-02 13:16:45 +05:30
Rucha Mahabal
767168ed72 fix: travis.yml conflict 2019-11-28 19:24:32 +05:30
Shridhar
44c7f08ccf convert operator to lowercase while checking 2019-11-28 18:07:14 +05:30
Shridhar
acae06a36a case insensitive search for postgres 2019-11-28 16:13:20 +05:30
mergify[bot]
08d7ccae2d
Merge pull request #8880 from ruchamahabal/setup_wizard
feat: Onboarding Wizard With Configurable Slides
2019-11-28 09:04:35 +00:00
Rucha Mahabal
06953a3dc0 fix: added slide order in Slide doctype, removed Settings doctype 2019-11-26 18:42:22 +05:30
Suraj Shetty
046c43e0b5
fix: Parameterize link_doctype 2019-11-26 11:29:30 +05:30
Ben Knowles
2c16a86e86
fix: parameterize link name when clearing timeline references
link_name could potentially include an apostrophe and cause:

`"mysql.err.ProgrammingError: (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax"`

Adjusted the query to parameterize it
2019-11-25 16:20:33 -06:00
Rucha Mahabal
27245d14be feat: onboarding wizard with configurable slides 2019-11-21 20:21:13 +05:30
Bob Schulze
ed98820929 fix for a problem than prevents deletion of a table that is solely custom 2019-11-21 09:35:33 +01:00
Rucha Mahabal
b338e3dc48 fix: codacy 2019-11-14 17:51:33 +05:30
Rucha Mahabal
fa6a29ff37 fix: conflicts 2019-11-13 11:23:30 +05:30
Rucha Mahabal
7e3a3c3bd8 fix: child table not getting updated 2019-11-11 16:55:52 +05:30