schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,310 Commits 322 Branches 1,581 Tags
afbbdcb80296f4bc0da333785467435da28d0cd5
Commit Graph

775 Commits

Author SHA1 Message Date
Afshan
4b8d4a1cbe fix: setting user precision instead of 2 (#23630) 
* fix: setting user precision instead of default

* fix: removing unused imports
 2020-10-14 15:50:26 +05:30
Suraj Shetty
bf7adb8b38 refactor: Format and sanitise user inputs to search queries. (#23064) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 11:17:30 +05:30
Deepesh Garg
a979fcc25b fix: Project link not set in accounts other than profit and loss accounts (#22049) 
* fix: project link not set in accounts other than profilt and loss accounts

* fix: cannot find get_allow_cost_center_in_entry_of_bs_account

* fix: remove enable_allow_cost_center_in_entry_of_bs_account

* chore: add tests and remove test based on allow_cost_center_for_bs_accounts

* fix: travis

* fix: Test Cases

* fix: Patch to remove Property Setter

* fix: Test Cases

* fix: Remove v13 patch

* fix: Procurement Tracker test case

* fix: Proccurement tracker report test

* fix: Codacy

* fix: Remove duplicate project field

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-08-12 21:06:25 +05:30
Marica
8e887f39a2 fix: Skip Progress and Completed by fields on Task Duplication (#22640) 2020-07-10 12:31:08 +05:30
Rohan
fda2633e40 fix: fetch project-related info in Timesheet (#22422) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-09 11:38:20 +05:30
Chinmay D. Pai
75c2e28788 fix: whitelist all query functions for search widget 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-07 16:46:04 +05:30
bhavesh95863
b9e4df557b fix: Message field mandtory even after unchecking collect progress checkbox (#22594) 
Message field mandtory even after unchecking collect progress checkbox
 2020-07-06 18:29:37 +05:30
Marica
7841653a03 fix: Project Update Email Error (#21209) 
* fix: Project Update Email Error

* fix: Removed mandatory depends on

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-04-14 11:47:22 +05:30
Deepesh Garg
71e9f23d77 fix: Update is_tree field in Tree doctypes (#20982) 2020-03-19 11:00:55 +05:30
RJPvT
6eaa542709 fix: smaller then instead of bigger then :-( dumb mistake v12 #20693 (#20701) 2020-02-26 11:59:06 +05:30
Er-Naren719
fc4cc9ab42 feat: column width increased for view attachments field (#314) 2020-02-11 10:17:34 +00:00
Nabin Hait
df94f0565e fix: cannot complete task if dependent task are not completed / cancelled (#20434) 2020-01-28 14:08:48 +05:30
Ben Knowles
9097c7e11c fix: task validation error when adding tasks to projects 
Related to PR #19919
 2019-12-12 11:30:17 -06:00
Himanshu Warekar
0a28387c70 fix: set project 2019-12-11 12:49:43 +05:30
Rohit Waghchaure
495ba1618b fix: timsheet overlap error 2019-12-07 13:22:08 +05:30
RJPvT
a998978415 fix: pending on review date (#19609) 
* fix: On Specific case if no item code in name

* fix: pending on review date
 2019-11-19 14:54:38 +05:30
Himanshu
5503b6cff5 fix(Task): Do not create/schedule task after project end (#19184) 
* fix: do not create/schedule task after project end

* fix: check difference between dates

* fix: check project date

* fix: task creation

* fix: tests
 2019-11-14 10:11:25 +05:30
rohitwaghchaure
010714757c fix: '<' not supported between instances of 'str' and 'NoneType' (#19553) 2019-11-12 18:20:07 +05:30
ci2014
8b2223ae5f Move add_custom_button for Gantt and Kanban Board (#19193) 
Move add_custom_button for Gantt and Kanban Board to set_buttons, because in onload it is not working.
 2019-11-11 17:27:48 +05:30
Mangesh-Khairnar
a709ae894c feat: duplicate linked task in project (#19271) 
* feat: create a duplicate project

* fix: allow duplication via form

* feat: fetch old task and link project

* fix: link task with project

* fix: parse json string as python object

* fix: avoid duplicate task based on the project template

* fix: ask user for the new project name

* fix: display a descriptive message on switching to a new route

* fix: override duplicate in menu

* fix: check for duplicate project name after submitting prompt

* fix: set the project template

* fix: minor changes

* fix: function call

* refactor: add a separate button for duplicate

* Update project.js
 2019-11-06 18:20:06 +05:30
Deepesh Garg
3cbd70a1d9 Merge pull request #19316 from joelios/develop 
fix: Unable to create timesheet from project dashboard
 2019-10-31 23:28:13 +05:30
Suraj Shetty
519ca54f53 feat: Show timesheets related to customer's projects on customer portal (#19443) 
* fix: Show timesheets related to customer's projects on customer portal

* style: fix codacy
 2019-10-31 16:00:04 +05:30
joelios
441720df75 fix: linking of time_log to timesheet from project (frappe/erpnext #19315 ) 2019-10-15 15:42:51 +02:00
Marica
147af15268 fix: Added 'Manual' % Complete Method in Project (#19175) 
Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks
 2019-09-30 15:11:15 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162) 
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
 2019-09-24 19:10:59 +05:30
Suraj Shetty
627a3dcd6d feat: Default energy point rules (#19003) 
* feat: Add default energy point rules during install

* fix: Add completed_by field to task doctype

* fix: Rule data

* fix: Add default rules for opportunity

* fix: Add a patch to create default energy point rules

* fix: Default success action message

* fix: Use .items() instead of .iteritems()

* fix: Add "create_default_energy_points" patch entry

* fix: Reload Energy Point Rule to fix patch

* fix: Import frappe
 2019-09-17 15:54:41 +05:30
Nabin Hait
74fdfff5b5 fix: Set todo status as Closed if task completed (#19059) 2019-09-16 13:06:37 +05:30
Rohan
77da3b4347 fix: pull project from task (#18776) 2019-09-05 14:53:43 +05:30
Suraj Shetty
7f94a58bf1 Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:46:01 +05:30
Rushabh Mehta
6276f1adc5 fix(minor): don't update modified timestamp for overdue tasks 2019-08-07 16:32:44 +05:30
Suraj Shetty
cab8e9be89 fix(timesheet): Hours automatically used to set 0 
- Case: If the company had standard working hour set
and when the user creates a timesheet with same date for
"To" and "From" then the hours field automatically used to
get reset to 0 after saving the form.
 2019-08-07 10:40:29 +05:30
Shivam Mishra
dc53e8ebb0 fix: task not updated issue 2019-08-02 13:56:49 +05:30
Faris Ansari
74d5e9d32a fix: Set project in Timesheet (#18371) 
* fix: Set project in Timesheet

* style: Missing semicolon
 2019-07-22 11:34:00 +05:30
Faris Ansari
a4e0532df0 fix: Project Template should be set only once (#18354) 2019-07-16 15:59:37 +05:30
Faris Ansari
82770d9152 fix: Project fixes (#18343) 
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
 2019-07-16 09:40:09 +05:30
Rushabh Mehta
8309fcfbbc BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059) 
* BREAKING CHANGE: Remove anti-pattern "Project Task"

* fix(tests): remove `tasks` from project/test_records.json

* fix(tests)

* fix(test): test_employee_onboarding.py

* fix(tests): test_expense_claim.py

* fix(refactor): cleanup project.py validate/update

* fix(refactor): cleanup project.py validate/update

* fix(test): test_expense_claim

* fix(test): test_expense_claim

* fix(test): test_expense_claim, try Test Company 4

* Update project.py
 2019-07-08 10:39:30 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143) 
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-07-03 15:15:08 +05:30
Nabin Hait
34c551d9a5 fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
karthikeyan5
e0c5176383 refactor(HR): Auto Attendance 
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
 2019-06-24 15:15:38 +05:30
Aditya Hase
be8a46a92a fix(tests): Timesheet tests 2019-06-18 21:50:05 +05:30
Anurag Mishra
05c17a505c fix: column sequence and add total 2019-06-13 16:08:01 +05:30
Rohan
bd9abc15b5 fix(projects): Remove hardcode of expected end date for new Tasks (#17717) 2019-06-05 14:17:29 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Rushabh Mehta
8ec3718aba Merge pull request #17625 from rmehta/link-preview-item-task 
fix: link preview for item and task
 2019-05-16 19:35:05 +05:30
Nabin Hait
2a8c463079 fix: show tasks in project order by due date and status 2019-05-16 13:46:05 +05:30
Rushabh Mehta
fd6ae67b16 fix: link preview for item and task 2019-05-16 10:25:27 +05:30
rohitwaghchaure
490411ba28 Update project.py 2019-05-10 12:03:20 +05:30
Rohit Waghchaure
6b9543b213 fix: project update status emails sent frequently 2019-05-09 19:06:31 +05:30
Faris Ansari
23fecc0dbb perf: Task import with Project (#17496) 
When tasks are imported with their Project set, import slows down as
number of tasks increase. This is largely due to `load_tasks` being
called in Project which is only required when Form loads. So, we can
skip it during import.

Also, converted some get_doc calls to get_cached_doc.
 2019-05-07 12:38:24 +05:30
Faris Ansari
a90fe810b3 fix(UX): Cancel tasks if project is cancelled (#17497) 2019-05-07 12:37:38 +05:30