Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Anand Doshi
|
3af1b00e4e
|
[fix] BOM name in test_records.json
|
2016-04-08 16:21:03 +05:30 |
|
Anand Doshi
|
e6e7cd90c9
|
Merge pull request #5143 from KanchanChauhan/somefixes
[Minor Fixes] Findings in setting up erpnext
|
2016-04-08 16:20:11 +05:30 |
|
Kanchan Chauhan
|
017d30f465
|
[Minor Fixes] Findings in setting up erpnext
|
2016-04-06 19:28:50 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Rushabh Mehta
|
d690094b12
|
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
|
2016-04-04 16:57:56 +05:30 |
|
Anand Doshi
|
08b39b1ff8
|
[fix] escape fg_item in production planning's get_so_items
|
2016-04-04 13:16:56 +05:30 |
|
Rushabh Mehta
|
72b4ad8155
|
[cleanup] for quick-entry
|
2016-03-30 15:42:22 +05:30 |
|
Nabin Hait
|
3a15c92c5e
|
Fixed Asset Depreciation first commit
|
2016-03-29 11:54:37 +05:30 |
|
Neil Trini Lasrado
|
b6d9946854
|
Fixes Translations
|
2016-03-28 12:44:05 +05:30 |
|
Neil Trini Lasrado
|
11dafa27ba
|
Added Project to materail request
|
2016-03-21 12:40:42 +05:30 |
|
Neil Trini Lasrado
|
c7f53ff318
|
Added Project filter to Production Planning Tool
|
2016-03-21 12:40:42 +05:30 |
|
Nabin Hait
|
9a75530c26
|
[fix] reload doctype for renaming project
|
2016-03-18 16:19:25 +05:30 |
|
Nabin Hait
|
2e08e3e186
|
Merge pull request #4991 from neilLasrado/develop
Fixed Production Planning Tool
|
2016-03-17 19:05:09 +05:30 |
|
Nabin Hait
|
2ed8f8f099
|
[fix] BOM Browser
|
2016-03-17 15:55:48 +05:30 |
|
Neil Trini Lasrado
|
41380dfad8
|
Fixed Production Planning Tool
|
2016-03-16 15:26:01 +05:30 |
|
Neil Trini Lasrado
|
6e343e23d9
|
Renamed project_name to project
|
2016-03-15 17:50:53 +05:30 |
|
sbkolate
|
a897882434
|
enable uom in BOM Table View
reference
https://discuss.erpnext.com/t/uom-in-item-tables/10733/4
|
2016-02-26 19:32:11 +05:30 |
|
Nabin Hait
|
baa6d96a82
|
[fix] validate BOMs in BOM Replace Tool
|
2016-02-24 18:51:13 +05:30 |
|
Neil Trini Lasrado
|
f79760ce2d
|
Mumtiple fixes
|
2016-02-23 18:35:45 +05:30 |
|
Neil Trini Lasrado
|
0dd8500393
|
Fixed Documentation
|
2016-02-23 18:35:44 +05:30 |
|
Neil Trini Lasrado
|
fd9dc5e9f5
|
refactor code in Production Planning Tool
|
2016-02-23 18:35:44 +05:30 |
|
Neil Trini Lasrado
|
877e2ebff8
|
Fixed Production PLanning Tool
|
2016-02-23 18:35:44 +05:30 |
|
Neil Trini Lasrado
|
dddf42560f
|
Added code to update Material Request on Submission of Production Order
|
2016-02-23 18:35:44 +05:30 |
|
Neil Trini Lasrado
|
abd9248ba6
|
Rename sales_order_no to sales_order in Material Request Item
|
2016-02-23 18:35:43 +05:30 |
|
Neil Trini Lasrado
|
9739dc3639
|
Added make Production Order button against Material Request
|
2016-02-23 18:35:42 +05:30 |
|
Neil Trini Lasrado
|
966e5643c9
|
Added Material Request Link to Production Order
|
2016-02-23 18:35:42 +05:30 |
|
Nabin Hait
|
1a99cb8bfe
|
[fix] Escaping strings with percentage
|
2016-02-19 12:45:57 +05:30 |
|
Javier Wong
|
3d1f01ffc1
|
Fixed Get Open Sales Orders with Item Filter
Previously Get Open Sales Orders with Item Filter does not filter properly and instead returns Sales Orders with all Items.
|
2016-02-16 14:40:18 +05:30 |
|
Rushabh Mehta
|
3cdf3544fb
|
[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue
|
2016-02-08 18:50:40 +05:30 |
|
Nabin Hait
|
787e59c37e
|
[fix] BOM Autonaming
|
2016-01-19 16:48:31 +05:30 |
|
Rushabh Mehta
|
b46069d44b
|
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
|
2016-01-15 16:59:26 +05:30 |
|
Rushabh Mehta
|
2e3d2b8426
|
Merge pull request #4613 from nabinhait/fixes
[fix] Item query and exchange rate
|
2016-01-15 11:19:44 +05:30 |
|
Nabin Hait
|
a88912a2f5
|
[fix] Item query and exchange rate
|
2016-01-14 10:43:17 +05:30 |
|
Saurabh
|
e23e99f4bd
|
[enhance] merge customize buttons under groups
|
2016-01-13 09:18:31 +05:30 |
|
Anand Doshi
|
b55dd5b284
|
[fix] BOM validate quantity > 0
|
2016-01-04 16:02:04 +05:30 |
|
Nabin Hait
|
b6b56453e1
|
[fix] Get defaults based on doctype or fieldname
|
2015-12-23 16:37:06 +05:30 |
|
Rushabh Mehta
|
c819fd4ee8
|
[translations] for #4461
|
2015-12-10 10:34:32 +05:30 |
|
Rushabh Mehta
|
e1f8b1d695
|
[minor] [production planning tool] include non production items without default BOM in multi-level BOM
|
2015-12-04 10:53:15 +05:30 |
|
Rushabh Mehta
|
0fd67b23f4
|
[minor] duplicate button on BOM cancel
|
2015-11-26 10:37:24 +05:30 |
|
Nabin Hait
|
cf3cf2ca1f
|
[fix] Update exploded materials table from 'Update Cost' button
|
2015-11-23 15:12:18 +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 |
|
Rushabh Mehta
|
5951692db0
|
[fix] cleanup stop-resume code
|
2015-11-03 18:20:39 +05:30 |
|
Anand Doshi
|
21e09a2bd8
|
[enhancement] Ability to disable an Item
|
2015-10-29 12:39:47 +05:30 |
|
Anand Doshi
|
1d093a4039
|
[fix] change attach fields to small text
|
2015-10-19 12:56:29 +05:30 |
|
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 |
|
Anand Doshi
|
c76e34d7de
|
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 17:01:44 +05:30 |
|
Anand Doshi
|
9fc03b6c10
|
Merge pull request #4052 from rmehta/fix-operation-name
[fix] minor, remove operation naming field from operation
|
2015-09-24 11:30:07 +05:30 |
|
Rushabh Mehta
|
dd2f2f5321
|
[fix] minor, remove operation naming field from operation
|
2015-09-23 17:06:01 +05:30 |
|
Anand Doshi
|
52dfc32eca
|
[fix] validate_valuation_rate for Repack
|
2015-09-23 12:50:35 +05:30 |
|
Anand Doshi
|
1fef2fad2d
|
[minor] fixes in queries and payment tool
|
2015-09-14 18:27:21 +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
|
121176f0e9
|
Merge pull request #4002 from rmehta/notify-update-rename
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-11 15:11:57 +05:30 |
|
Rushabh Mehta
|
bc23e5ac5c
|
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-10 10:30:41 +05:30 |
|
Nabin Hait
|
f0b3014a23
|
Planned Qty logic fixed and reposted for existing
|
2015-09-09 11:04:10 +05:30 |
|
Anand Doshi
|
bc1e8b4408
|
[minor] Unset Apply User Permissions in default permissions
|
2015-09-08 19:23:23 +05:30 |
|
Anand Doshi
|
e1af7f1a0f
|
[minor] default mins_between_operations = 10
|
2015-09-08 15:55:09 +05:30 |
|
Rushabh Mehta
|
85abdc4fad
|
[minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291
|
2015-09-03 10:29:38 +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
|
282e4947fa
|
[fix] Changed more section label to 'More Information'
|
2015-08-27 13:11:46 +05:30 |
|
Neil Trini Lasrado
|
92a3dbb5d3
|
Fixes in Default Warehouse
|
2015-08-24 15:52:56 +05:30 |
|
Neil Trini Lasrado
|
75d90b1c00
|
Fixed Produciton Planning Tool
|
2015-08-24 15:23:58 +05:30 |
|
Neil Trini Lasrado
|
72e4cdcb25
|
Added default WIP Warehouse and FG Warehouse to Manufacturing Settings
Fetch default WIP Warehouse and FG Warehouse on load of Production Order
|
2015-08-24 15:23:58 +05:30 |
|
Neil Trini Lasrado
|
17231e39cc
|
Added validation in Production Order. Operations Time made mandatory
|
2015-08-21 16:52:04 +05:30 |
|
Rushabh Mehta
|
81e9d4e8f5
|
[fix] changed text > text editor for description fields in tables
|
2015-08-19 13:00:03 +05:30 |
|
Anand Doshi
|
df469c3e02
|
Merge pull request #3901 from rmehta/notify
[minor] notify stop/unstop (merge after merging realtime in frappe)
|
2015-08-19 10:31:41 +05:30 |
|
Rushabh Mehta
|
1d1f1b06d9
|
[minor] notify stop/unstop
|
2015-08-18 17:26:50 +05:30 |
|
Anand Doshi
|
d4cb1045ed
|
[fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings
|
2015-08-17 17:58:51 +05:30 |
|
Anand Doshi
|
85e0e87f01
|
[fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings
|
2015-08-14 12:55:27 +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 |
|
Neil Trini Lasrado
|
b44f26d1ba
|
Fixed Max value for update FG Item in Production Order
|
2015-08-10 19:14:43 +05:30 |
|
Neil Trini Lasrado
|
8ea2f45713
|
Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on
|
2015-08-10 19:14:43 +05:30 |
|
Neil Trini Lasrado
|
845980c010
|
Added Feature - Update FG based on Material Transfer For Manufacturing
|
2015-08-10 19:14:43 +05:30 |
|
Nabin Hait
|
3c3a3ecea8
|
Additional Costs in Stock Entry
|
2015-08-10 14:07:45 +05:30 |
|
Nabin Hait
|
039154faa9
|
[fix] Asynchronus issue while fetching item description in Production Order
|
2015-08-05 15:56:05 +05:30 |
|
Nabin Hait
|
541927d58a
|
[fix] Get open SO in production planning tool
|
2015-08-03 16:39:20 +05:30 |
|
Nabin Hait
|
c330a49e9d
|
[hotfix] item search in production order
|
2015-07-30 16:45:58 +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 |
|
Nabin Hait
|
18c2c54633
|
Merge pull request #3718 from rmehta/item-cleanup
[cleanup] yes/no selects changed to checks in Item
|
2015-07-29 15:49:54 +05:30 |
|
Rushabh Mehta
|
1e8025b327
|
[cleanup] yes/no selects changed to checks in Item
|
2015-07-29 11:38:33 +05:30 |
|
Nabin Hait
|
9088432f10
|
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
|
2015-07-28 11:16:22 +05:30 |
|
Nabin Hait
|
6a09b3f7ef
|
Merge pull request #3702 from neilLasrado/capacity-planning
Global switch to set capacity planning in manufacturing
|
2015-07-24 14:26:28 +05:30 |
|
Neil Trini Lasrado
|
8a9d41a92e
|
Modified Test Cases for Production Order
|
2015-07-24 13:18:45 +05:30 |
|
Neil Trini Lasrado
|
f965c5d203
|
now_datetime changed to nowdate
|
2015-07-24 13:14:57 +05:30 |
|
Neil Trini Lasrado
|
21647974c4
|
Test Cases Added to Production Order
|
2015-07-24 13:14:57 +05:30 |
|
Neil Trini Lasrado
|
9c3dca63fa
|
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
|
2015-07-24 13:14:56 +05:30 |
|
Neil Trini Lasrado
|
c723c8b5aa
|
Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
|
2015-07-23 17:43:27 +05:30 |
|
Neil Trini Lasrado
|
2771b7d828
|
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
|
2015-07-23 17:39:35 +05:30 |
|
Neil Trini Lasrado
|
8b48ceab8c
|
Removed logic for get_item_details in Production Planning Tool, Used get_item_details function of Production Order instead
|
2015-07-22 12:42:21 +05:30 |
|
Neil Trini Lasrado
|
cc431716ed
|
Fetch Template Bom if no BOM is set against Item Variant in Production Order
|
2015-07-22 12:13:47 +05:30 |
|
Neil Trini Lasrado
|
0248811e53
|
Fixed deafault BOM problem
|
2015-07-16 11:26:40 +05:30 |
|
Rushabh Mehta
|
94157334a7
|
[rename] Material User > Stock User
|
2015-07-13 15:06:12 +05:30 |
|
Neil Trini Lasrado
|
fe2ffaeafa
|
Fixes in Production Planning Tool
|
2015-07-13 12:41:28 +05:30 |
|
Neil Trini Lasrado
|
dcef448f1e
|
Planned Start Date added to Production Planning Tool
|
2015-07-13 12:41:28 +05:30 |
|
Neil Trini Lasrado
|
ccf8c337f7
|
Expected Delivery date validation changed to message
|
2015-07-13 12:40:57 +05:30 |
|
Neil Trini Lasrado
|
4f33249e1c
|
Fixes in Production Order
|
2015-07-13 12:26:33 +05:30 |
|
Neil Trini Lasrado
|
5da4d857c9
|
Track Operations added to Production Order
|
2015-07-13 12:01:57 +05:30 |
|
Nabin Hait
|
f18bbcef86
|
PP Tool: Create production order if applicable for item
|
2015-07-10 17:31:03 +05:30 |
|
Neil Trini Lasrado
|
e233f0e2ff
|
Validation added in Production Order to prevent PO against Item Template or if Allow PO is No in Item Master
|
2015-07-09 17:35:51 +05:30 |
|
Rushabh Mehta
|
bc799885d0
|
[fix] bom client script
|
2015-07-02 12:44:16 +05:30 |
|
Nabin Hait
|
dfac6848cc
|
In list view property added in BOM
|
2015-06-26 14:42:51 +05:30 |
|
Neil Trini Lasrado
|
4abf552d7b
|
Over Production Allowance Percentage Setting added to Manufacturing Settings
|
2015-06-15 15:58:45 +05:30 |
|
Anand Doshi
|
f2a0161709
|
[fix] Don't create Time Logs against Production Order if Workstation is not specified in Operations
|
2015-06-12 18:58:36 -04:00 |
|
Neil Trini Lasrado
|
fc595064e0
|
validation added to prevent Delivery Date in Porduction Order to be lesser than Planned Start Date
|
2015-06-11 18:36:52 +05:30 |
|
Nabin Hait
|
0b18a2d347
|
Reset values in tools like Payment Tool
|
2015-06-05 12:01:29 +05:30 |
|
Nabin Hait
|
c87595b2da
|
show item description in item grid view if marked for 'In List View'
|
2015-06-03 11:24:37 +05:30 |
|
Nabin Hait
|
d9d5925f14
|
[fix] BOM item validation in lower case
|
2015-05-29 10:39:09 +05:30 |
|
Pratik Vyas
|
f52b5ac8af
|
Merge pull request #3339 from rmehta/help
[help] added links in modules, added learn desktop module
|
2015-05-27 15:21:00 +05:30 |
|
Rushabh Mehta
|
2fd33a2f03
|
Merge pull request #3358 from nabinhait/develop
General ledger, _idx and FY in Material request
|
2015-05-27 15:10:51 +05:30 |
|
Nabin Hait
|
eb00cae86c
|
Fiscal Year removed from Material Request
|
2015-05-27 13:18:09 +05:30 |
|
Anand Doshi
|
409843d768
|
[fix] workstation fixes related to Production Order
|
2015-05-26 19:13:45 -04:00 |
|
Rushabh Mehta
|
5fa6c4ce21
|
[enhancement] add bom tree view
|
2015-05-26 12:41:25 +05:30 |
|
Rushabh Mehta
|
314af94737
|
[minor] added multiple commit in bom
|
2015-05-26 12:15:39 +05:30 |
|
Rushabh Mehta
|
6771240471
|
[help] added links in modules, added learn desktop module
|
2015-05-25 18:31:08 +05:30 |
|
Nabin Hait
|
fd4bcd855b
|
test case fixes
|
2015-05-22 16:55:55 +05:30 |
|
Nabin Hait
|
de7b87ee3a
|
[fix] operations and bom
|
2015-05-21 13:24:49 +05:30 |
|
Pratik Vyas
|
1a84d8ecd2
|
Merge branch 'develop'
|
2015-05-19 12:23:52 +05:30 |
|
Rushabh Mehta
|
9dd8aab211
|
[fix] status updater
|
2015-05-18 11:19:10 +05:30 |
|
Nabin Hait
|
9f926080b6
|
minor fix in reports
|
2015-05-15 10:44:19 +05:30 |
|
Neil Trini Lasrado
|
3c3cdc7029
|
fixes
|
2015-05-07 18:52:12 +05:30 |
|
Neil Trini Lasrado
|
20e1c781b6
|
js call changed to trigger
|
2015-05-07 17:31:59 +05:30 |
|
Neil Trini Lasrado
|
a10bdd4980
|
fixes
|
2015-05-07 17:31:59 +05:30 |
|
Neil Trini Lasrado
|
4f5cc9d672
|
Test case added to Production Order to check planned-operating-cost against qty
|
2015-05-07 17:31:24 +05:30 |
|
Neil Trini Lasrado
|
e63146408d
|
production order - fixes cost not considering qty issue
|
2015-05-07 17:31:24 +05:30 |
|
Nabin Hait
|
b0e9c06f93
|
Stock Entry agianst Manufaturing: fetch only stock items from bom
|
2015-05-02 18:46:29 +05:30 |
|
Nabin Hait
|
1bf03289a6
|
Service items should not be considered as raw material in production planning tool
|
2015-04-30 16:13:47 +05:30 |
|
Nabin Hait
|
6e659a4f27
|
Service items should not be considered as raw material in production planning tool
|
2015-04-30 11:51:24 +05:30 |
|
Rushabh Mehta
|
45ca8a4d31
|
[minor] save last company in multi-company scenario
|
2015-04-28 16:04:56 +05:30 |
|
Nabin Hait
|
9c8b6eb815
|
minor fix in completed production orders report
|
2015-04-24 18:36:02 +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 |
|
Rushabh Mehta
|
38c6b52770
|
[rename] group_or_ledger to is_group
|
2015-04-23 13:14:17 +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
|
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 |
|
Neil Trini Lasrado
|
261e27b9ec
|
type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed
|
2015-04-21 16:43:43 +05:30 |
|
Rushabh Mehta
|
d7330ec709
|
[minor] add disabled property in fiscal year:
|
2015-04-18 17:04:04 +05:30 |
|
Rushabh Mehta
|
53bc304be2
|
Merge pull request #3037 from neilLasrado/production-planning
Production planning
|
2015-04-15 12:06:44 +05:30 |
|
Rushabh Mehta
|
5e7f8fd156
|
[ux] bom fixes #3072
|
2015-04-14 14:24:21 +05:30 |
|
Neil Trini Lasrado
|
18dc151fc7
|
Fixes in make_time_log function in Production Order
|
2015-04-14 13:06:07 +05:30 |
|
Neil Trini Lasrado
|
1371afce2e
|
added default date to planned start date in Prod Order & made planned end date read-only
|
2015-04-14 13:00:54 +05:30 |
|
Neil Trini Lasrado
|
c43ac20115
|
Fixes in logic for production order scheduling
|
2015-04-14 13:00:54 +05:30 |
|
Neil Trini Lasrado
|
5ab7d930b6
|
make time log button in Production order operations fixed
show time logs button made available for compleated operations
|
2015-04-14 13:00:54 +05:30 |
|
Neil Trini Lasrado
|
8d5d5cc0a7
|
Planned Start Date made mandatory in production order
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
|
2015-04-14 13:00:54 +05:30 |
|
Rushabh Mehta
|
750ceedbc1
|
[production order] explict idx + test fix
|
2015-04-02 16:03:11 +05:30 |
|
Anand Doshi
|
6208c49859
|
Added Company field in various Query Reports
|
2015-03-30 15:21:20 +05:30 |
|
Nabin Hait
|
e5604dc944
|
production order operation order by idx
|
2015-03-26 17:40:57 +05:30 |
|