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
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
15e4833785
Merge pull request #2943 from neilLasrado/time-log
...
bug fix - show time log in production order operations
2015-03-12 17:53:16 +05:30
Neil Trini Lasrado
76d3a6c2ba
bug fix - show time log in production order operations
2015-03-12 17:51:50 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Nabin Hait
1ca0b74e03
Merge pull request #2945 from neilLasrado/workstation
...
warehouse removed from workstation master
2015-03-12 16:13:47 +05:30
Neil Trini Lasrado
2c25a4396f
warehouse removed from workstation master
2015-03-10 15:15:54 +05:30
Neil Trini Lasrado
42556dfab9
fixes-in-production-order
2015-03-09 15:35:24 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
b888359b45
Merge pull request #2886 from neilLasrado/bom_test_records
...
text records fixed in bom
2015-03-05 10:57:33 +05:30
Nabin Hait
57a5c71663
Update rate in exploded_items on click of update cost btton
2015-03-03 18:27:21 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Nabin Hait
81b8d7597d
bom with operations activity
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Rushabh Mehta
c33a81c536
[production order] from_bom issue fixes #2879
2015-03-02 18:27:03 +05:30
Neil Trini Lasrado
5cbd12e4e5
text records fixed in bom
2015-03-02 10:53:12 +05:30
Rushabh Mehta
e91388381c
[minor] notifications and other fixes to stock
2015-02-25 15:08:57 +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
2878cc7757
[fix] get bom items query
2015-02-24 12:39:42 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34: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
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
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +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
e9d45bcb28
patch fixes
2015-02-18 20:25:44 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
7f70367dde
image view fixed for stock entry and bom
2015-02-18 12:33:19 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Nabin Hait
b120520aa8
fixed patches
2015-02-18 11:54:08 +05:30
Nabin Hait
d81e73e067
Merge pull request #2747 from neilLasrado/warehouse-filter
...
filters added to warehouses in prod order
2015-02-18 11:19:42 +05:30
Neil Trini Lasrado
7182d349df
fixes for capacity planning using production planning tool
2015-02-17 16:19:41 +05:30
Neil Trini Lasrado
b13c4e2516
filters added to warehouses in prod order
2015-02-17 16:07:37 +05:30
Nabin Hait
8dd0e9db15
Merge pull request #2759 from neilLasrado/prod-workstation
...
workstation and operation time made editable in production order.
2015-02-17 14:21:24 +05:30
Nabin Hait
44454cb81b
Merge pull request #2744 from neilLasrado/operation-time
...
operation time made mandatory in bom operations
2015-02-17 14:08:55 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Neil Trini Lasrado
f120aec9c2
workstation and operation time made editable in production order. Cost recalculation logic added
2015-02-16 15:10:29 +05:30
Rushabh Mehta
7a64cb2aa5
[bom] [fix] company link
2015-02-13 16:11:25 +05:30
Neil Trini Lasrado
06f712dcd7
operation time made mandatory in bom operations
2015-02-12 17:52:46 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
ceb04726c8
Merge pull request #2725 from neilLasrado/workstation-operation-hours
...
Workstation Doc Fixed
2015-02-11 16:52:26 +05:30
Neil Trini Lasrado
8521558f40
Workstation Doc Fixed
2015-02-11 14:58:43 +05:30
Neil Trini Lasrado
87402df56a
validations added to production order
2015-02-11 14:35:52 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Nabin Hait
c5fb88c1cd
UOM validation for BOM Items
2015-02-09 16:48:02 +05:30
Neil Trini Lasrado
8fd3828ef5
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
2015-02-06 16:09:55 +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
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
59a706585c
actual start and end date made blank if islocal
2015-02-04 11:44:24 +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
Neil Trini Lasrado
2017796de7
fixes in auto create time logs
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e
fixes for productiojn order
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
acbf185c1e
fixes
2015-02-03 18:07:34 +05:30
Neil Trini Lasrado
c8c67f7807
Bom operations and item link removed. Cost recalculated on removal of operation or rew material row.
2015-02-03 18:07:34 +05:30
Nabin Hait
c0c9023d27
Merge pull request #2653 from neilLasrado/bom-validations
...
Validations added to Bom Doctype.
2015-02-03 18:01:31 +05:30
Neil Trini Lasrado
9257baa747
fixes in bom validations
2015-02-03 12:29:36 +05:30
Neil Trini Lasrado
f5be350eb4
Validations added to Bom Doctype.
2015-02-03 12:21:46 +05:30
Neil Trini Lasrado
41acbff959
item name added to BOM
2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
26b01f7852
fixes
2015-01-19 17:18:43 +05:30
Neil Trini Lasrado
f1f0a8ac19
bom - button added to update item desc.
2015-01-19 17:11:32 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
c481e27d88
Merge pull request #2565 from alexandre-00/patch-11
...
Update bom.py
2015-01-14 11:39:08 +05:30
Neil Trini Lasrado
73cad76010
dirty code cleanup
2015-01-13 13:55:34 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Nabin Hait
873d98be2d
create material request from production planning tool
2015-01-11 22:01:59 +05:30
alexandre-00
3ed3a2d176
Update bom.py
...
removed the attrgetter
2015-01-09 14:42:27 +08:00
alexandre-00
de58657537
Update bom.py
...
Hi guys,
Just a proposal to sort the Materials Required (Exploded) from the BOM.
So the items and sub-assemblies items looks a little bit more organized in the list.
Cheers
Alexandre
2015-01-09 14:20:43 +08:00
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1ff3a6cdb8
fix
2015-01-07 16:24:52 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
5604f987f2
item validation in bom
2014-12-31 12:37:11 +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
Nabin Hait
1fa7171bfa
minor fixes
2014-12-23 17:38:59 +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
812cd8a8ce
Prod Order Form Modified
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
Neil Trini Lasrado
8d34417c44
Bom currency feilds changed to type currency and company feild added to BOM
2014-12-12 11:33:50 +05:30
Neil Trini Lasrado
3a34cadcb2
Fix - Total Fixed Cost with patch
2014-12-11 17:15:12 +05:30
Neil Trini Lasrado
c73f4f70e4
BOM doctype design modified. Quality feild moved from 'More Section' to 'Materials Section'
...
[fix] Issue #2404
2014-12-04 12:42:23 +05:30
Nabin Hait
789b74257e
test case fixes
2014-11-27 15:22:24 +05:30
ankitjavalkarwork
fff1b42f80
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 14:19:06 +05:30
Neil Trini Lasrado
f92b026405
fixed
2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
2c404cf34f
FIX validate-bom wrong condition
2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
df4b947e40
data type of start_date and end_date changed to datetime
2014-10-27 14:41:43 +05:30
