Commit Graph

227 Commits

Author SHA1 Message Date
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