Commit Graph

687 Commits

Author SHA1 Message Date
Charles-Henri Decultot
083f1c5370 Safe decode project name for languages with special characters (#16254) 2018-12-24 14:21:33 +05:30
Suraj Shetty
83e3c4c0fa Fix quote error 2018-12-24 11:11:04 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Rohit Waghchaure
e61430b471 Removed unnecessary code 2018-12-03 18:54:26 +05:30
Rohit Waghchaure
636d186d08 [Fix] In project, tax amount is added in the total billed amount(sales) field 2018-12-03 16:04:08 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
93595fa60a
Merge branch 'staging-fixes' into hotfix-child-task-error 2018-11-26 20:24:47 +05:30
Rohan Bansal
f838597b5f fix(task): Fix error when trying to convert a task into a group even if no child tasks exist 2018-11-20 13:18:05 +05:30
deepeshgarg007
4c366eed23 Minor issue fixes 2018-11-15 12:02:07 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Pawan Mehta
aa0bed16f6 [fix] #14038-Std hours at company level to calculate timesheet hours (#15819)
* [fix] #14038

* codacy fixes

* add end time calc method

* test case and rename function

* Update timesheet.py
2018-11-12 16:40:07 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
JodeQ
10dfd4a48f Show project attachments in portal view 2018-10-15 14:28:27 +02:00
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
Shreya Shah
3855156b7d fix(project): If Project has no Tasks, let the status be set as Completed (#15639) 2018-10-10 14:45:40 +05:30
Suraj Shetty
4b404c4f1e Avoid multiple escapes (#15509) 2018-09-27 15:39:34 +05:30
Suraj Shetty
6ea3de9521 Fix quote issues (#15497)
* Fix quotes issues

* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287)
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244)
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
2018-09-06 19:21:48 +05:30
Benji
6c9a92671b Minor bugfix (#15210)
* Minor bugfix

Bugfix for https://github.com/frappe/erpnext/pull/15170

* Update project.py
2018-09-05 13:24:53 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255)
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

* fix(unused-import): assessment-plan.py

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
2018-08-31 16:12:49 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Saurabh
79f3ea4094 [minor][fix] call update_percent_complete via validate (#15235) 2018-08-28 14:01:34 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070)
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
2018-08-28 13:44:48 +05:30
Valmik
6ad16db88c check for existing task before appending to child table (#15183) 2018-08-22 14:46:33 +05:30
Benji
299185fe24 Improved task weight calc (#15170)
* Improved task weight calc

Removed the requirement to have total of task weights to be exactly 1.

* Update project.py
2018-08-20 17:41:56 +05:30
rohitwaghchaure
ecc6af9d2a [Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171) 2018-08-20 17:39:54 +05:30
Saurabh
ddbf3aaccb Merge branch 'master' into develop 2018-08-13 13:15:58 +05:30
Rohit Waghchaure
18960c7757 Project task custom field not copying and error on project 2018-08-13 11:40:11 +05:30
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
rohitwaghchaure
ba62013cbb [Fix] Not able to delete the task even if task removed from the project (#15105)
* [Fix] Not able to delete the task even if task removed from the project

* [Fix] Custom field's data in task not updating from the project
2018-08-09 15:50:23 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Rohit Waghchaure
86217ca96c [Fix] Task email alert on status change not working if we change the task status from the project form 2018-08-02 16:41:53 +05:30
Nabin Hait
90bb5f43d5 Added more status in task web form 2018-07-24 11:33:05 +05:30
Nabin Hait
797497d22e Fixed web form perm for tasks 2018-07-23 17:58:40 +05:30
Ranjith Kurungadam
dff2ba72d3 test TDS calculation (#14919)
* test TDS calculation

* fix failing test cases

* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
db7324890f Merge branch 'master' into develop 2018-07-09 15:53:51 +05:30
rohitwaghchaure
720b06495c [Fix] Not able to save project (#14848) 2018-07-09 13:57:16 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Saurabh
f403031449 [fix] Add Overdue status in Project Task 2018-07-05 19:38:59 +05:30
Aditya Hase
69711d2df2 Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) (#14803)
This should also fix #13909 as a side effect.
2018-07-04 10:17:17 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … (#14670)
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
2018-06-28 23:43:23 +05:30
rohitwaghchaure
f3cf15fa0d [Fix] While saving project getting timeout error (#14672) 2018-06-26 17:06:00 +05:30
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
Shreya Shah
b125ba9ed8 Update status if tasks have been completed (#14601) 2018-06-20 17:52:21 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Shreya Shah
222c550c29 Parse left out time (#14586) 2018-06-20 10:51:32 +05:30
Zarrar
42f2d1a7a8 fix incase no customer fetched (#14596) 2018-06-20 10:50:11 +05:30
Nabin Hait
380a74732c salary structure related test case fixes 2018-06-15 14:42:12 +05:30
Manas Solanki
b12f0d90af fix the timesheet 2018-06-13 12:30:02 +05:30
Shreya Shah
630721aacc Travis (#14354)
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
2018-06-05 12:56:10 +05:30
Nabin Hait
153536bf70 minor test fixes 2018-05-29 10:58:57 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232)
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
2018-05-26 09:12:59 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219)
* Test case fixes

* fetch_from fixes
2018-05-26 09:09:02 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121)
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
2018-05-16 10:44:38 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
Zarrar
8646ed45bc button triggers not working in tasks table (#13973) 2018-05-14 14:29:01 +05:30
Jamsheer
46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967)
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
2018-05-11 21:05:24 +05:30
Vishal Dhayagude
3cf0d51e65 [fix] Compounding error in task weight (#13958)
* [fix] Compounding error in task weight

* [minor] minor changes

* [fix] Requested Changes added
2018-05-09 10:42:39 +05:30
Shreya Shah
7bd83f3d8e Rename occurrences for Production Order to Work Order (#13944) 2018-05-07 15:27:21 +05:30
Shreya
fd47b92138 renamed color field 2018-05-01 18:55:17 +05:30
Shreya
62907472f3 color field for calendar in task 2018-05-01 18:54:20 +05:30
Pawan Mehta
c0727633e7 [fix] #13589 (#13590) 2018-04-12 13:31:08 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes (#13420) 2018-04-02 10:43:46 +05:30
Shreya Shah
5d71609f0b Timer fixes (#13443)
* alert for exceeded time only when dialog is open

* fetch row having an activity without from_time

* fixes if timesheet created from work order

* reset timer limit exceeded
2018-04-02 10:32:39 +05:30
Dominik Ottenbreit
561e2a534b Add Project Standard Filters (#13417) 2018-03-28 14:25:51 +05:30
Prateeksha Singh
e45f957ad9
Merge pull request #13363 from shreyashah115/timer
Timer in Timesheets!
2018-03-27 10:28:50 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
rohitwaghchaure
492de67d7b Added consumed material cost in project (#13365) 2018-03-23 15:02:04 +05:30
Shreya
559011404a removed timesheet.html, appended it as a helper function 2018-03-23 11:41:56 +05:30
Shreya
5bf24be704 minor fixes 2018-03-23 11:41:56 +05:30
Shreya
8f06266838 all fields editable 2018-03-23 11:41:55 +05:30
Shreya
5714260af4 replaced status with completed checkbox 2018-03-23 11:41:55 +05:30
Shreya
09937f3753 modified timer start button 2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2 thanks to faris for the css 2018-03-23 11:41:55 +05:30
Shreya
05e516efc4 Start the timer on the basis of time diff between now_time and timestamp 2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db New activity dialog removed, read only fields editable if no rows found, add a new row on timer start 2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9 new field actual_end_time to record completed time 2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8 CSS modifications 2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec new dialog to create activity 2018-03-23 11:41:55 +05:30
Shreya
643528a3b8 added status field 2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104 removed stop button and added a complete button 2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b read only fields project and hours 2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627 alert sound when timer exceeds the given hours 2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d timer in timesheet 2018-03-23 11:41:55 +05:30
Faris Ansari
4fc74333bd Fix Icons for Expense Claim and Timesheet (#13359) 2018-03-21 17:54:09 +05:30
Faris Ansari
ce08aabc84 Add Kanban Board button in project (#13345) 2018-03-20 19:03:32 +05:30
Achilles Rasquinha
0575b3e1c3 fixed inconsistent tab error (#13339) 2018-03-20 14:07:25 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order (#12902)
* remove occurrences of Production Order

* rename from report and jsons

* Change Production Order to Work Order

* change occurences of production order from other files

* resolve minor conflict issues and reports

* patch added

* codacy fix

* updated patches, leftover changes

* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
renzodemie
417dfed214 Daily Reminder (#12938)
* for email sending

* test commit for new branch

* Removed test changes

* test commit renzo

* Email sending

* Project Uo

* Project Update

* "My first commit"

* "My second commit"

* "My second commit"

* Holiday is included

* delete idea

* first pull

* first pull

* "My third commit"

* Delete idea

* delete again

* "Edit Time"

* "Edit Time"

* Naming series and bug fixing

* "Edit current day and time"

* "Proper naming series, hidden time and date"

* Project and Project Update dashboard

* dashboard

* Remove hooks for PR

* Remove hooks for PR

* Remove hooks for PR

* Deleted project_time.py

* Corrected indention

* Hook back to original

* Delete project_time.py

* "Modified time"

* Fix indention

* Sample

* FRM

* FRM

* Time fix

* Hooks original state

* "Modified time"

* Added permission to Project User

* Added function/method to be called in order to create project update for the specific project

* Naming series

* this is not included

* Fix minor bug

* Indent again

* "Reformat Code"

* "Check Indent"

* Indent again and again

* semi colon

* "Check Again Indent"

* "Check again Indent"

* "Check again Indent"

* ind

* "Check again Indent"

* "Check again Indent"

* Generate Project update
With button in email

* []

* "Erro Summary"

* "Add syntax for the communcation"

* "add summary code"

* "Modified Summary code"

* "Modified Summary code"

* "Fix update ID and set localhost"

* Fix time and date error in project_update
Fix naming series problem in project_update

* included "not updated" in project update

* Bug in Number of Drafts

* "add notes in summary"

* Correct code

* With error

* Removed the method

* Minor fixes

* Correction for daily summary
2018-03-20 11:58:15 +05:30
Achilles Rasquinha
a4a62d5ea1 unordered types None vs int 2018-03-15 12:18:37 +05:30
Suraj Shetty
f2d28ebd6a Data import Tool bug fix (#13165)
* fixes #13064

* commonified naming series checks

* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
Zarrar
4417cb0006 improve multiple add dialog, populate parent's depends on with child tasks (#13142) 2018-03-05 11:08:15 +05:30
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30