Rushabh Mehta
0a9ad699cf
Merge pull request #5047 from umairsy/task-list-fix
...
On Task, added default filter, Status=Open
2016-03-28 18:28:09 +05:30
Neil Trini Lasrado
b6d9946854
Fixes Translations
2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
Umair Sayyed
99a686237a
On Task, added default filter, Status=Open
2016-03-23 15:00:51 +05:30
Kanchan Chauhan
b3fe6a45a7
WIP Collaborative Project Management first commit
2016-03-16 18:34:33 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Rushabh Mehta
5b9d6494a6
Merge pull request #4900 from rmehta/minor-fixes
...
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-03-01 16:15:25 +05:30
Nabin Hait
94a1f3eb90
[fix] Time Log overlap validation and test cases
2016-02-29 13:15:27 +05:30
Rushabh Mehta
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
Nabin Hait
56f7fa66ad
[fix] Time log overlap validation
2016-02-26 17:19:11 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Neil Trini Lasrado
5b7d0a960e
Fixed indicators & List view in Time Log, Time Log Batch
2016-01-29 15:20:22 +05:30
Neil Trini Lasrado
172efb1e87
Fixed error messages while making Time Log Batch from Time Log List view
2016-01-29 14:27:03 +05:30
Neil Trini Lasrado
329e7783bc
Fixed time log overlap validation. Fixed test case in time log
2016-01-15 16:34:06 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Rushabh Mehta
9bf2df9303
[minor] [layout] cleaned up Time Log layout
2016-01-14 18:19:21 +05:30
Neil Trini Lasrado
975dcc2bf3
Added additional cost to time log. Fixed issues in Time log billing amount calculation and billing amount calculation while making time log batch
2016-01-14 16:09:35 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Rushabh Mehta
5760b79747
[translations] fixes #4533
2016-01-04 15:57:01 +05:30
partzsch
55ad42cfd0
Time Log now down to seconds
...
according to request of @anadpdoshi
new branch new commit new PR
2015-12-21 17:51:42 +01:00
Rushabh Mehta
a1a712b0c6
[minor] [fix] task close button condition
2015-12-11 11:16:03 +05:30
Rushabh Mehta
13ec41abb2
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 12:59:02 +05:30
Rushabh Mehta
c819fd4ee8
[translations] for #4461
2015-12-10 10:34:32 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Nabin Hait
58c4646199
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
2015-11-16 15:35:14 +05:30
Rushabh Mehta
55d0506155
Merge pull request #4264 from superlack/patch-3
...
Update time_log_batch.py
2015-11-02 15:21:59 +05:30
superlack
41f7f7442b
Update time_log_batch.py
2015-11-02 00:39:36 -08:00
superlack
126fb31f9a
Update time_log_batch_detail.json
2015-11-02 00:38:17 -08:00
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Rushabh Mehta
2dc619ae1f
[fix] copy task titles with project
2015-10-12 15:55:12 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Rushabh Mehta
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Anand Doshi
c6e4b5978d
[fix] Sales Order - get_query fix
2015-09-24 11:32:54 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
840cad0ff7
Don't copy title field in Duplicate
2015-09-11 12:26:57 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
d387dd3bc6
[fix] Project: round percent_complete to 2 decimals
2015-09-08 16:15:00 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Rushabh Mehta
4223d7c044
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-04 16:18:17 +05:30
Rushabh Mehta
8f1391dc96
[enhancement] calendar for sales order and other related fixes #3542
2015-08-31 12:42:45 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Anand Doshi
f3eeb601ad
Merge pull request #3908 from rmehta/text-editor
...
[fix] changed text > text editor for description fields in tables
2015-08-19 16:48:06 +05:30
Anand Doshi
e270c7261d
[minor] project cost
2015-08-19 13:02:30 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Nabin Hait
fa5fcf5405
[fix] Purchase cost against project
2015-08-19 11:56:23 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Rushabh Mehta
3131c732ff
[fix] capacity planning error
2015-08-12 12:29:16 +05:30
Rushabh Mehta
d6bdad7adf
[fix] [hot] total in time log batch
2015-08-06 15:46:42 +05:30
Neil Trini Lasrado
f948fea3bf
simulate added to make_time_log in test_time_log
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
d851bd8d85
Fixed test cases related to Time Logs
2015-07-29 18:48:58 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Anand Doshi
41d3e57702
Merge pull request #3650 from rmehta/time-log-fix-2
...
[fix] overlap fix in time log #3647
2015-07-14 11:45:49 +05:30
Rushabh Mehta
dacf127f1b
[fix] time log overlap condition, #SavedByATestCase
2015-07-14 11:06:28 +05:30
Rushabh Mehta
533434e878
[fix] overlap fix in time log #3647
2015-07-14 10:39:33 +05:30
Rushabh Mehta
97b3f750c9
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 10:14:48 +05:30
Rushabh Mehta
e9604d8484
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 12:47:45 +05:30
Neil Trini Lasrado
58406a920c
Validation added to prevent task being closed with open dependent tasks
2015-07-10 12:57:49 +05:30
Nabin Hait
fdd0db3459
Update project completion percentage and costing after syncing task
2015-07-02 14:09:49 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
a25e8ea0bc
Fixed Issues in Project Task
2015-06-30 17:15:13 +05:30
Nabin Hait
93cdee4503
[fix] Escape values in queries
2015-06-27 12:51:00 +05:30
Neil Trini Lasrado
64cacfb077
Fixes in Activity Cost
2015-06-16 15:42:40 +05:30
Neil Trini Lasrado
ae4cc078ea
Activity Cost - Mandatory removed for Employee.
2015-06-16 15:30:08 +05:30
Nabin Hait
b9626659ea
Merge pull request #3465 from neilLasrado/po
...
Po
2015-06-15 10:04:36 +05:30
Anand Doshi
63e4d31aa6
[fix] Task should be mandatory in Time Log only when Project is mentioned but Production Order is not
2015-06-12 18:59:18 -04:00
Neil Trini Lasrado
3c1a4a0b9b
percent_complete made no-copy in Project
2015-06-12 18:34:08 +05:30
Nabin Hait
e4f689184f
Merge pull request #3459 from neilLasrado/po
...
Multiple Fixes.
2015-06-12 17:55:23 +05:30
Nabin Hait
89592c5180
Load tasks in project for printing purpose
2015-06-12 17:37:28 +05:30
Neil Trini Lasrado
1f048b2426
Fixes in Activity Cost
2015-06-11 18:36:52 +05:30
Nabin Hait
1966225450
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 15:31:47 +05:30
Anand Doshi
ec60ebde6f
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-08 12:48:11 -04:00
Neil Trini Lasrado
39669f2717
operation made non mandatory in time log
2015-06-05 12:17:46 +05:30
Neil Trini Lasrado
58bf6c5950
Update task.py
2015-05-13 19:29:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431
Test Cases
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b
feild rename - internal rate/cost into costing rate/amount
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423
task made mandatory in project
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998
employee name added to activity cost
...
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Neil Trini Lasrado
3fcd89f63e
against_manufacturing renamed to for_manufacturing
2015-03-24 17:51:31 +05:30
Neil Trini Lasrado
bccec29415
In Time Log
...
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log
In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
2015-03-24 16:53:54 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Neil Trini Lasrado
e20057894e
Activity Type - permissions changed for users with system manager role
2015-02-18 13:06:12 +05:30
Neil Trini Lasrado
b091707ae8
Validate renaming of activity type - manufacturing
2015-02-18 13:00:56 +05:30
Neil Trini Lasrado
744aec8def
activity type fixs
2015-02-17 16:12:32 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
11cd4f6c30
time log activity type made mandatory, new activity type manufacturing created
2015-02-06 16:06:45 +05:30
Neil Trini Lasrado
07a0d250ed
time log fixes
2015-02-06 16:06:14 +05:30
Neil Trini Lasrado
b744e16a83
Activity made compulsory for time_log_type Project
2015-02-06 16:05:34 +05:30
Neil Trini Lasrado
93638bd179
Time Log -
...
Project made compulsory for time logs with time_log_for selected as 'Project'
Activity Type Madetory criteria removed
Compleated Quantity hidden if time_log_for is not set as Manufacturing
2015-02-06 16:05:34 +05:30
Nabin Hait
4ed51416e5
Merge pull request #2656 from neilLasrado/po-capacity-planning
...
fixes for production order
2015-02-06 16:04:08 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Neil Trini Lasrado
de164c91e0
actual start and end date calculation - call moved to submit and cancel of Time Log
2015-02-04 11:35:10 +05:30
Anand Doshi
aff9a59f2d
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
2015-01-29 19:49:34 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30