Commit Graph

1617 Commits

Author SHA1 Message Date
Ameya Shenoy
4e91f28ce5 [ui-testing] added test for production order ()
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* added warehouses required for production order

* [ui-test] added production order test

* debugging travis failure
2017-07-31 11:02:28 +05:30
Rohit Waghchaure
33977827c4 [Fix] Timesheet Company Issue 2017-07-29 14:15:50 +05:30
Rushabh Mehta
d50da78f28 [fixes] errors caught on flake8 () 2017-07-28 11:39:01 +05:30
Saurabh
36645e4e2f Merge branch 'master' into staging 2017-07-25 16:15:51 +05:30
Saurabh
fb4f320df4 Merge branch 'master' into develop 2017-07-25 16:15:50 +05:30
Ameya Shenoy
08450878f1 [ui-test] added test for bill_of_materials ()
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* fixed minor codacy problems

* added minor requested changes
2017-07-25 15:23:58 +05:30
Makarand Bauskar
fcaf313c0f [minor] make-demo fixes for manufacturing domain () 2017-07-25 10:49:35 +05:30
bcornwellmott
1c32f5ace9 Whitelist method for adding production orders ops () 2017-07-24 22:43:44 +05:30
Ameya Shenoy
91b2833708 [ui-tests] added workstation and operation ()
* [ui-test] workstation and operation testing added

* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
2017-07-24 14:34:30 +05:30
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates ()
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Nabin Hait
e6c2ae3682 Merge pull request from rmehta/workstation-form
[ux] workstation form layout
2017-07-19 10:24:28 +05:30
Rushabh Mehta
d2d24554b3 [ux] workstation form layout 2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott
c7d2bc67e8 Update qty from stock_qty before validate materials 2017-07-18 08:56:25 -07:00
Nabin Hait
e06526ffff Add indexes in some transaction doctypes () 2017-07-17 13:28:27 +05:30
Makarand Bauskar
1efb05233c [minor] don't trigger source_warehouse if item_code is not set in Production Order () 2017-07-12 14:53:14 +05:30
Nabin Hait
f7d2a59c18 Merge pull request from sagarvora/fix-bom-issue
[minor] fix bom price resetting on validation
2017-07-10 20:41:16 +05:30
Nabin Hait
dd7a723214 minor fixes while upgrading an old instance 2017-07-10 16:41:59 +05:30
Nabin Hait
b866fcf14f Finish prod order when skipped material transfer 2017-07-08 12:57:13 +05:30
Manas Solanki
cf7f72e586 frappe call only when there is item 2017-07-07 15:09:57 +05:30
Nabin Hait
e927b81292 Update production_order.js 2017-07-06 23:11:54 +05:30
Nabin Hait
02c8607d04 Production Order Documentation for Required Items table () 2017-07-06 11:28:07 +05:30
Nabin Hait
37c784eb3a Updated modified in bom doctypes 2017-07-05 16:09:23 +05:30
Nabin Hait
949a920022 Production Order Enhancements ()
* Production Order Enhancements
  - Show required items child table
  - Source warehouse for each raw materials, in Pro Order Item and BOM Item table
  - Group warehouse allowed for source and wip warehouse
  - Patch to populate required items, to fix status and reserved qty for stopped pro order
  - Cleaned up existing codes
  - Test cases

* Set available qty in source and wip warehouse

* minor fix in bom query naming

* Minor Fixes

