Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,746 Commits 3 Branches 0 Tags 1 GiB
bb256e41d7
Commit Graph

282 Commits

Author SHA1 Message Date
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
Rushabh Mehta
d49a123fd0 [ui] listviews 2015-01-07 16:43:47 +05:30
Anand Doshi
9b955feff8 [design] POS - item grid and taxes 2015-01-05 16:19:12 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Nabin Hait
89c52eacc7 Actual operation cost in stock entry, fixed cost removed from bom and workstation 2014-12-23 17:39:00 +05:30
Nabin Hait
0de6256bcc time log and workstations 2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61 capacity planning fixes and cleanup 2014-12-23 17:39:00 +05:30
Neil Trini Lasrado
e84fa67f30 Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above 
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519 Holiday List name changed and workstation filter added to time log 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log 2014-12-23 17:38:59 +05:30
Revant Nandgaonkar
b80d892eab removed unecessary backslash 2014-12-02 14:19:29 +05:30
Revant Nandgaonkar
83db3e3ddb "From time" cannot be later than "To time" and hours cannot be negative 2014-12-01 16:53:29 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
ankitjavalkarwork
14e1d20df3 Change position of 'To Time' field for better UX 2014-10-22 16:55:29 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30