Shridhar Patil
3f7d96ecba
Unassign from todo. ( #10896 )
...
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
ci2014
9bc197cfd5
Update project.js ( #10796 )
...
* Update project.js
Move indicators to setup to be less buggy
* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Rushabh Mehta
f849915c13
[fix] label
2017-09-13 10:48:53 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
tundebabzy
41c954b8b3
Set billing hours to 0 in timesheet #9535 ( #10139 )
...
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
2017-07-28 21:05:15 +05:30
bcornwellmott
bab0c5a8a5
Add disable check for Activity Type ( #10120 )
...
* Add disable check for Activity Type
* Add check for disabled in Timesheet
* Codacy fixes
* Fixed bugs
* Restore permissions
2017-07-28 14:32:45 +05:30
KanchanChauhan
7800bd89dc
Added Project Type new doctype to be added as link field for Project Type field in project instead of select field ( #9929 )
2017-07-26 17:55:25 +05:30
Utkarsh Goswami
40937083bf
[UI-Test Project] To check a billing cost of a project with multiple tasks ( #10084 )
...
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* updated:
* Updated
* Updated
2017-07-26 16:31:08 +05:30
Vishal Dhayagude
edb2749dfd
Timesheet web ( #10037 )
...
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
Doridel Cahanap
7b021e0fac
Show Expected End Date in Project List View ( #9964 )
2017-07-19 18:21:31 +05:30
KanchanChauhan
d6dd25a666
Added indicators on Project Tasks ( #9952 )
2017-07-19 18:06:52 +05:30
Rushabh Mehta
1283f6308d
[fix] company graph based on base currency
2017-07-18 18:22:16 +05:30
Rushabh Mehta
660de515b5
[fix] filters for calendars frappe/erpnext#9850 ( #9870 )
2017-07-18 10:50:30 +05:30
Makarand Bauskar
7a2a2dad35
Merge pull request #9381 from almeidapaulopt/so_proj
...
link sales order to new project
2017-06-21 18:48:30 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
Paulo Almeida
2d5e65ddcf
link sales order to new project
2017-06-20 12:08:22 +01:00
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
5d7e8d9e83
Minor fix in timesheet ( #9063 )
2017-05-30 15:34:35 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Paulo Almeida
97ff6fea47
add milestone field
2017-05-23 11:55:37 +01:00
Faris Ansari
74e2e4672c
Fix for duplicated project dependencies ( #8817 )
...
- skip when task is not found
2017-05-16 08:32:45 +05:30
Nabin Hait
226ea7db88
Filter issue on timesheet calendar view ( #8730 )
2017-05-08 17:34:07 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
Faris Ansari
df65d21225
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 14:52:56 +05:30
Faris Ansari
0e4b924f59
[gantt] show task project in popup
2017-03-07 12:01:39 +05:30
Nabin Hait
258c8199fb
Merge pull request #7842 from superlack/develop
...
Add Sales Orders to Project costing and billing section
2017-03-01 17:20:23 +05:30
superlack
62d7ba0afd
Update project.py
2017-02-27 07:00:30 -08:00
Kanchan Chauhan
e76685d925
Dependent task dates gets updated with parent dates
2017-02-27 14:55:03 +05:30
superlack
f800892ec3
Update project.py
2017-02-24 12:33:59 -08:00
superlack
868ef7738f
Update project.json
2017-02-23 17:46:07 -08:00
superlack
c4587d2945
Update project.py
2017-02-23 17:39:05 -08:00
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Nabin Hait
2f7697d1bd
Merge pull request #7746 from pratu16x7/minor-search-presets
...
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
pratu16x7
349ed568ed
Add task and item
2017-02-15 09:23:26 +05:30
Kanchan Chauhan
bab6c9c006
[Fix] Project perecentage set 0 if no tasks
2017-02-14 14:30:00 +05:30