* Reload BOM doctypes in patch
2017-07-05 13:55:41 +05:30
Sagar Vora
7640858510 [minor] fix bom price resetting on validation 2017-06-29 22:20:07 +05:30
rohitwaghchaure
69279229cc Merge pull request from bcornwellmott/bom_convert_uom
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Rohit Waghchaure
5b7028c7bb stock qty not changed if item change 2017-06-28 15:58:51 +05:30
Makarand Bauskar
5e994ddf65 removed white spaces 2017-06-23 17:58:50 +05:30
creamdory
9961fb82d6 Bom Stock Report Change Requests 2017-06-23 15:57:52 +08:00
Makarand Bauskar
0ea5d941e6 Merge branch 'develop' into bom_convert_uom 2017-06-21 21:35:38 +05:30
Sagar Vora
086b6a33ea Fixed BOM value not updating on changing item () 2017-06-19 12:25:14 +05:30
Ben Cornwell-Mott
2c77165fc6 Fixed small code issues (codecy) 2017-06-16 13:47:40 -07:00
Rushabh Mehta
e0434ad40e Merge branch 'develop' into bom_convert_uom 2017-06-15 17:32:27 +05:30
mbauskar
f9e2bf1ab4 fixed merge conflicts 2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c Once primary key is generated, do not allow changing Series ()
* changes set_only_once field for tabDocField to 1

* changes all affected doctypes `set_only_once` option to 1

* add patch name to text file

* adds test cases

* Revert "add patch name to text file"

This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.

* Revert "changes set_only_once field for tabDocField to 1"

This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Sagar Vora
99a2db80ab move bom based rate calculation to end () 2017-06-14 12:38:27 +05:30
bcornwellmott
d53dd7f4c9 Merge branch 'develop' into bom_convert_uom 2017-06-13 08:40:24 -07:00
tundebabzy
26a39610ca fixes : Better error message for duplicate items ()
* fixes : Better error message for duplicate items

* gathers all non unique items instead of first encountered non unique item

* renders errored items with `br` instead of `li`
2017-06-13 17:40:56 +05:30
bcornwellmott
fed9816213 Removed trailing whitespace 2017-06-09 07:37:27 -07:00
bcornwellmott
a35839aa47 Removing unused pprint 2017-06-09 07:36:15 -07:00
bcornwellmott
5491275b66 Merge branch 'develop' into bom_convert_uom 2017-06-07 08:42:54 -07:00
Faris Ansari
5f27c94100 Merge pull request from netchampfaris/remove-globals
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott
70fe968f02 Fixed some errors 2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott
a3aa6a4449 Changed Explosion Item as well 2017-06-02 16:54:03 -07:00
Nabin Hait
c9fa07b16d Merge branch 'master' into develop 2017-05-30 15:59:04 +05:30
Manas Solanki
a85b68ee77 link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 () 2017-05-30 15:55:00 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
bcornwellmott
8fa1e03367 Merge branch 'develop' into bom_convert_uom 2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669 Added BOM UOM selection for items
Added patch for BOM Item UOM

Fixed scrap qty issue

Added Scrap Qty update to patch

