Nabin Hait
31f6c984f0
Update .travis.yml
2015-04-27 16:48:33 +05:30
Nabin Hait
3ee5db123f
Merge pull request #3164 from nabinhait/v4.x.x
...
advance paid should not be copied and patch to fix affected records
2015-04-27 16:45:26 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Anand Doshi
8be3ba36d9
fixed relative urls in some web pages
2015-04-24 13:22:08 -04:00
Nabin Hait
9c8b6eb815
minor fix in completed production orders report
2015-04-24 18:36:02 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Nabin Hait
218a1267c9
Merge pull request #3146 from neilLasrado/project
...
FIxes - Time Log Hours calculation
2015-04-23 14:37:23 +05:30
Nabin Hait
ffa6d94f7a
Merge pull request #3150 from rmehta/is_group
...
[rename] group_or_ledger to is_group
2015-04-23 14:37:00 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
d3179a733b
datatype of hour_rate in Production order operations and bom operation changed to float
2015-04-22 16:11:48 +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
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Nabin Hait
1e3fb54b82
Merge pull request #3006 from neilLasrado/project
...
Project Costing
2015-04-22 12:36:15 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +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
086c0463be
Fixes in Patch
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
e7ddb72e7f
patch for renaming project feilds
2015-04-22 11:25:59 +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
ec5c66f8f0
Title Feild added to Expense Claim
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
7f9ea3bf6a
expense claim test records
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
Rushabh Mehta
0f2b7bd2bf
Update setup.py
2015-04-22 10:50:02 +05:30
Pratik Vyas
6814a39186
Update .travis.yml
2015-04-21 19:19:34 +05:30
Rushabh Mehta
3c77b332ae
Merge pull request #3142 from neilLasrado/production-planning
...
Manufacturing Settings
2015-04-21 19:13:13 +05:30
Neil Trini Lasrado
d93750a868
Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int
2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