Reverted test record for production order
2017-05-24 11:12:51 -07:00
Ishan Loya
9bf4563b7a Change modified time 2017-05-24 17:47:42 +05:30
Ishan Loya
a70b41fbb8 Remove Role 'All' from BOM 2017-05-24 17:47:42 +05:30
Ishan Loya
bdb2f95957 Show duplicate button in BOM unless in draft stage () 2017-05-16 08:25:07 +05:30
Ishan Loya
56c1b2a625 Make proposed corrections 2017-04-24 10:44:36 +05:30
Ishan Loya
b12e15dcc4 Change modified by 2017-04-24 10:44:36 +05:30
Ishan Loya
e5fdd47fd8 Hide 'Qty Transferred for Manufacturing' field if skip material transfer 2017-04-24 10:44:36 +05:30
Ishan Loya
7544904857 Add option to skip material transfer for production orders 2017-04-24 10:44:36 +05:30
mbauskar
40ca4c3bbb [minor] fixes in bom tree view template 2017-04-13 14:29:19 +05:30
Nabin Hait
075b299673 bom traversing: argument mutable issue 2017-04-11 18:27:34 +05:30
mbauskar
236f7aac7f [minor] track changes for transaction documents 2017-04-10 14:48:54 +05:30
Rohit Waghchaure
e7c0188732 [enhance] Get project from bom on production order 2017-03-31 13:40:06 +05:30
Nabin Hait
1f6bd0ad37 Fixed merge conflict 2017-03-30 13:15:22 +05:30
Nabin Hait
fede6d8fbe Updated modified date for production order 2017-03-28 20:42:42 +05:30
Nabin Hait
d1f6cc88f2 Required items table in Production order 2017-03-28 17:08:40 +05:30
Rohit Waghchaure
d7908f8e3a [fix] sales order with status closed fetching on production planning tool 2017-03-28 12:30:23 +05:30
Nabin Hait
0329c0ffab Test case fixed for production order 2017-03-27 19:11:45 +05:30
Nabin Hait
5b60ef2dce Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked 2017-03-27 16:29:51 +05:30
Kanchan Chauhan
7cf1a1d84b Project filter in BOM selection in Production Order 2017-03-16 17:09:37 +05:30
Rushabh Mehta
6b53792aea [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Nabin Hait
b3ffd6b282 Merge pull request from rohitwaghchaure/update_user_roles_to_roles
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
e68f32cf19 UOM Conversion in selling 2017-03-06 16:41:13 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Rohit Waghchaure
94c30d81b1 [Fix] Production order operations scheduling issue 2017-02-24 19:21:40 +05:30
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
Nabin Hait
6e1a2b16a5 Company, Currency, Conversion Rate fields are mandatory in BOM 2017-02-21 13:11:02 +05:30
Nabin Hait
d5442b5544 Merge pull request from nabinhait/pro_order_stock_qty
Build Qty considering quantity for which bom is created
2017-02-21 09:58:13 +05:30
Nabin Hait
391eca18c7 Fixed merge conflict 2017-02-20 19:38:22 +05:30
Nabin Hait
afd8df8a20 Build Qty considering quantity for which bom is created 2017-02-20 18:06:50 +05:30
Nabin Hait
6ffd77660b Changed module for Production Analytics 2017-02-20 17:41:44 +05:30
Nabin Hait
3cdb65f782 Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana 2017-02-20 17:25:01 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
bcornwellmott
97ab1d2eb3 Merge pull request from bcornwellmott/stock_reports
Stock reports
2017-02-19 14:36:35 -08:00
bcornwellmott
568dac3aad Fixed Link Option for Warehouse 2017-02-19 14:04:20 -08:00
pratu16x7
0e94b4bec4 Mobile view fixes 2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90 Website data from existing child tables, layout, images 2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae Add operations and items to website 2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20 Add template 2017-02-14 17:18:09 +05:30
Ben Cornwell-Mott
67a13972fb Added warehouse to BOM Stock Report, fixed bugs with buildable qty 2017-02-09 23:21:52 -08:00
bcornwellmott
630882787a Added buildable qty
The field indicates how many can be built.
2017-02-09 20:41:12 -08:00
bcornwellmott
fc41bb6afd Fixed code issues
Also changed qty to Quantity left to build
2017-02-09 20:37:11 -08:00
Ben Cornwell-Mott
05dca985e6 Fixed stock query and corrected with suggestions from rohit 2017-02-07 09:15:33 -08:00
Ben Cornwell-Mott
02c02bc572 Fixed counting to correctly reflect all status at each month 2017-02-06 20:58:25 -08:00
Ben Cornwell-Mott
36d04fda37 Fixed filter dates and date comparisons 2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott
b4a2c2f047 Got proper cumulative data working 2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott
943124275d Production Analytics 2017-02-04 14:25:53 -08:00
Rushabh Mehta
6ede4a3809 [enhance] production order from sales order 2017-02-02 17:42:01 +05:30
Rushabh Mehta
3714626dd0 [minor] enhance BOM view 2017-02-01 18:35:53 +05:30
Kanchan Chauhan
45c14ed41c [Minor] Date fix in Production Order 2017-01-19 12:22:04 +05:30
Nabin Hait
6b3670848e Merge pull request from rmehta/custom-perms
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Nabin Hait
f8676b2058 Create Material Requests considering projected qty of items 2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830 Fixes counting of in stock parent assemblies and formatting of csv 2017-01-17 14:11:43 +05:30
KanchanChauhan
b89be1e193 [Minor] Demo fixes () 2017-01-16 12:57:14 +05:30
Rushabh Mehta
af077dc616 [minor] fix for custom perms 2017-01-13 14:47:37 +05:30
Ben Cornwell-Mott
3d491f90cc Created 2 reports for stock details 2017-01-10 14:14:18 -08:00
Muhammad Huzaifah Bin Ismail
465da8ce09 Fixed spelling errors on Production Planning Tool and manual. 2016-12-28 18:15:45 +08:00
Rushabh Mehta
5a3f421453 [fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474 2016-12-20 12:59:09 +05:30
bhupen
9e146669d3 Issue Items Against Production Order 2016-12-14 17:40:32 +05:30
bhupen
52b3924006 mendatory hours field 2016-12-14 11:32:23 +05:30
bhupen
b42dc5a899 mendatory hours field 2016-12-13 15:25:53 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 () 2016-12-05 14:17:26 +05:30
Nabin Hait
7f3da5dbb1 Fixed merge conflict 2016-11-28 14:23:51 +05:30
Nabin Hait
d0839799c1 Update workstation.py 2016-11-26 09:54:00 +05:30
Rohit Waghchaure
b1b328865e [Enhancement] Currency added in the BOM 2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Nabin Hait
9b797974b5 Set project from Sales Order while creating Material Request from PPT, fixed 2016-11-21 18:15:50 +05:30
Nabin Hait
b30e184f6b Merge pull request from KanchanChauhan/workstation-fix
[Fix]Workstation holiday list
2016-11-21 14:51:24 +05:30
Nabin Hait
d7faefc739 Merge pull request from KanchanChauhan/bom-error-fix
[Fix] Better error message if default BOM not found
2016-11-21 14:51:03 +05:30
Kanchan Chauhan
fdcfe180ad [Fix] Better error message if default BOM not found 2016-11-21 11:29:18 +05:30
Kanchan Chauhan
d33c44e3a5 [Fix]Workstation holiday list 2016-11-21 11:23:01 +05:30
Nabin Hait
46753de6d7 fixed merge conflict 2016-11-17 15:55:11 +05:30
Nabin Hait
d4e8b297cd Merge pull request from RobertSchouten/calendar_fix
[fix] calendar range fixes
2016-11-17 14:45:59 +05:30
Nabin Hait
aa68058910 Updated modified_datetime in production planning tool 2016-11-16 17:41:08 +05:30
strixaluco
2ef9232707 [typo] desription → description in bom.json 2016-11-08 10:56:36 +08:00
Rushabh Mehta
13fc52d713 [minor] added default standard filters () 2016-11-07 17:19:19 +05:30
Nabin Hait
f5d8dd3b18 Fixed merge conflict 2016-11-04 16:54:53 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Rushabh Mehta
1aac956306 [minor] [fixes] can rename program and disable role on domainify 2016-11-02 07:33:18 +05:30
robert schouten
bb79fc5b0c [fix] calendar range fixes 2016-11-01 17:14:51 +08:00
bcornwellmott
30df3cd3dc Add description, stock UOM and Min Order Qty to MRs
The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.
2016-10-25 14:21:26 -07:00
Saurabh
8c3764a6ef test case for scrap item 2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9 added get_scrap_items param to get_bom_items_as_dict 2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7 [enhance] scrap management 2016-10-24 13:55:36 +05:30
Saurabh
464c27e189 [feature] scrap management 2016-10-24 13:55:36 +05:30
Nabin Hait
0702fa2fc6 Fixed version conflict 2016-10-19 16:49:36 +05:30
Rohit Waghchaure
ac9172f6df [Fix] total projected qty 2016-10-19 15:06:30 +05:30
Nabin Hait
ff183eedb9 Fixes for testcases 2016-10-19 14:23:02 +05:30
Nabin Hait
fa1cdd5bf0 Fixed merge conflict 2016-10-18 15:37:33 +05:30
Rohit Waghchaure
8e881cc7b9 [Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order 2016-10-10 14:58:33 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
2704a4a8fc Update production_order.py 2016-10-05 16:14:42 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Faris Ansari
70b7d3280b added required fields in doctypes for gantt () 2016-09-26 18:20:14 +05:30
Mainul Islam
dbf2ce67a6 Fixed Issue#6370 2016-09-19 12:49:01 +06:00
Nabin Hait
3cef7d5ae9 Update production_planning_tool.py 2016-09-15 17:01:00 +05:30
RobertSchouten
4ca64c33eb Update production_planning_tool.json 2016-09-13 08:36:05 +08:00
RobertSchouten
5414725fd6 PPT material request non-stock items 2016-09-13 08:27:51 +08:00
Nabin Hait
9d9d1dceeb Merge pull request from bcornwellmott/bom_desription
Fixed spelling
2016-09-12 18:45:21 +05:30
Nabin Hait
d7b95267b3 Update production_planning_tool.py 2016-09-12 18:33:17 +05:30
RobertSchouten
2efe20bd9a stock entries from production_order dont fetch serial number of project 2016-09-09 11:05:22 +08:00
RobertSchouten
b7fc4b76e4 stock entries from production_order dont fetch serial number of project
stock entries from production_order dont fetch serial number of project
2016-09-09 11:02:33 +08:00
Ben Cornwell-Mott
0261889c0f Fixed spelling 2016-09-07 02:28:50 -07:00
Nabin Hait
15b26d8b1a Fixed merge conflicts 2016-09-02 14:29:57 +05:30
Saurabh
ff910f4c72 [fixes] set filter for warehouse 2016-09-02 13:39:05 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
cfbd0199eb Merge branch 'master' into develop 2016-08-23 12:10:56 +05:30
Neil Trini Lasrado
20b01873ab Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank 2016-08-22 15:05:50 +05:30
Ben Cornwell-Mott
a7c98ba0fe More formatting adjustments 2016-08-17 05:56:00 -07:00
Ben Cornwell-Mott
d5a9d475e7 Adjusted formatting 2016-08-17 05:45:43 -07:00
Ben Cornwell-Mott
06bfecea73 Fixed formatting of code and repositioned checkboxes in PPT. 2016-08-17 05:42:25 -07:00
Ben Cornwell-Mott
e977fc5dee Upgraded PPT for more variety of MR creation options. Added tests 2016-08-16 06:01:52 -07:00
Javier Wong
e6cd228288 [Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `

- A better fix than 316f78f859
- Sets the Status to In Process or Not Started instead of Unstopped
- Displays this same status on the client prompt (msgprint)
2016-08-07 16:01:49 +08:00
Nabin Hait
97c74f9f8f Merge pull request from rohitwaghchaure/bcornwellmott-1
PPT looks at default MR type in Item to set MR type.
2016-08-02 17:15:02 +05:30
Rohit Waghchaure
08aadb853c PPT looks at default MR type in Item to set MR type. 2016-08-02 16:59:03 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Javier Wong
5b2af6ad40 [Fixed] Stopping and Re-Opening of Production Order 2016-07-25 16:49:39 +08:00
Nabin Hait
9d93ad92bc minor fixes 2016-07-20 11:28:50 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Nabin Hait
4d64f6d4b4 Merge pull request from rohitwaghchaure/demo_records
Demo records for timesheet
2016-07-16 10:52:03 +05:30
Rohit Waghchaure
ecb2031bbe [Fix] Timesheet workstation holiday issue 2016-07-15 20:11:01 +05:30
Rohit Waghchaure
8002d47ff6 Demo records for timesheet 2016-07-15 19:24:21 +05:30
Rohit Waghchaure
e3fe828ea6 [Fix] Added note in timesheet and minor fixes 2016-07-13 09:40:35 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rushabh Mehta
cca33b2ff0 [cleanup] 2016-07-11 13:01:58 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Nabin Hait
819ed21ab5 Removed Pro Order from Quick Entry 2016-07-06 16:13:44 +05:30
Rohit Waghchaure
3188b56694 [Fixes] Time sheet fixes 2016-07-06 14:31:14 +05:30
Saurabh
621247807a [fix] BOM tree as default view 2016-06-30 15:05:06 +05:30
Rohit Waghchaure
3fa0b51e5e [Fixes] Time sheet fixes and changed timesheets to time_logs 2016-06-29 19:04:16 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Nabin Hait
8942d1782c Merge pull request from bcornwellmott/patch-2
Create Manufacture MRs for BOM Items
2016-06-25 14:01:32 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
5f48cb6128 [enhancement] BOM treeview 2016-06-25 11:06:13 +05:30
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
bcornwellmott
c0a3311836 Create Manufacture MRs for BOM Items
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
2016-06-15 11:16:12 -07:00
Rushabh Mehta
0b955e6c33 [minor] production planning, fix description 2016-06-08 11:10:34 +05:30
Rushabh Mehta
6125abc495 Merge pull request from shreyasp/issue/prod-order-qty
[Fix] Allow user to quantity in fraction while transferring material using production order
2016-06-07 10:58:20 +05:30
ShashaQin
6cac50b52e Update bom.py 2016-06-07 09:38:57 +08:00
Rushabh Mehta
af7d929386 [minor] fix supplier/customer and editable columns in BOM 2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136 [BUG] Fix Create Material Request OperationalError
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
2016-06-01 08:31:05 -07:00
shreyas
3b79f19614 [Fix] Allow user to quantity in fraction while transferring material using production order 2016-06-01 17:45:10 +05:30
Neil Trini Lasrado
45328f7729 Fixed error in bom autoname 2016-05-27 13:04:20 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request from umairsy/domains
Domainifying
2016-05-16 12:02:51 +05:30
Umair Sayyed
e44d1430e1 fixes in domainification. Also reordered some fields in BOM 2016-05-13 18:31:20 +05:30
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
43d75448ea [fix] Create Material Requests for All Required Qty via Production Plannign Tool 2016-05-10 12:57:24 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Nabin Hait
d6bc490274 Merge branch 'master' into develop 2016-04-22 12:24:26 +05:30
Nabin Hait
3ab6181a4f [fix] Fixed ambiguous column name in query 2016-04-22 11:26:44 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request from nabinhait/fixed_asset
Fixed asset
2016-04-21 11:41:11 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Rushabh Mehta
e8e9440b06 [fix] [tests] 2016-04-15 15:19:35 +05:30
Rushabh Mehta
a305c29b0e [cleanup] remove is_pro_applicable 2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Rushabh Mehta
18fc39b609 [feature] progress bars on production order 2016-04-15 11:24:19 +05:30
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 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 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 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 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 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 from rmehta/notify-update-rename
[minor] rename notified_modifed > notified_update. Merge with 
2015-09-11 15:11:57 +05:30
Rushabh Mehta
bc23e5ac5c [minor] rename notified_modifed > notified_update. Merge with 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. . 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 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 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 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 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 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 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 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 from neilLasrado/production-planning
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
5e7f8fd156 [ux] bom fixes 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
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
9d8154dd40 fixed test cases 2015-03-18 16:22:13 +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
7c9d003917 Test case cleanup and fixes 2015-03-13 08:14:46 +05:30
Nabin Hait
15e4833785 Merge pull request 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 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 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 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 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 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 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 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 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 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 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 
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
Neil Trini Lasrado
4a75a42437 Filters added 2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
712cd7a426 Calender and gantt chart view added for production order doctype 2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
9d01133e49 start date and end date added to production order doctype 2014-10-27 13:37:41 +05:30
Rushabh Mehta
39dbf73de7 [merge] item-variants 2014-10-21 13:24:46 +05:30
Neil Trini Lasrado
6644406185 Fix - BOM calculated wrong cost on update cost 2014-10-14 12:14:38 +05:30
Rushabh Mehta
ebc6016ffb [tests] fixes 2014-10-08 13:54:19 +05:30
Rushabh Mehta
f850987db0 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:03:19 +05:30
Rushabh Mehta
b31e90c7a5 [tests] fixes to stock entry 2014-10-07 16:56:46 +05:30
Rushabh Mehta
baef96b5a2 [item-variants] allow production order of variant 2014-10-07 12:34:19 +05:30
Rushabh Mehta
1a7637459c [item-variants] added more validations, tests 2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4 [item variants] make variants, bom updates 2014-10-07 11:40:47 +05:30
Neil Trini Lasrado
29d1a1c593 manufacturing and repack sepreted, test cases fixed, patch fixed 2014-09-30 14:07:56 +05:30
Nabin Hait
5cd20e3d24 Minor fix 2014-09-16 11:26:53 +05:30
Neil Trini Lasrado
e7c48ed3b0 bom operation inList view fix 2014-09-12 12:08:02 +05:30
Neil Trini Lasrado
6a7f75c3e3 Cost of Production cycle 2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
Nabin Hait
14b8af2e65 Rounding issue fixed for bom quantity 2014-08-29 11:50:58 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Nabin Hait
a592a914b8 PP Tool: get query for sales order 2014-08-22 16:25:04 +05:30
Nabin Hait
1ae48f4988 Required raw materials qty in PP tool 2014-08-22 16:20:07 +05:30
Nabin Hait
00fc600e8b PP Tool: Raise material request based on projected qty in selected warehouse 2014-08-22 14:06:22 +05:30
Anand Doshi
cca6460e65 [fix] Error Reports 2014-08-19 16:06:09 +05:30
Nabin Hait
6394f5b1a9 minot fix in pro order 2014-08-18 15:40:36 +05:30
Nabin Hait
5145b1445b Fixes in production planning tool 2014-08-14 15:15:14 +05:30
Anand Doshi
03eadb74ab Fixes to microtemplate feature 2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5 more updates to lists and started sane filters 2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19 added more listview templates 2014-08-08 11:56:32 +05:30
Rushabh Mehta
995185d02d [ux] fixed primary action 2014-08-08 11:51:23 +05:30
nabinhait
8dbd295c9b bom operations on_delete_row function 2014-07-31 11:40:41 +05:30
nabinhait
b5f9b5de45 PP Tool: data for required raw materials 2014-07-22 11:38:15 +05:30
Pratik Vyas
649d18c4f7 [minor] fix server error for new production order if sales order is invalid 2014-07-21 17:17:59 +05:30
Anand Doshi
28c4bee0b1 Production Planning Tool - Fixed bom get query 2014-07-10 16:43:31 +05:30
Anand Doshi
e673a664ac Fixes to end_of_life conditions 2014-07-02 18:15:01 +05:30
Nabin Hait
b7e91ee95e with_doc issue fixes 2014-06-26 15:54:45 +05:30
Anand Doshi
1030af7b48 Material Request: fixed series issue in insert_purchase_request 2014-06-26 12:07:55 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Rushabh Mehta
58ff651c6d fixes to bom.js 2014-06-23 12:20:39 +05:30
Anand Doshi
a5cfc59d81 Validate Select field values 2014-06-19 16:05:08 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Nabin Hait
6b1a8e0a40 minor fixes 2014-05-30 11:22:16 +05:30
Nabin Hait
c7253b3a37 Get valuation rate for fg item base don issued item cost + operation cost. 2014-05-30 11:22:15 +05:30
Nabin Hait
7f03e24c55 Valuation rate of raw materials in BOM. 2014-05-30 11:22:15 +05:30
Nabin Hait
e71159d6ea Standard Rate field removed from item. Fixes 2014-05-30 11:22:14 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
bbfe2517ea BOM validation message fixed 2014-05-11 18:27:07 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Nabin Hait
844dd36ff9 PP tool: get items from SO based on item filter 2014-05-08 19:07:34 +05:30
Anand Doshi
f410bd9bf9 Better default permissions, ignore_restrictions for defaults, removed field trash_reason
Additions:
	Account --> Material User: Read
	Cost Center --> Sales User, Purchase User: Read
	Mode of Payment --> Accounts User: Read
	Supplier --> Material User, Accounts User: Read
	Employee --> Employee: Restricted Read
	Leave Type --> Employee: Read
	Production Order --> Material User: Read
	Sales Order --> Material User: Read
	Print Heading --> All: Read
	Terms and Conditions --> Purchase User, Material User: Read
	Territory --> Material User, Maintenance User: Read
	Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
	Price List --> Manufacturing User: Read
	Purchase Receipt --> Accounts User: Read
	Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878 Changed default naming series options
C-Form: C-FORM-.#####
	Purchase Invoice: PINV-.#####
	Sales Invoice: SINV-.#####
	Purchase Order: PO-.#####
	Quality Inspection: QI-.#####
	Supplier: SUPP-.#####
	Supplier Quotation: SQTN-.#####
	Attendance: ATT-.#####
	Production Order: PRO-.#####
	Installation Note: IN-.#####
	Lead: LEAD-.#####
	Opportunity: OPTY-.#####
	Quotation: QTN-.#####
	Sales Order: SO-.#####
	Delivery Note: DN-.#####
	Item: ITEM-.#####
	Material Request: MREQ-.#####
	Packing Slip: PS-.#####
	Purchase Receipt: PREC-.#####
	Stock Entry: STE-.#####
	Customer Issue: CI-.#####
	Support Ticket: SUP-.#####
	Customer: CUST-.#####
	Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Nabin Hait
02d37bbb5a Allow Rename option added in multiple docs. Fixes 2014-05-06 12:18:50 +05:30
Nabin Hait
232954d4b9 Fixed updating cost on BOM after submission 2014-05-02 17:51:24 +05:30
Anand Doshi
3b3d55cda2 Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit 2014-04-28 15:33:34 +05:30
Anand Doshi
4c90bae16d BugFix: Item search in Production Planning Tool 2014-04-28 15:33:34 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes 2014-04-24 18:11:49 +05:30
Anand Doshi
094610d7ce Fixes in Production, Stock Entry and Stock Controller 2014-04-16 20:23:24 +05:30
Rushabh Mehta
052fe82688 production order: test fixed and added in test_stock_entry.py 2014-04-16 19:20:11 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Anand Doshi
c5e057f676 Fixed exploded BOM construction 2014-04-15 16:14:15 +05:30
Pratik Vyas
f37d6fe32b Merge pull request from frappe/js-translate-refactor
JS translation refactor
2014-04-15 11:44:16 +05:30
Rushabh Mehta
9f0d625300 update translation strings 2014-04-14 19:20:45 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
d29465029d Fixed Test Cases 2014-04-08 20:15:22 +05:30
Nabin Hait
dc82d4f0cd fixes 2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0 replaced doclist in testcases 2014-04-04 13:26:50 +05:30
Nabin Hait
312ba99e71 fixes 2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
f14b809ab5 , more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
f191f854cd erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1 2014-04-02 15:03:35 +05:30
Rushabh Mehta
f2227d033c , removed instances of .fields 2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58 added test_records.json 2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2 , frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9 2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc 2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e 2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields 2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b Changed creation, modified format 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a 2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - 2014-03-26 18:24:30 +05:30
Nabin Hait
73083dc960 Fix related to user_default 2014-03-21 11:26:08 +05:30
Nabin Hait
4d713ac5ba sql injection fixes 2014-03-21 11:22:37 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
139dc7b9b2 minor fixes 2014-02-12 14:54:16 +05:30
Nabin Hait
a7f757a3f4 Rename fields: initial commit 2014-02-12 14:54:13 +05:30
Nabin Hait
23c28704d2 Field arrangement in child table 2014-02-03 14:36:59 +05:30
Anand Doshi
3f8f4ff6cd BugFix: Production Planning Tool - get_raw_materials 2014-01-24 21:47:01 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30