Commit Graph

4815 Commits

Author SHA1 Message Date
Dominik Ottenbreit
3938c61996 migrate from manufacturer to manufacturer childtable 2017-03-24 14:24:34 +01:00
Rushabh Mehta
43583d6497 Update item.js 2017-03-21 17:49:53 +01:00
Rushabh Mehta
a07c43fd68 [feature] ability to have variants based on manufacturer 2017-03-21 17:48:34 +01:00
Rushabh Mehta
f340e19ea7 [minor] field re-arrangements in sales invoice, purchase invoice, stock reco 2017-03-15 15:12:43 +05:30
Nabin Hait
56f650f342 Merge branch 'master' into develop 2017-03-15 11:28:07 +05:30
Nabin Hait
ee7b4f2882 Merge pull request #8016 from rmehta/posting-date-option
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Rushabh Mehta
4f3da42b75 [fixes] for tests 2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a [fixes] for tests 2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d [fixes] for recurring and tests 2017-03-14 19:13:39 +05:30
Nabin Hait
3d731df7e3 Field order changed for 'Qty as per Stock UOM' 2017-03-14 17:24:57 +05:30
Rushabh Mehta
6b53792aea [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Rohit Waghchaure
0169341917 [Fix] Item variants broken when using naming series for items and vriants of numeric value 2017-03-10 19:40:08 +05:30
Nabin Hait
f73a44aa8d Update material_request.py 2017-03-09 10:57:00 +05:30
Rohit Waghchaure
02fb5880fe [Fix] Material Request to Production Order not working 2017-03-08 18:38:12 +05:30
Nabin Hait
961bdc3743 Set new name in warehouse_name on rename of warehosue 2017-03-07 15:02:34 +05:30
Nabin Hait
b3ffd6b282 Merge pull request #7828 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
fe876c0805 Test case fixed for multiple uom in selling 2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19 UOM Conversion in selling 2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a UOM Conversion in Selling 2017-03-06 16:41:12 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f changed doctype name userrole to has role 2017-03-06 14:24:39 +05:30
Nabin Hait
c642f76a4d Fixed merge conflict 2017-02-27 14:40:53 +05:30
Rushabh Mehta
509543752c [enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request 2017-02-23 17:03:46 +05:30
Kanchan Chauhan
1d45a4312e [Minor] Landed Cost Voucher test case fixed 2017-02-23 08:44:02 +05:30
Kanchan Chauhan
fe61c314b7 [Minor] Landed Cost Voucher test case fixed 2017-02-22 17:25:26 +05:30
Kanchan Chauhan
f2803ac427 [Fix] Throw error if item is added multiple time 2017-02-22 10:40:38 +05:30
Nabin Hait
cd837ecbac Merge branch 'develop' into develop 2017-02-20 19:09:20 +05:30
Nabin Hait
589f4656ad Merge branch 'develop' into in_global_search 2017-02-20 15:04:52 +05:30
Nabin Hait
9f4cb0c097 Fixed merge conflict 2017-02-20 15:00:04 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
Nabin Hait
e285258374 Merge pull request #7762 from mbauskar/hotfix
[minor] timestamp fixes for heatmap
2017-02-17 15:18:01 +05:30
Rushabh Mehta
0c5375d0fa [minor] item name not mandatory and item price with quick edit 2017-02-17 14:57:31 +05:30
mbauskar
e7b87ad071 [minor] timestamp fixes for heatmap 2017-02-16 16:05:46 +05:30
Nabin Hait
ea1cb68fe7 Merge branch 'master' into develop 2017-02-16 14:37:50 +05:30
Nabin Hait
3437a9a123 minor fix 2017-02-16 12:14:30 +05:30
Nabin Hait
2f7697d1bd Merge pull request #7746 from pratu16x7/minor-search-presets
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
pratu16x7
349ed568ed Add task and item 2017-02-15 09:23:26 +05:30
Kanchan Chauhan
79cd59303a [Fix] Serial No Status 2017-02-14 12:49:36 +05:30
Nabin Hait
99dfa3060a Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox 2017-02-13 16:06:02 +05:30
Nabin Hait
89b6c47b2e Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method
[Fix] Valuation method changing issue in the item
2017-02-13 15:42:22 +05:30
suyashphadtare
049a88cc40 [minor] Show item quantity in warehouse set query 2017-02-10 19:14:43 +05:30
KanchanChauhan
cc2c7649a8 [Minor] Stock Entry Fix (#7715) 2017-02-10 17:47:49 +05:30
Nabin Hait
bdd470a6d1 Update item.py 2017-02-10 17:12:48 +05:30
Rohit Waghchaure
2f09dc0e62 [Fix] Valuation method changing issue in the item 2017-02-10 15:29:45 +05:30
Rushabh Mehta
e6aa3b435a [minor] added make material request from Stock Entry and removed cur_frm 2017-02-09 17:47:22 +05:30
Nabin Hait
6ff0caa87a Fixed merge conflict 2017-02-08 11:33:33 +05:30
Nabin Hait
70fd8546ce Merge pull request #7677 from KanchanChauhan/serial-no-in-return
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
0a6aaf4257 Get standard/historical valuation rate where missing: some minor fixes 2017-02-07 12:50:22 +05:30
Kanchan Chauhan
4f3b0aa249 [Fix]Serial No if is_return 2017-02-07 11:28:34 +05:30
Nabin Hait
ea8fab52c6 Get standard/historical valuation rate where missing, if item is not a sample item 2017-02-07 01:24:32 +05:30
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
Rushabh Mehta
7ec4b717ed [feature] added team updates page 2017-01-31 11:42:58 +05:30
Rushabh Mehta
063e86a1bf [fix] remove on_update in Item 2017-01-27 16:16:08 +05:30
rohitwaghchaure
ab65f6d8b1 Merge pull request #7547 from mnatalia/develop
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
mnatalia
e09407571c Added translations to the web page and item dashboard. 2017-01-20 12:00:25 +02:00
Nabin Hait
4c952f48f8 Some minor fixes 2017-01-20 15:15:31 +05:30
Nabin Hait
a0b967f2cd Get valuation rate from Item while not found based on SLE 2017-01-20 12:50:40 +05:30
Rohit Waghchaure
a3a977d02a [Fix] Minor issue in landed cost voucher 2017-01-19 18:38:53 +05:30
Kanchan Chauhan
03dc695c77 [Minor] Set website warehouse as default warehouse 2017-01-19 14:57:05 +05:30
Dhaifallah Alwadani
9eb830ac4f fix string translation 2017-01-17 11:13:57 +05:30
Dhaifallah Alwadani
9375d1dfeb fix string translation 2017-01-16 04:05:40 -08:00
Rushabh Mehta
6695830f3f [fix] warehouse test cases 2017-01-16 16:57:53 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
b251cd4ccb Fixed merge conflict 2017-01-13 14:34:54 +05:30
Nabin Hait
8f0c060578 Merge pull request #7447 from saurabh6790/tree_param_fix
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
007c87ea63 Merge pull request #7440 from nabinhait/gle_repost_optimization
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
Saurabh
2f02101d7d [fix] provision to handle custom mandatory params while creating node 2017-01-11 12:41:01 +05:30
Nabin Hait
0287d31c0f Fetch bin details after setting warehouse based on POS Profile 2017-01-11 10:31:45 +05:30
Nabin Hait
5dd988207f Show values based on precision and filter out zero value rows 2017-01-10 16:10:40 +05:30
Nabin Hait
51d45d8bce Fixed merge conflict 2017-01-10 12:32:01 +05:30
Nabin Hait
a7f616564e Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Kanchan Chauhan
43e07aed2c [Minor]Valuation rate in Quick entry for Item 2017-01-10 12:06:51 +05:30
Nabin Hait
6e9d2a3c1f fixed conflict 2017-01-09 17:21:34 +05:30
Nabin Hait
d1eb237909 Merge pull request #7400 from rohitwaghchaure/minor_issue
Get item default warehouse
2017-01-09 15:49:14 +05:30
nick9822
6f48d4be1c whitelisted erpnext.stock.utils.get_stock_balance (#7402)
whitelisted erpnext.stock.utils.get_stock_balance with respect to
https://github.com/frappe/erpnext/issues/7364
2017-01-09 12:12:36 +05:30
Rushabh Mehta
8b133ac087 [minor] [tests] fix, tests will fail on the 5th of a month! 2017-01-06 17:21:04 +05:30
Rohit Waghchaure
6734c4ad5c Get item default warehouse 2017-01-06 14:39:40 +05:30
Nabin Hait
91621639e8 Reload in_standard_filter property 2017-01-06 12:54:16 +05:30
Nabin Hait
8281b36a26 Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
96562e3eb7 Merge pull request #7362 from rmehta/minor-fixes
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Kanchan Chauhan
b7cc393eb8 Email ID renamed to Email Address 2017-01-03 16:45:38 +05:30
Nabin Hait
9784d27317 Optimization to reduce GLE reposting time for future stock transactions 2016-12-30 16:21:35 +05:30
Rushabh Mehta
985cb8226d [minor] dont get warehouse in opening entry #7353 2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f Merge branch 'master' into develop 2016-12-30 14:56:20 +05:30
Rushabh Mehta
a8326de4d0 [fix] on_update in item.py 2016-12-30 06:17:45 +05:30
Manas Solanki
5c82e9ef8b Fetching the item details from the reference doctype in quality inspection
Error Report [2016-12-29]
2016-12-29 18:01:25 +05:30
Nabin Hait
f327a58b7f Merge branch 'master' into develop 2016-12-29 11:04:05 +05:30
Rushabh Mehta
94c4d7014d [fix] item_name in stock reco 2016-12-28 06:56:09 +05:30
Nabin Hait
3bcf9b5e70 Fixed merge conflict 2016-12-27 14:30:17 +05:30
Rushabh Mehta
174c3478a1 [fix] item variants not directly shown in website due to route clash 2016-12-27 12:30:30 +05:30
Rushabh Mehta
512b85e040 [minor] replace autocomplete with awesomplete 2016-12-27 12:14:37 +05:30
Nabin Hait
88817b40df Merge pull request #7284 from mntechnique/develop
Report : Batch Item Expiry Status
2016-12-26 16:10:46 +05:30
Nabin Hait
7b2177a544 [test] Fixed test cases for LCV 2016-12-26 15:31:05 +05:30
Nabin Hait
61a190dd69 Merge branch 'master' into develop 2016-12-24 11:01:26 +05:30
Nabin Hait
1d90b41aea [fix] Fetch serial nos on change of Warehouse 2016-12-24 10:42:23 +05:30
Nabin Hait
58291c77e9 Fixed version conflict 2016-12-23 17:43:42 +05:30
Nabin Hait
1e1e28b0ae Update landed_cost_voucher.js 2016-12-23 15:48:57 +05:30
bhupen
a83de5eac1 applicabe charges field is now editable 2016-12-22 16:24:14 +05:30
bhupen
914ae77a22 Limit instead of Allowance in stock settings 2016-12-22 16:24:14 +05:30
bhupen
5bb85e7a95 partially orderd status will be shown in material request 2016-12-22 16:24:14 +05:30
Revant Nandgaonkar
1c00b1fb21 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2016-12-21 18:01:35 +05:30
Rushabh Mehta
0632ee3da9 Merge branch 'v7.2.0-beta' into develop 2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f [fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253 2016-12-21 17:30:29 +05:30
Revant Nandgaonkar
00e65cb70b Report - Batch Item Expiry Status
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
2016-12-21 14:21:53 +05:30
Revant Nandgaonkar
0766d3e67e Report : Batch Item Expiry Status
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
2016-12-21 12:32:12 +05:30
Nabin Hait
f573d43b90 fixed version conflict 2016-12-20 11:40:15 +05:30
Rushabh Mehta
99c814b360 [fix] paging for products (support) 2016-12-19 11:55:10 +05:30
Rohit Waghchaure
6500ef404d [Fix] Timeout error in item attribute validation 2016-12-16 13:35:50 +05:30
Rushabh Mehta
9277f3250d [minor] partiall ordered in material request #6858 2016-12-16 12:36:50 +05:30
Nabin Hait
f02f1bb0c7 Added standard filters 2016-12-15 14:57:20 +05:30
Nabin Hait
201af80706 Fixed merge conflict 2016-12-13 14:30:32 +05:30
Nabin Hait
9a1a4cd0ac Fixed test cases for item / warehouse renaming 2016-12-13 10:46:50 +05:30
Nabin Hait
da3a9e255d Changed fieldtype of opening stock from Int to Float 2016-12-12 18:22:15 +05:30
Nabin Hait
f67799197d Merge pull request #7189 from nabinhait/fix_10111
Rename and merging of Item and Warehouse
2016-12-12 17:27:38 +05:30
Nabin Hait
fb1fb83b8c [tests] Test cases for Item and Warehouse renaming and merging 2016-12-12 17:01:24 +05:30
Nabin Hait
3ef63bef02 Rename and merging of Item and Warehouse and patch to fix deleted bins 2016-12-12 15:37:52 +05:30
Rohit Waghchaure
c858d52ce7 [Fix] Unable to purchase item in the company warehouse if dropship has enabled 2016-12-12 13:06:06 +05:30
Nabin Hait
58667ab123 Fixed merge conflict 2016-12-09 15:49:24 +05:30
Nabin Hait
ad4f1c7fd1 date is optional in get_exchange_rate 2016-12-09 12:14:47 +05:30
Nabin Hait
288a18e0cc Fixes and patch for Currency Exchange based on date 2016-12-08 15:36:23 +05:30
Nabin Hait
1cc55fbbcb Fixed merge conflict 2016-12-08 14:09:23 +05:30
Nabin Hait
ded059b253 [fix][tests] Fetching serial nos via get item details 2016-12-08 13:20:43 +05:30
Nabin Hait
5c18bd9b61 Fixed merge conflict 2016-12-06 16:16:58 +05:30
Rohit Waghchaure
36a01d3464 [Enhancement] Total row added for report builder 2016-12-05 18:59:59 +05:30
Nabin Hait
3f1c50a483 Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
[Fix] Fetch Serial No by default for  Delivery Note Item
2016-12-05 16:51:42 +05:30
Nabin Hait
4306cc80d0 removed print 2016-12-05 16:51:30 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1 [Fix] Fetch Serial No by default for Delivery Note Item 2016-12-02 18:18:04 +05:30
Nabin Hait
7f3da5dbb1 Fixed merge conflict 2016-11-28 14:23:51 +05:30
Nabin Hait
a78c463e97 Multiple minor fixes 2016-11-27 16:32:41 +05:30
Nabin Hait
d194cce35c fixed merge conflict 2016-11-23 14:55:23 +05:30
Nabin Hait
b18ad55e2b minor fixes 2016-11-23 14:51:30 +05:30
Nabin Hait
4059fb3961 delivery note dashboard fix for quality inspection 2016-11-23 11:45:19 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Nabin Hait
075e33245e Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636 2016-11-21 18:09:55 +05:30
Nabin Hait
c2f8dd71d7 Merge pull request #6965 from manassolanki/qa_redesign
[Fix] [Enhancement] Quality Inspection
2016-11-21 14:49:18 +05:30
Manas Solanki
99dac07a56 [Fix] Minor fix for field rename 2016-11-18 12:52:34 +05:30
Rohit Waghchaure
e887e92dd4 Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item 2016-11-18 12:16:22 +05:30
Ignatius Cuknoris
6471057df4 fix bugs uom and conversion factor on stock entry 2016-11-17 10:31:19 +07:00
Nabin Hait
8af429da1f Cleanup and fixes in quality inspection feature 2016-11-16 17:22:38 +05:30
Manas Solanki
55756d71b6 [Fix] Change of module of quality inspection 2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39 [Fix] Delivery Note fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4 [Fix] Quality Inspection in Purchase Invoice fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6 Function in parent transaction.js and call from corresponding files 2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5 Quality Inspection Issue
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
Rushabh Mehta
4bfa0748cd [merge] master 2016-11-16 11:28:23 +05:30
Shreyas Patil
99a3593a0d [Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948) 2016-11-16 11:16:44 +05:30
Saurabh
7fbc00c9d6 [fix] repost qty only for bin items 2016-11-09 16:10:42 +05:30
Rushabh Mehta
057db06216 [minor] enhancements to item dashboard, filter by item group and show item name fixes #6459 2016-11-08 12:40:10 +05:30
KanchanChauhan
6d5fcdec5a Item Inspection before Delivery (#6823) 2016-11-07 17:49:37 +05:30
Rushabh Mehta
13fc52d713 [minor] added default standard filters (#6854) 2016-11-07 17:19:19 +05:30
robert schouten
8672f29c6f [minor] add rate to stock entry detail grid (#6843) 2016-11-07 17:17:12 +05:30
Nabin Hait
f5d8dd3b18 Fixed merge conflict 2016-11-04 16:54:53 +05:30
Nabin Hait
81f7a265bc Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Nabin Hait
43d2fec78e [fix] float division by zero 2016-11-04 10:58:30 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb Merge branch 'master' into develop 2016-11-03 15:17:39 +05:30
Nabin Hait
ceca7fbc87 Merge pull request #6780 from rohitwaghchaure/float_issue
Change fieldtype from float to currency
2016-11-03 10:49:05 +05:30
Nabin Hait
57f51f648e Merge pull request #6795 from manassolanki/report
Report: Bin - Item Shortage Report -- Should have Item Name and descr…
2016-11-03 10:48:37 +05:30
Manas Solanki
5bc4784bad Report: Bin - Item Shortage Report -- Should have Item Name and description #4946
New report is build including two new column Item name and item description
2016-11-01 18:07:12 +05:30
Nabin Hait
df01b5770b Merge branch 'master' into develop 2016-11-01 17:44:43 +05:30
Nabin Hait
06fe0c7c9d Merge pull request #6790 from neilLasrado/hotfix
Hotfixes for demo
2016-11-01 17:40:03 +05:30
Nabin Hait
dec9f2558e Update purchase_receipt.py 2016-11-01 17:24:46 +05:30
Neil Trini Lasrado
9dde085144 Fixes to demo 2016-11-01 17:05:43 +05:30
Rohit Waghchaure
60e5e4ac2d change fieldtype from float to currency 2016-11-01 16:32:33 +05:30
Saurabh
0cf7f7aee0 [fix] set default value as empty frappe dict 2016-11-01 16:19:33 +05:30
Nabin Hait
f4068fd6f1 Fixed merge conflict 2016-11-01 15:06:55 +05:30
Nabin Hait
b9f708663c Update item.py 2016-10-31 16:52:17 +05:30
Kanchan Chauhan
9100322462 [Fix] Serial No report fixed for Creation No link 2016-10-31 16:01:09 +05:30
Nabin Hait
d08ced14ca Merge pull request #6751 from neilLasrado/develop
Fixes to demo
2016-10-31 13:15:36 +05:30
Nabin Hait
eb1a55bbba Update purchase_receipt.py 2016-10-29 14:49:33 +05:30
Nabin Hait
952c9cccfc Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item
Default warehouse in Item master
2016-10-29 14:44:19 +05:30
Neil Trini Lasrado
71e3746a05 Fixes to demo 2016-10-28 18:59:33 +05:30
Kanchan Chauhan
4c22825f01 Default warehouse in Item master 2016-10-27 23:56:04 +05:30
Saurabh
468e41f24f [enhance] introduce ignore_fields param for _tree and get_query 2016-10-27 15:23:19 +05:30
Nabin Hait
7f19a24e5e Merge pull request #6705 from KanchanChauhan/get-serial-no
Fetch serial no by default
2016-10-26 16:31:11 +05:30
Kanchan Chauhan
0a3f2c818a Fetch serial no by default 2016-10-26 14:59:43 +05:30
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
Kanchan Chauhan
55106ab66b Warehouse based on selected Company 2016-10-22 21:42:28 +05:30
Rohit Waghchaure
69be01aa1b [Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer 2016-10-20 16:38:30 +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
fa1cdd5bf0 Fixed merge conflict 2016-10-18 15:37:33 +05:30
Rushabh Mehta
17f6874450 [minor] [fix] doctype_dasboard.py files, move data to get_data 2016-10-18 14:54:39 +05:30
KanchanChauhan
9cb69ca0e3 Posting Date cannot be future date (#6628) 2016-10-17 16:40:16 +05:30
Saurabh
048ee48475 [fix] #6573 Material Request Required Date auto set (#6627) 2016-10-17 16:24:20 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Rohit Waghchaure
022d87969d [Fix] Issue in merging duplicate item 2016-10-07 13:40:45 +05:30
Saurabh
a2a25abfa5 [fix] warehouse account rename fix #6526 2016-10-06 18:20:53 +05:30
Nabin Hait
8db8a91d2e Minor fixes 2016-10-05 13:11:19 +05:30
Kanchan Chauhan
f6f8ec68ad Total and difference added for amount and qty 2016-10-05 13:11:19 +05:30
Nabin Hait
efa68fb6b8 Fixed version conflict 2016-10-04 17:27:02 +05:30
Nabin Hait
80de91776d Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
2016-10-04 16:20:47 +05:30
Nabin Hait
cf87027422 Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue
[Fix] Multi company issue for POS
2016-10-04 16:20:24 +05:30
Rohit Waghchaure
661db8ba71 [Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record 2016-10-04 14:46:34 +05:30
Rohit Waghchaure
6f1d012b65 [Fix] Multi company issue for POS 2016-10-04 12:18:59 +05:30
Nabin Hait
5fd5a77750 Fixed version conflict 2016-10-03 14:13:50 +05:30
Rohit Waghchaure
74bf022273 [Fix] Purchase receipt title issue 2016-09-30 18:35:48 +05:30
Nabin Hait
80499bb657 Fixed merge conflict 2016-09-29 14:18:53 +05:30
Nabin Hait
b3bc41131e Reposting of GLE and SLE for all stock transactions 2016-09-28 18:17:52 +05:30
Nabin Hait
443ac7bf30 Test case fix 2016-09-28 16:54:23 +05:30
Nabin Hait
706612bcd4 Fixed version conflict 2016-09-26 18:11:56 +05:30
Rohit Waghchaure
d728f5a429 [Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288 2016-09-23 18:06:24 +05:30
Nabin Hait
6b4eb7f77f Fixed version conflict 2016-09-23 12:16:31 +05:30
Nabin Hait
d03087d3ab Patch fixed for legacy migration 2016-09-23 11:08:02 +05:30
Nabin Hait
0be6073f10 Fixed version conflict 2016-09-21 13:06:19 +05:30
Nabin Hait
a36325c6e5 Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
2016-09-20 18:06:49 +05:30
Nabin Hait
429a38f90b Merge pull request #6415 from rmehta/hotfix
[minor] bring back old grid style in material request
2016-09-20 18:05:32 +05:30
Rushabh Mehta
57a1905576 [minor] bring back old grid style in material request 2016-09-20 17:22:54 +05:30
Nabin Hait
902bcc07b5 Merge pull request #6401 from rmehta/fix-lead-link
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
2016-09-19 19:22:34 +05:30
Saurabh
9aacf46c51 [fix] minor fix to accomodate custom fields in tree popup 2016-09-19 16:45:35 +05:30
Rushabh Mehta
5a58d8a11e [minor] production order link in material request, fixes #6197 2016-09-19 15:33:46 +05:30
Chude Osiegbu
1f64f9897c Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments. 2016-09-19 01:34:49 +01:00
Kanchan Chauhan
d1d129edf0 Actual Qty added to Material Request Item 2016-09-19 00:22:37 +05:30
Rushabh Mehta
39b5d39df6 [fix] remove campaign depends on 2016-09-16 15:55:34 +05:30
Rushabh Mehta
59dc0ece9f [enhance] added Lead Source master, fixes #6231 2016-09-16 11:44:49 +05:30
Nabin Hait
d5ebd79ad7 Fixed version conflict 2016-09-14 15:50:22 +05:30
Nabin Hait
cd23530d24 Merge pull request #6324 from RobertSchouten/patch-24
stock entries from production_order dont fetch serial number of project
2016-09-12 18:35:13 +05:30
Nabin Hait
6c08f5caf9 Update stock_entry.py 2016-09-12 18:34:46 +05:30
Nabin Hait
0a7c0f4418 Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
2016-09-12 17:36:46 +05:30
pawan
af111e9c43 [fix] #6195 2016-09-12 15:16:23 +05:30
Nabin Hait
a36a88b6de Remove Difference Account field from Stock Entry parent form 2016-09-12 13:15:59 +05:30
Nabin Hait
294664b24c Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
2016-09-12 13:03:14 +05:30
Nabin Hait
9c82dd9157 Merge pull request #6332 from rmehta/item-group-paging
[fix] paging for item group
2016-09-12 13:01:54 +05:30
robert schouten
4fc70d962b add customer and supplier names to some reports 2016-09-12 15:23:51 +08:00
Rushabh Mehta
3aa315040f [fix] paging for item group 2016-09-11 16:48:24 +05:30
RobertSchouten
b64fc33be1 stock entries from production_order dont fetch serial number of project 2016-09-09 11:08:39 +08:00
pawan
7b2bd20a09 [fix] #6254 2016-09-06 18:28:41 +05:30
Kanchan Chauhan
366ba04823 Barcode added to Stock Reconciliation 2016-09-06 12:44:57 +05:30
Rohit Waghchaure
cc1c7ad2df added test cases 2016-09-05 00:43:17 +05:30
pawan
bd9a275d5f [fix] #6254 2016-09-02 16:51:22 +05:30
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
RobertSchouten
ba4456b42b dont run duplicate set status on submit 2016-08-30 08:21:20 +08:00
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
3b6dc141c6 [fix] Repost only distinct purchase receipts and invoices 2016-08-19 16:39:50 +05:30
Nabin Hait
e68b089187 Query for warehouse in delivery note 2016-08-18 16:14:23 +05:30
Nabin Hait
40c60b6182 Default material request type field restored 2016-08-17 16:14:24 +05:30
Rushabh Mehta
d973c1606a [revert] is_sales_item, is_purchase_item back 2016-08-16 11:32:08 +05:30
Rushabh Mehta
730f3e7aba [minor] remove validation #4904 2016-08-11 17:17:26 +05:30
Nabin Hait
764e6ef210 default material request type field restored in item 2016-08-03 17:32:26 +05:30
Rushabh Mehta
06c92a782a [fix] small text for route 2016-08-03 16:27:11 +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
Rushabh Mehta
180e43585f [minor] formatter for item and employee 2016-07-29 18:52:00 +05:30
Nabin Hait
7590b8fff1 minor fix for stock ledger entry 2016-07-27 16:44:26 +05:30
Saurabh
3642f987c7 [fix] report filter fix 2016-07-27 11:42:50 +05:30
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Rushabh Mehta
29517d0b8c [fix] purchase order dashboard 2016-07-22 21:01:39 +05:30
Nabin Hait
db4aca3eaf Merge pull request #5823 from nabinhait/fix_107
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
2016-07-22 13:17:26 +05:30
Nabin Hait
0953aeb731 Merge branch 'master' into develop 2016-07-22 13:15:53 +05:30
Nabin Hait
767cf99435 Update opening stock on creation if item, only if it is non-serialized and does maintain batch 2016-07-21 18:46:09 +05:30
Rohit Waghchaure
47c64ec728 [Fix] Stock entry differnce amount issue. 2016-07-21 12:24:12 +05:30
Nabin Hait
89d0b1b9a5 Merge pull request #5804 from nabinhait/demo1
Demo data for fixed asset depreciation
2016-07-21 10:05:00 +05:30
Rushabh Mehta
5a39d41a0c [redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792 2016-07-20 22:53:23 +05:30
Nabin Hait
3edefb19b9 Demo data for fixed asset depreciation 2016-07-20 16:14:30 +05:30
Rushabh Mehta
649e2538e5 [fix] merge conflict? 2016-07-20 15:30:17 +05:30
Nabin Hait
9d93ad92bc minor fixes 2016-07-20 11:28:50 +05:30
Rushabh Mehta
636acc2565 [minor] run stock reco in background if more than 100 items, fixes #4904 2016-07-19 17:14:48 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Nabin Hait
37dd714e6c Is Stock Item checkbox visibility 2016-07-16 11:00:29 +05:30
Rushabh Mehta
95383bb281 [fix] item attribute validation and tests 2016-07-15 15:12:06 +05:30
Rushabh Mehta
b8bdfbcead [minor] optimize item attribute validation for #5756 2016-07-15 12:41:08 +05:30
Rushabh Mehta
176b63b354 [fix] remove first row on mapping, fixes #5707 2016-07-14 17:43:48 +05:30
Rushabh Mehta
62fcaa7900 Merge pull request #5758 from saurabh6790/is_group_fixes
[fix] alter fieldtype for is_group from select to check
2016-07-14 16:57:01 +05:30
Rushabh Mehta
528e145a54 [docs] fixes #5697 2016-07-14 17:00:05 +05:30
Rushabh Mehta
92d1b8cc6d [fix] [demo] permissions for accounting 2016-07-14 16:18:20 +05:30
Saurabh
6bc7b892c4 [fix] alter fieldtype for is_group from select to check 2016-07-14 14:06:28 +05:30
Rushabh Mehta
29b80b2233 Merge pull request #5701 from saurabh6790/item_reorder
[fix] fix get query for sub warehouse in reorder level table
2016-07-11 17:14:50 +05:30
Rushabh Mehta
3ce24d64c2 [cleanup] payment entry form view 2016-07-11 16:08:46 +05:30
Saurabh
7151f91862 [fix] fix get query for sub warehouse in reorder level table 2016-07-11 13:19:06 +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
Rushabh Mehta
ea0ff23891 [cleanup] form dashboards 2016-07-07 14:28:05 +05:30
Rushabh Mehta
964ad0fcae [cleanup] rename "links" to "dashboard" 2016-07-07 14:28:05 +05:30
Nabin Hait
b71a14ceca minor fix 2016-07-06 23:38:05 +05:30
Nabin Hait
e417000bbb Fetch Fixed Asset property from item in Sales / Purchase Invoice 2016-07-06 23:38:05 +05:30
Nabin Hait
abd6c5debb Fixed asset item property and validations 2016-07-06 23:38:04 +05:30
Nabin Hait
2dec0db3bd Is Fixed Asset and Asset Category field added in Item 2016-07-06 23:38:04 +05:30
Nabin Hait
df2200b417 Added Valuation Rate field in Item for opening stock 2016-07-06 16:05:15 +05:30
Nabin Hait
4671038211 Item Name added in Stock Reconciliation 2016-07-06 16:05:15 +05:30
Nabin Hait
5f82a5387d Query for warehouse and editable fields in grid 2016-07-06 15:35:23 +05:30
Rohit Waghchaure
a71d9d33af Rename prevdoc field in purchase order and purchase receipt doctype 2016-07-06 12:13:29 +05:30
Nabin Hait
7f3938b19f Warehouse patch fix 2016-07-04 18:12:08 +05:30
Rushabh Mehta
e38872294a [fix] [patch] 2016-07-04 17:34:25 +05:30
Rushabh Mehta
1d797f717b [fix] warehouse validation for parent_account 2016-07-04 17:07:08 +05:30
Rushabh Mehta
b33df4afe8 [cleanup] link methods made common 2016-07-04 11:39:25 +05:30
Rushabh Mehta
5f5f0bec2c [fix] buttons for rfq and material request 2016-07-04 11:39:25 +05:30
Rushabh Mehta
8c2e79cf0d [minor] fixes 2016-07-04 11:39:25 +05:30
Rushabh Mehta
6703792472 Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
2016-07-04 10:59:11 +05:30
Rushabh Mehta
2be94f7675 Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
2016-07-04 10:58:33 +05:30
Saurabh
b35906efc1 [fix] load dependancies on page load event 2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee [fix] Stock Analytics Report page fix 2016-07-01 18:15:17 +05:30
Rohit Waghchaure
4d8f4d76e1 [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI 2016-07-01 15:33:57 +05:30
Rohit Waghchaure
fc1fa9a774 [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier 2016-07-01 14:53:11 +05:30
Saurabh
1301b3b3d1 [fix] set default value for is_group to 0 2016-06-29 19:48:44 +05:30
Saurabh
b8a57a4b4d [fix] wareehouse nestedset fix if company not associated with warehouse 2016-06-29 19:01:49 +05:30
Saurabh
d7d878b6db [fix] label fix 2016-06-29 18:48:20 +05:30
Saurabh
52c2affc9c [fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts 2016-06-28 14:41:48 +05:30
Neil Trini Lasrado
b7ff027937 Added Safety Stock to Item Master 2016-06-27 17:45:08 +05:30
Rushabh Mehta
d362b734a2 Merge pull request #5529 from saurabh6790/module_flow
[fix] previous document links
2016-06-27 17:23:46 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7 [fix] provision to convert group to ledger and vice versa 2016-06-27 17:16:56 +05:30
Rushabh Mehta
822209cb03 Merge pull request #5538 from rohitwaghchaure/time_sheet_wages
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 17:13:48 +05:30
Saurabh
ce22d34fcf [fix] report Stock Projected Qty 2016-06-27 17:05:13 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Saurabh
d9131ec4ff [minor][fix] remove website generator call on after rename 2016-06-27 12:25:05 +05:30
Anand Doshi
d6b734e2e3 [fix] DuplicateEntryError for Warehouse Account Creation 2016-06-26 17:43:14 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Nabin Hait
14f0a6fa89 Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist
Item Price update in Price List
2016-06-26 13:07:35 +05:30
Nabin Hait
c65f160776 [fix] Identify account group for warehouse based on account type 2016-06-26 08:25:51 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Kanchan Chauhan
2ff7d2aade Fixed 2016-06-25 17:54:25 +05:30
Nabin Hait
173b328380 Merge pull request #5527 from bcornwellmott/patch-4
Fix Percent Billed to show Percentage
2016-06-25 13:53:55 +05:30
Saurabh
dc2fa86222 [fixes] rename ctype to doctype 2016-06-25 11:16:55 +05:30
Saurabh
001d4d74fa [fix] in set_valuation_method check for is group condition 2016-06-25 11:06:15 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level 2016-06-25 11:06:13 +05:30
Saurabh
3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin 2016-06-25 11:06:13 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
d647945102 [fixes] 2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3 [enhance] warehouse browser page for warehouse tree 2016-06-25 11:06:12 +05:30
Saurabh
dfbcdeb8a0 [enhancement] warehouse tree structure 2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee [fix] return route from make_route of child class 2016-06-25 10:43:02 +05:30
Kanchan Chauhan
5ee8fccb1a Item Price update in Price List 2016-06-24 17:11:15 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Nabin Hait
2effad33d0 Merge branch 'master' into develop 2016-06-24 12:48:24 +05:30
Nabin Hait
6dfc78b12a Item Valuation Rate in case of negative inventory 2016-06-24 12:28:55 +05:30
bcornwellmott
813dddeb10 Fix Percent Billed to show Percentage
Previously was showing Currency
2016-06-22 14:49:31 -07:00
Rushabh Mehta
b5f2c78f8f [list] reports for item list 2016-06-15 12:57:22 +05:30
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Rushabh Mehta
538607e6b6 [cleanup] a better message for insufficient stock 2016-06-12 11:03:00 +05:30
Rushabh Mehta
743de9b306 [minor] website field in customer and allow_import for purchase receipt, fixes #5227 2016-06-09 15:11:45 +05:30
Rushabh Mehta
e9d2c3d46e [fix] report requested items to be transferred, fixes #5295 2016-06-08 16:41:09 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
Rushabh Mehta
aed79e993f [fix] item attribute validation, fixes #5308 2016-06-02 17:49:16 +05:30
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
79ddf67289 Merge pull request #5362 from nabinhait/budget
Budgeting
2016-05-23 17:56:42 +05:30
Rohit Waghchaure
bc894428ca Added today as default in transaction. 2016-05-23 15:22:36 +05:30
Nabin Hait
832988e2fd test case fixed 2016-05-23 13:04:26 +05:30
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-20 12:06:22 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rushabh Mehta
35047ac283 [ux] direct editing in material request 2016-05-18 18:17:38 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains
Domainifying
2016-05-16 12:02:51 +05:30
Umair Sayyed
99f7528578 domanifying ERPNext via #5334 2016-05-13 18:06:17 +05:30
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
1997350364 [fix] Divisional loss in purchase receipt 2016-05-11 12:06:29 +05:30
Nabin Hait
a9c4c8fc31 In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate 2016-05-09 17:34:47 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
e67c1cdf12 [fix] In purchase return entry, consider outgoing rate for serialized items 2016-05-06 15:46:31 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
2016-05-02 15:54:41 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
1aa1c8a9ef [minor] remove hide_first in forms 2016-04-29 12:20:23 +05:30
Nabin Hait
6146cc1e33 Merge branch 'master' into develop 2016-04-29 11:44:55 +05:30
Nabin Hait
761a7a8e7c [fix] On rename update item code in item_wise_tax_detail json in tax table 2016-04-28 17:33:49 +05:30
Rushabh Mehta
5dfe20ce17 [fix] frappe.require in stock_entry.js 2016-04-26 12:59:08 +05:30
Rushabh Mehta
3d2622ce91 [refacator] added dashboard in item 2016-04-25 17:53:42 +05:30
Rushabh Mehta
0fa7b7c4f2 [test] [fix] default cost_center 2016-04-23 11:11:10 +05:30
Rushabh Mehta
0394aec6a4 [wip] inventory tool 2016-04-22 17:22:22 +05:30
Rushabh Mehta
68d428bfd4 [fix] for sort selector 2016-04-22 13:23:34 +05:30
Rushabh Mehta
621283c5c5 [enhancement] stock balance page 2016-04-21 19:00:34 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset
Fixed asset
2016-04-21 11:41:11 +05:30
Rushabh Mehta
c291ab64a6 Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
[WIP] No not merge
2016-04-21 11:39:45 +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
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +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
Nabin Hait
c46c1f0288 [fix] Rejected serial nos in purchase invoice 2016-04-18 17:46:36 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Saurabh
7fee1b8343 [fixes] set expence account to item on sales invoice 2016-04-18 15:58:43 +05:30
Saurabh
224737b9ed [fixes] split make gl entry function into chuncks as per SI 2016-04-18 15:58:43 +05:30
Saurabh
fbb342c1ac [enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI 2016-04-18 15:58:43 +05:30
Saurabh
130c57b201 [fixes] code clean-up 2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3 [fixes] test-case to validate quantity after update stock and purchase return and code-cleaning 2016-04-18 15:58:43 +05:30
Saurabh
4bd34a58ba [fixes] fix perpetual inventory 2016-04-18 15:57:55 +05:30
Rushabh Mehta
17d52becdf [typo] 2016-04-15 16:51:33 +05:30
Rushabh Mehta
86a824c767 [ux] added opening stock and rate in new Item 2016-04-15 16:44:44 +05:30
Rushabh Mehta
e8e9440b06 [fix] [tests] 2016-04-15 15:19:35 +05:30
Rushabh Mehta
be2dde468d [enhance] set material request title as comma separated list of items 2016-04-15 15:11:06 +05:30
Rushabh Mehta
a305c29b0e [cleanup] remove is_pro_applicable 2016-04-15 15:03:16 +05:30
Rushabh Mehta
dd9a973a0b Merge pull request #5216 from umairsy/is-sales-purchase
Removed Is Sales Item and Is Purchase Item
2016-04-15 14:12:14 +05:30
Rushabh Mehta
f4c25b13e2 [fix] update total_projected_qty in bin.py 2016-04-15 13:01:09 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Umair Sayyed
6269f1e3d0 address and contact related fields re-arranged in the sales transactions fixes #5192 2016-04-14 13:07:41 +05:30
Rushabh Mehta
0e2dd859b0 [cleanup] link dashboard for customer, supplier, item, employee and hide form by default 2016-04-13 17:22:09 +05:30
Nabin Hait
4b09f48d94 Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
2016-04-13 11:40:45 +05:30
Rushabh Mehta
8bbca6fa2e [enhancement] links menu in customer, supplier, item 2016-04-12 19:16:33 +05:30
Nabin Hait
dd94d4e43d Dont allow to toggle stock and non-stock settings if any transaction exists against the item 2016-04-12 19:00:50 +05:30
Nabin Hait
32b2a7795e [fix] Set actual qty onload of the draft stock entry. Fixed #5172 2016-04-11 15:14:05 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
shreyas
ffeacb299d [Fix] Show a message while user tries to create Material request with BOM which contains only non-stock item 2016-04-08 16:32:19 +05:30
shreyas
b94b94afd9 [Fix] Move company field to top of the Stock Entry form 2016-04-07 16:25:29 +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
Nabin Hait
4f10f15686 [fix] Modified date changed in query report due to project field renaming 2016-04-01 17:59:06 +05:30
Rushabh Mehta
45c6b550f0 [cleanup] assets and made items mandatory in transactions 2016-03-31 15:37:51 +05:30
Nabin Hait
1d04a23a00 Merge pull request #5082 from umairsy/perm-issue-2
[Fix] changed permission for the Stock Ledger Entry
2016-03-31 11:54:28 +05:30
Rushabh Mehta
72b4ad8155 [cleanup] for quick-entry 2016-03-30 15:42:22 +05:30
Rushabh Mehta
3fc6fdeba0 [cleanup] for quick-entry 2016-03-30 13:18:30 +05:30
Rushabh Mehta
652dee45a6 [minor] make margin collapsible 2016-03-29 16:42:13 +05:30
Umair Sayyed
6481ab23ce [Fix] changed permission for stock ledger entry 2016-03-29 13:35:46 +05:30
Nabin Hait
4fdb05228d fixed asset depreciation 2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Rushabh Mehta
3117b4b8d6 [fix] minor for quick-entry 2016-03-29 11:53:17 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
2016-03-28 18:27:05 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
rohitwaghchaure
6d1b5d618a [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
rohitwaghchaure
44d0449895 [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
mbauskar
a52472cf5b [fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py 2016-03-24 14:07:51 +05:30
mbauskar
b6d19bcfc2 [fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item 2016-03-24 14:07:50 +05:30
mbauskar
6f60339e75 [fix] total margin calculations 2016-03-24 14:07:50 +05:30
mbauskar
b8b56f127f fetched the markup type and rate of selected item 2016-03-24 14:07:49 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Rushabh Mehta
17da0b8f8b Merge pull request #5035 from rmehta/warehouse-buttons
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
2016-03-23 11:50:30 +05:30
Rushabh Mehta
3cc9b3ef08 [enhancement] [minor] stock ledger, general ledger buttons in warehouse 2016-03-22 16:18:01 +05:30
Neil Trini Lasrado
11dafa27ba Added Project to materail request 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
4e78cee1c2 Merge pull request #4959 from ShashaQin/patch-37
Improvements about Item Prices Report
2016-03-17 18:13:09 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
Neil Trini Lasrado
f433a5a124 Fixed bug while selecting project in sales_invoice, sales_order, delivery_note 2016-03-16 16:00:27 +05:30
ShashaQin
769b01e07a Update item_prices.py 2016-03-16 16:37:28 +08:00
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
rohitwaghchaure
986616f8ee [fixes]draft BOM showing in Material Request 2016-03-14 19:33:30 +05:30
Nabin Hait
b1f0a7d52e Merge pull request #4876 from saurabh6790/valuation_rate_on_so
[enhancement] get valuation rate and gross profit on sales order item
2016-03-14 19:18:58 +05:30
Nabin Hait
d1f85c4fe6 [fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000 2016-03-14 14:59:21 +05:30
Valmik Jangla
13bb2ba779 Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance 2016-03-11 13:07:49 +05:30
Valmik Jangla
063946a02f Removed from Purchase Invoice and Purchase Reciept 2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb Removed from Stock Ledger Entry and Sales Invoice 2016-03-11 13:07:48 +05:30
Valmik Jangla
cd9daf6671 Removed from Journal Entry and Stock Reconciliation 2016-03-11 13:07:16 +05:30
Valmik Jangla
319bbad4d4 Removed from Stock Entry 2016-03-11 13:05:19 +05:30
ShashaQin
e8d635827a Update item_prices.py 2016-03-10 14:55:06 +08:00
ShashaQin
c6b5f7dcae Update item_prices.py 2016-03-10 08:49:38 +08:00
Saurabh
3fbf3ce852 [fixes] raise if selects product bundle as sub item in another product bundle. 2016-03-09 15:42:01 +05:30
Saurabh
bd01a81638 [fixes] calculate valuation rate for stock, non-stop and product bundle items 2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887 [fixes] calculate valuation rate for non stock item 2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351 [fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate 2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3 [enhancement] get valuation rate and gross profit on sales order item 2016-03-09 15:42:00 +05:30
Anand Doshi
3fb67c7c3b Merge pull request #4945 from shreyasp/mr-wn-sup17487
[Minor] Displaying 'for warehouse' while creating Material request from BOM
2016-03-09 10:32:15 +05:30
shreyas
007e87b8a5 [Minor] Whitespace fixes 2016-03-08 19:01:50 +05:30
shreyas
405b66898e [Minor] Displaying 'for warehouse' while creating Material request from BOM 2016-03-08 18:39:20 +05:30
Anand Doshi
dab167791c Merge pull request #4934 from anandpdoshi/fix/stock-balance-filters
[fix] Run Stock Balance report only after one of the filters is set
2016-03-07 14:31:08 +05:30
Anand Doshi
0902fb2e3d [fix] Run Stock Balance report only after one of the filters is set 2016-03-07 13:11:59 +05:30
Rushabh Mehta
5a700820e7 [fix] [minor] autoload chart of accounts 2016-03-07 11:57:54 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
5b9d6494a6 Merge pull request #4900 from rmehta/minor-fixes
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-03-01 16:15:25 +05:30
Rushabh Mehta
e670525c55 Merge pull request #4899 from nabinhait/seriailized_stock_valuation
Seriailized stock valuation
2016-03-01 16:13:09 +05:30
Rushabh Mehta
f1083c9a74 [minor] fix messages in material request 2016-02-29 14:38:25 +05:30
Nabin Hait
2620bf402f [fix] Stock Valuation for serialized items 2016-02-29 12:07:42 +05:30
Rushabh Mehta
4403853828 [minor] fix notification for material request, splash icon, cleanup project form layout 2016-02-27 16:24:34 +05:30
Saurabh
cc7132763f [fixes] set projected qty in Quotaion Item table 2016-02-26 18:33:53 +05:30
Anand Doshi
acd1bcffde [fix] changed field type to Code 2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4 Merge pull request #4695 from neilLasrado/develop
Material Request of type Manufcture
2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87 Merge pull request #4854 from patilsangram/develop
Removed Stop Button from SO and PO
2016-02-24 11:21:17 +05:30
Nabin Hait
38f470288f Merge pull request #4806 from creador30/productbundle_improvement
Product Bundle improvement
2016-02-24 11:12:47 +05:30
creador
4b6b6fe5a8 [fix] unify packing description and packed item description 2016-02-23 22:12:02 +02:00
patilsangram
a812d67837 [fixes] 2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
f79760ce2d Mumtiple fixes 2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
d5e15eaadf Added test cases 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
43114bab71 renamed label of Quantity Requested for Purchase to Requested Quantity in Bin 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
0b40ccc43c Removed unwanted code 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
695bf47a1d changed image feild (type attach) to attach image, removed Image view 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
e9cd22aff9 Fixed make Prod_order from Material Request 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
cc23bc0549 Removed Material Request type validation 2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
3353b5ee62 Added material request type Manufacture 2016-02-23 18:35:42 +05:30
Saurabh
ac33724656 [fixes] removed no copy for warehouse field 2016-02-23 18:18:04 +05:30
Saurabh
3724448cd3 [fixes] typo-fixes and fix in balance qty fetching 2016-02-23 18:18:04 +05:30
Saurabh
dcb72c6be7 [enhance] Displaying stock balance while creating quotation 2016-02-23 18:18:04 +05:30
saurabh
65820ed013 added new field language for users 2016-02-23 02:17:03 +05:30
Nabin Hait
e32f9c3a24 Update reorder_item.py 2016-02-22 16:50:13 +05:30
patilsangram
bf2b511988 [Removed Stop Button from SO and PO] 2016-02-22 16:24:23 +05:30
Nabin Hait
38be62c7e3 [fix] Allow auto reorder based on reorder qty, even if reordeer level is zero 2016-02-22 16:24:23 +05:30
Nabin Hait
7736e092e7 Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero 2016-02-22 16:19:33 +05:30
Nabin Hait
1a99cb8bfe [fix] Escaping strings with percentage 2016-02-19 12:45:57 +05:30
Anand Doshi
39a289145c [fix] fetch price list rate 2016-02-15 11:42:18 +05:30
creador
e156cd6379 Product Bundle improvement
This change allows addition of multiple instances of the same product
inside a product bundle, if each has a different description in the
bundle list (thus no duplicates).

We use product bundles to include scrap material into our stock
calculations. Here we need to enter the same product with different
quantities into the same bundle. We explicitly specify scrap in the
description of each line in product bundle.
2016-02-14 12:22:10 +02:00
creador
e71fa9210f Allow reorder_level to be set to 0
For items you don’t want to keep in stock, you can set the
reorder_level to 0 and define reorder_qty.

If there is e.g. a sales order for that item, the projected quantity
will fall below 0, which will trigger an automatic material request.
2016-02-14 11:58:21 +02:00
Anand Doshi
4b249fe8ec [optimization] stock balance report - force index + improve memory usage 2016-02-11 20:38:01 +05:30
Rushabh Mehta
adee283caf [minor] map custom fields from delivery note to packing slip 2016-02-11 11:58:50 +05:30
Nabin Hait
3070deb295 Packing Slip layout changes 2016-02-10 13:07:42 +05:30
Rushabh Mehta
0a67c9715c Merge pull request #4766 from nabinhait/permlevel1
[fix] Read permission to All for permlevel 1 fields
2016-02-08 18:52:03 +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
4c6af87ad0 [fix] Read permission to All for permlevel 1 fields 2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Nabin Hait
4129ae5395 [fix] Translations in Stock balance report 2016-02-04 17:22:57 +05:30
Nabin Hait
49b275ad1d Merge pull request #4704 from chaoyee/develop
Update material_request.py
2016-02-02 16:11:35 +05:30
Nabin Hait
3c55d89f7f [minor] Reference doctype in Item-wise price List Rate report 2016-02-01 15:55:09 +05:30
Nabin Hait
d5fda57297 [fix] Ignore permissions and made Customer warehouse field hidden in selling cycle 2016-02-01 15:55:09 +05:30
Nabin Hait
a85a1ff145 [fix] Validate rate with reference doc 2016-02-01 15:55:09 +05:30
ShashaQin
ed11e93b25 Update stock_reconciliation.py
exclude 'disabled' item when get items
2016-02-01 16:54:19 +08:00
ShashaQin
1d702bf112 Update stock_reconciliation_item.json
Update valuation rate description. This description will be shown on downloaded template in order to input valuation rate correct.
2016-02-01 16:51:01 +08:00
Chao-Yee Hsu 許朝益
71a9be8add Update material_request.py
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 18:45:22 +08:00
Anand Doshi
77e4f6b774 [fix] strip item_code before autoname 2016-01-29 11:29:36 +05:30
Chao-Yee Hsu 許朝益
c118fc9343 Update material_request.py
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 10:38:33 +08:00
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
Anand Doshi
47c2aa179b [fix] test case for get_item_details 2016-01-21 23:18:08 +05:30
Anand Doshi
54abf025b7 [hotfix] get_price_list_rate 2016-01-21 22:28:55 +05:30
Nabin Hait
cf3b318f7d Changes modified date 2016-01-21 18:52:25 +05:30
Nabin Hait
1d21274d65 Update manufacturer.json 2016-01-21 17:01:23 +05:30
Nabin Hait
a613ea8abf [patch] Create manufacturer records 2016-01-20 18:32:37 +05:30
Dominik
d737390b80 Changed Manufacturer from Data to its own DocType, copied most of the logic from Customer but used short_name for namig series. 2016-01-20 18:32:37 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
c2c9124af8 Merge pull request #4643 from nabinhait/status_button
[fix] Close button visible in all sumitted PR and DN
2016-01-20 16:47:17 +05:30
Nabin Hait
5ac22ce6a1 [fix] Close button visible in all sumitted PR and DN 2016-01-19 18:30:02 +05:30
Nabin Hait
9824e22ce1 [fix] Price list rate applied via set_missing_values 2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483 Fixes in get_item_details and test cases 2016-01-19 16:48:32 +05:30
Rushabh Mehta
c978b9c36a [minor] [fix] in Item > Add / Edit Prices, go to list view instead of report, fixes #4639 2016-01-19 16:34:49 +05:30
Rushabh Mehta
aee26219ed [fix] get warehouse details on selection 2016-01-18 18:57:49 +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
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a Minor fixes 2016-01-15 11:09:41 +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
cc5632a99c [minor] removed image_view from in list view 2016-01-11 13:03:14 +05:30
Anand Doshi
4096603656 [fix] add index on so_detail in Delivery Note Item 2016-01-07 17:10:09 +05:30
Anand Doshi
ed72a28e41 [minor] patch for billed in DN and PR 2016-01-06 18:53:12 +05:30
Anand Doshi
2c021dcdcd [fix] Stock Entry: calculate amount in javascript 2016-01-06 17:47:39 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
a2afb16f6b [testcase] Billing status in Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f Billing status in Purchase Receipt 2016-01-06 15:42:43 +05:30
Nabin Hait
ba5d6b5004 [test-case] for billing status in DN 2016-01-06 15:42:27 +05:30
Nabin Hait
5b13b99441 Update billing status in Delivery Note if directly invoiced against SO 2016-01-06 15:42:27 +05:30
Anand Doshi
e88ffe032e [fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked 2016-01-06 12:54:59 +05:30
Anand Doshi
a40c6282a1 [fix] don't allow import for child tables 2016-01-06 12:20:25 +05:30
Anand Doshi
d27308d1cd Merge pull request #4575 from nabinhait/report_fix_1
[fix] minor fix in stock projected qty
2016-01-05 18:41:48 +05:30
Anand Doshi
06a82d4e1f Merge pull request #4574 from rmehta/translations
Translation fixes
2016-01-05 18:41:18 +05:30
Anand Doshi
13bf123b24 [hotfix] item on web 2016-01-04 17:51:35 +05:30
Nabin Hait
d35d74346d [fix] minor fix in stock projected qty 2016-01-04 16:16:49 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Anand Doshi
aee8b5bcad [fix] Purchase Receipt: Show row no. against the Rejected Warehouse mandatory error 2016-01-04 13:16:09 +05:30
Nabin Hait
884d4cbc48 Merge pull request #4560 from nabinhait/item_variants
[fix] Disable atrribute table in variant item record
2015-12-31 15:58:41 +05:30
Nabin Hait
51ff2658cb [fix] Minor changes in item naming 2015-12-31 15:49:00 +05:30
Nabin Hait
dd1c3ba164 Merge branch 'develop' of https://github.com/gabtzi/erpnext into gabtzi-develop 2015-12-31 15:46:15 +05:30
Nabin Hait
6b068e1367 [fix] Disable atrribute table in variant item record 2015-12-31 15:44:12 +05:30
Nabin Hait
6626e32719 [fix] Disable atrribute table in variant item record 2015-12-31 14:54:57 +05:30
gabtzi
d46abb49f3 Fix for Issue #4543: Suffix now uses attribute abbreviation if it exists or value for numeric attributes 2015-12-28 12:03:24 +02:00
gabtzi
096fc88200 Fix for Issue #4543: Improved code to check if it's a variant only once. 2015-12-28 11:07:10 +02:00
gabtzi
9d44ac88f2 Fix for Issue #4543: Automatic item_code generation for variants when parent item is named after a Naming Series 2015-12-28 10:26:42 +02:00
Saurabh
b166bcf50b [fixes] flag to trigger actual qty update 2015-12-28 13:25:35 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Rushabh Mehta
01293bb3a3 [fix] [minor] fix available qty even if 0 2015-12-22 12:57:42 +05:30
Anand Doshi
ee2129ce1c Merge pull request #4513 from nabinhait/discount_percentage
Additional Discount amount based on percentage
2015-12-21 16:13:17 +05:30
Anand Doshi
50ddf921be [minor] UOM message 2015-12-21 10:58:33 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Anand Doshi
0f809426d2 [fix] Validate transfer qty cannot be greater than qty 2015-12-17 22:35:03 +05:30
ShashaQin
81b8627250 Update serial_no.json 2015-12-15 14:14:51 +05:30
ShashaQin
79586775b2 Update serial_no.json
change "delivery_document_type" to Link and ""delivery_document_no" to Dynamic link will be more convenient, like "purchase_document_type" and "purchase_document_no".
2015-12-15 14:14:26 +05:30
Anand Doshi
695d09f9cd [fix] typo 2015-12-11 15:03:26 +05:30
Anand Doshi
66c9940d73 [fix] [validation] website url should be public 2015-12-11 15:02:58 +05:30
Nabin Hait
fc4eca5cc7 [fix] Website Image validation 2015-12-11 11:47:05 +05:30
Anand Doshi
b3051ab84d [fix] validate that Item's website image is public 2015-12-10 11:46:20 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Nabin Hait
41c8cf645a [fix] Get incoming rate if args as json 2015-12-08 14:50:24 +05:30
Nabin Hait
06db236aa0 [fix] Allow Production Order, by default unchecked in item 2015-12-07 14:19:13 +05:30
Nabin Hait
5eefff13a1 [fix] get_incoming_rate function whitelisted 2015-12-07 10:44:56 +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
2c069a418a [minor] allow stock entry for manufacture without production order 2015-12-03 11:10:23 +05:30
Rushabh Mehta
f1f556c0ac Merge pull request #4409 from nabinhait/reorder_level
[fix] Reorder Qty mandatory if reorder level entered
2015-12-02 12:25:09 +05:30
Nabin Hait
20abc2d0e8 [fix] Reorder Qty mandatory if reorder level entered 2015-12-01 19:01:19 +05:30
Nabin Hait
d793fc9446 [fix] Mapping allowed for negative quantity 2015-12-01 17:28:12 +05:30
Nabin Hait
5b73dea9f6 [fix] Get items in stock reconciliation based on default warehouse or existing bin 2015-12-01 16:47:17 +05:30
Rushabh Mehta
29f9f6c147 [fixes] [ux] get product bundle items only on po, mr and button on toolbar 2015-12-01 11:36:22 +05:30
Rushabh Mehta
9f7de868ef [fixes] stock reco, must always set qty and rate 2015-11-30 14:16:36 +05:30
Anand Doshi
70f57eb7f0 [fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table 2015-11-27 14:38:01 +05:30
Anand Doshi
15b22c9d7d Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
[fix] Show Item Name in re-order email. Fixes #4381
2015-11-27 11:31:36 +05:30
Anand Doshi
f942d97a18 [fix] removed UOM Replace Utility from message 2015-11-26 16:08:09 +05:30
Anand Doshi
5cf7a0bf72 [fix] Show Item Name in re-order email. Fixes #4381 2015-11-26 15:11:18 +05:30
Rushabh Mehta
03b3d66b90 [minor] re-order at re-order level, not below 2015-11-25 17:23:00 +05:30
Nabin Hait
c4f4c09e42 Get Items from Product Bundle button in purchase cycle 2015-11-23 12:51:37 +05:30
Revant Nandgaonkar
bde324a90f fix frappe call to update_purchase_receipt_status
changed update_purchase_order_status to update_purchase_receipt_status
2015-11-20 12:41:58 +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
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Nabin Hait
43ce642649 [fix] Uncheck 'Is Production Item' if it is a non-stock item 2015-11-16 16:50:59 +05:30
Nabin Hait
95d025f9aa Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission 2015-11-13 14:22:32 +05:30
Rushabh Mehta
c1531e7008 [minor] catch SSL error on make_thumbnail, via support 2015-11-13 11:39:38 +05:30
Anand Doshi
d65a03d437 [fix] material request type in reorder 2015-11-12 20:36:44 +05:30
Nabin Hait
61fb7ee5b8 Deleted Stock UOM Replace Utility 2015-11-12 12:06:47 +05:30
Rushabh Mehta
54fc260a42 [minor] trigger link triggers while mapping material request to po to set supplier default currency 2015-11-05 15:26:02 +05:30
Rushabh Mehta
7a39d51366 [fix] pull tax rate in item tax 2015-11-05 15:19:11 +05:30
Rushabh Mehta
c541b87bb9 [thumbnail] remove attachment if fails 2015-11-05 10:49:42 +05:30
Rushabh Mehta
20a7d820ab [fix] shot ledger buttons for closed DN / PR 2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8 [cleanup] drop ship testing & cleanup 2015-11-04 15:24:04 +05:30
Saurabh
6197860643 [fixes] test case update 2015-11-04 12:43:40 +05:30
Saurabh
95fbfa4928 [fixes] typo fixes 2015-11-04 12:10:01 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff [cleanup] re-arrange drop ship field 2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0 [fix] cleanup stop-resume code 2015-11-03 18:20:39 +05:30
Saurabh
c40148e0da [fixes] missing delivered by supplier field 2015-11-03 10:32:46 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping
Drop shipping
2015-11-02 15:43:48 +05:30
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Saurabh
381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO 2015-11-02 11:30:51 +05:30
Saurabh
653cffec1e [change_log and fixes] set print hide, add change_log 2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56 [fixes] test case fixes for drop shipping 2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier 2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7 [fixes] check for close status 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
98b287565a [enhance] close purchase order 2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Anand Doshi
21e09a2bd8 [enhancement] Ability to disable an Item 2015-10-29 12:39:47 +05:30
Anand Doshi
6d69ca6bac [fix] don't show expired items in website item list. Fixes #4210. 2015-10-29 11:35:16 +05:30
Nabin Hait
a90a0528aa Fixed conflict 2015-10-28 15:50:26 +05:30
Nabin Hait
6d490e530a [fix] Ignore users permission for To Warehouse field in Delivery Note 2015-10-28 12:43:45 +05:30
Anand Doshi
c794ca53fb [fix] delete file records created via item.py even if website_image file didn't exist 2015-10-27 16:56:42 +05:30
Anand Doshi
3f3696d1eb [enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations 2015-10-26 21:55:34 +05:30
Nabin Hait
abc0b64b68 [fix] Label changed for Target Warehouse in Delivery Note 2015-10-26 11:58:43 +05:30
Anand Doshi
b9bfe6117e [optimization] Stock Projected Qty report 2015-10-23 14:49:09 +05:30
Rushabh Mehta
5033e7b431 [hot] fix stock projected qty 2015-10-23 10:51:56 +05:30
Nabin Hait
398c83afa5 [fix] For Serial No Status 2015-10-22 15:11:44 +05:30
Anand Doshi
d1441245fb [fix] variant website page render 2015-10-21 16:36:43 +05:30
Anand Doshi
066ff9599a Merge pull request #4206 from neilLasrado/variant
Prevent Template Item from going into infinite loop while saving
2015-10-21 14:20:49 +05:30
Neil Trini Lasrado
3a573d1a6d Prevent Template Item from going into infinite loop while saving 2015-10-21 12:20:06 +05:30
Rushabh Mehta
7f66983309 [minor] added column type definition in batch-wise balance history 2015-10-21 12:04:27 +05:30
Anand Doshi
ea0d98891f [minor] don't display missing file doc message in item's make thumbnail 2015-10-20 18:57:38 +05:30
Anand Doshi
3bc43682f1 Merge pull request #4199 from neilLasrado/item
Default value of allow production order in Item master changed to 1
2015-10-20 17:44:26 +05:30
Anand Doshi
7c0eadb451 [fix] Patch template item to be shown in website, show variant's description and price on change of attribute 2015-10-20 17:30:02 +05:30
Neil Trini Lasrado
c0f88e4caf Default value fot allow production order in Item master changed to 1 2015-10-20 15:51:04 +05:30
Anand Doshi
7b2b0cd73c [fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level 2015-10-20 14:29:47 +05:30
Anand Doshi
17c633d00f [fix] Set fieldtype of description field as Text Editor in Landed Cost Item 2015-10-20 14:26:44 +05:30
Nabin Hait
4d20f3029b [fix] Set fieldtype of description field as Text in Landed Cost Item 2015-10-20 12:18:19 +05:30
Anand Doshi
25956d6282 [fix] Item thumbnail 2015-10-20 08:48:43 +05:30
Nabin Hait
6f64a78ecf Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Nabin Hait
608bbc7850 Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Anand Doshi
b4e9c1da64 [fix] thumbnail generation for item 2015-10-19 12:57:19 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Rushabh Mehta
3a519f269d Merge pull request #4175 from anandpdoshi/dynamic-linked-with
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
2015-10-15 14:25:18 +05:30
Rushabh Mehta
d3b8a74508 [test] fix, force values in target warehouse too 2015-10-15 13:23:10 +05:30
Anand Doshi
1d23ebb51d [fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339 2015-10-15 12:54:40 +05:30
Rushabh Mehta
ba5b0e8458 [test] [fix] print values for failing test 2015-10-15 12:45:42 +05:30
Rushabh Mehta
14a908bdec [test] [fix] abs(valuation_rate) for moving average 2015-10-15 12:28:20 +05:30
Rushabh Mehta
f94f153078 [test] fixes 2015-10-15 11:31:59 +05:30
Rushabh Mehta
c9bacedbfe [test] fixes 2015-10-15 11:00:34 +05:30
Rushabh Mehta
c4d4c7feb0 [fix] repost_actual_qty fix 2015-10-14 17:37:28 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Rushabh Mehta
fb73151da6 [fixes] 2015-10-14 16:22:01 +05:30
Rushabh Mehta
6e322d0a02 [enhancement] use thumbnails in grid views, patch to make thumbnails 2015-10-14 16:21:24 +05:30
Rushabh Mehta
80d2a55342 [enhancement] add variants in website 2015-10-14 16:16:00 +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
Nabin Hait
38e4c6f2af Allow same serial nos for raw materials and fg item in repack / manufacture entry 2015-10-13 18:37:39 +05:30
Nabin Hait
03afb45e34 [fix] Validate deletion of serial no 2015-10-13 15:46:42 +05:30
Nabin Hait
d91382dbf3 [fix] serial no status 2015-10-13 15:46:42 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Rushabh Mehta
22d0d586ab [minor] [typo] 2015-10-13 12:30:21 +05:30
Rushabh Mehta
eb62aed8c7 Merge pull request #4157 from nabinhait/bin
[fix][patch] Delete duplicate bins
2015-10-12 18:39:16 +05:30
Rushabh Mehta
5f349a67c9 Merge pull request #4156 from rmehta/item-section-fix
[fix] [minor] collapsible section for Item - removed custom script
2015-10-12 18:35:38 +05:30
Rushabh Mehta
d256055a8c Merge pull request #4153 from rmehta/stock-entry-fix
[fix] [minor] stock_entry.py error for None qty
2015-10-12 18:32:28 +05:30
Nabin Hait
b7e46c4ed9 [fix][patch] Delete duplicate bins 2015-10-12 18:28:50 +05:30
Rushabh Mehta
d4882653c3 [fix] [minor] collapsible section for Item - removed custom script 2015-10-12 16:45:53 +05:30
Rushabh Mehta
a30f3ea1f9 [fix] [minor] stock_entry.py error for None qty 2015-10-12 16:12:52 +05:30
Nabin Hait
51e980dd2c [fix] Multiple minor fixes 2015-10-10 18:10:05 +05:30
Nabin Hait
314086d6c0 [fix] Fetch UOM Conversion Factor from template if not specified in variants 2015-10-07 11:55:08 +05:30
Nabin Hait
5c66fb7631 Merge pull request #4130 from nabinhait/reports
[fix][report] Left join used in pending reports
2015-10-07 11:15:36 +05:30
Nabin Hait
8a7bdd5a92 [fix] Valuation Rate in Stock Balance report 2015-10-06 18:46:56 +05:30
Nabin Hait
f4edaef481 [fix][report] Left join used in pending reports 2015-10-06 12:48:04 +05:30
Anand Doshi
21f6ea6f7e [hotfix] remove allow on submit from item tables 2015-09-30 18:45:29 +05:30
Anand Doshi
c320fe541d Merge pull request #4067 from anandpdoshi/remove-party-account-currency
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 16:55:24 +05:30
Anand Doshi
f40a87511e Merge pull request #4091 from rmehta/repack-allow-low-rate
[fix] remove validation to disallow lower rate
2015-09-30 16:46:31 +05:30
Rushabh Mehta
cb96b61449 [fix] remove validation to disallow lower rate 2015-09-30 16:22:05 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
edba8f5582 [fix] Print 'Attach' field in Stock Entry Detail 2015-09-30 11:50:08 +05:30
gmarke
e5a31462fe Update get_item_details.py
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
2015-09-27 09:38:01 +02:00
Anand Doshi
361eca4cae Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit
Sales Team editable after submit
2015-09-24 11:30:31 +05:30
Anand Doshi
e2d46d0474 [fix] Allow Sales Team to be added/updated after submit 2015-09-23 19:26:29 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Anand Doshi
52dfc32eca [fix] validate_valuation_rate for Repack 2015-09-23 12:50:35 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2 [cleanup] [wip] portal, shopping cart cleanup 2015-09-23 12:49:16 +05:30
Anand Doshi
b6ec680c46 [fix] round percentages in get_indicator 2015-09-22 16:36:20 +05:30
Saurabh
5fe0086d9a [Fixes] Warehouse check while company delete & Variant Attribute value check 2015-09-16 16:59:24 +05:30
Anand Doshi
69f2cc8d24 [fix] don't fetch template item in get items of stock reconciliation 2015-09-15 11:54:13 +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
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Anand Doshi
9d5b84e78a Merge pull request #3996 from nabinhait/fix6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-09 15:11:12 +05:30
Nabin Hait
f0b3014a23 Planned Qty logic fixed and reposted for existing 2015-09-09 11:04:10 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Anand Doshi
9f25575e0c Merge pull request #3988 from nabinhait/fix2
Set expense account in stock reco only if company available
2015-09-08 15:59:18 +05:30
Nabin Hait
f44128f81c Set expense account in stock reco only if company available 2015-09-07 10:45:15 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +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
Anand Doshi
283850ce47 Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
Attributes in the variant should be in the same order as in the Template
2015-09-02 16:09:09 +05:30
Anand Doshi
099bbbded0 Attributes in the variant should be in the same order as in the Template
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
2015-09-02 15:56:55 +05:30
Nabin Hait
906bf64f04 [fix] Insert Item Price automatically based on Rate in Stock UOM 2015-09-02 11:32:14 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Anand Doshi
f370b0c6a4 [fix] print hide additional discount, reload doctypes in sales return patch 2015-08-27 16:03:29 +05:30
Nabin Hait
09c68c9ad0 Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-08-27 14:55:55 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Anand Doshi
b8610e1079 [fix] removed update_stock_ledger from delivery note 2015-08-27 14:46:47 +05:30
Anand Doshi
41e948b00a [hotfix] update reserved quantity in delivery note 2015-08-27 14:42:25 +05:30
Anand Doshi
c6802ca6d0 [minor] show Inventory section for new Item if Maintain Stock is checked 2015-08-27 13:21:43 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Anand Doshi
b99c180466 Merge branch 'rmehta-validation-settings' into develop 2015-08-27 12:22:06 +05:30
Rushabh Mehta
740db53b86 [fix] returned_qty reapply and change-log 2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note 2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929 Merge branch 'layout-cleanup' into develop
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json
2015-08-27 11:01:39 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29 [minor] stopped or cancelled message 2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note 2015-08-26 18:53:37 +05:30
Anand Doshi
ab9f03d557 Merge pull request #3952 from neilLasrado/variant-duplication
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 16:52:25 +05:30
Neil Trini Lasrado
755f1f6841 Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes 2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5 Merge pull request #3943 from nabinhait/fix4
[fix] Print Delivery Note without amount
2015-08-26 12:29:24 +05:30
Rushabh Mehta
b8a6f40370 [cleanup] layouts of item, customer, supplier, lead 2015-08-26 10:51:45 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8 [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde utilities/repost_stock file renamed to stock/stock_balance 2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Nabin Hait
a7c013c030 [fix] Print Delivery Note without amount 2015-08-24 18:43:19 +05:30
Neil Trini Lasrado
db189d7f19 Fixed test case for Item Variants 2015-08-24 16:59:24 +05:30
Neil Trini Lasrado
4c614bd59a Fixed validation for numeric variants to check with values from template instead of master 2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928 Fixed issue while creating item variants with decimal values (precision error) 2015-08-24 15:13:01 +05:30
Anand Doshi
bcb386fb64 Merge pull request #3922 from nabinhait/fraction_gle
Divisonal loss adjustment in purchase receipt
2015-08-21 14:55:44 +05:30
Nabin Hait
7c2901fb56 [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 14:45:59 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b GL Entry in account currency 2015-08-21 14:31:47 +05:30
Nabin Hait
597a402dff Divisonal loss adjustment in purchase receipt 2015-08-21 14:13:55 +05:30
Nabin Hait
1b6fd1ba5b [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 13:05:19 +05:30
Nabin Hait
d7ed197131 [fix] UOM Conversion factor mandatory in stock entry 2015-08-21 12:00:32 +05:30
Anand Doshi
db1a9edbdf [minor] removed test case of template cannot have stock 2015-08-20 18:20:06 +05:30
Anand Doshi
5c85740aab [minor] don't validate stock for template item 2015-08-20 17:43:35 +05:30
Anand Doshi
98c3aec274 [minor] hide Attribute Value using script so that it is visible in data import 2015-08-20 11:56:31 +05:30
Anand Doshi
f3eeb601ad Merge pull request #3908 from rmehta/text-editor
[fix] changed text > text editor for description fields in tables
2015-08-19 16:48:06 +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
8af567a229 [minor] import error 2015-08-19 12:10:03 +05:30
Anand Doshi
ffca81dbc1 [fix] added test cases and fixes to Item Variants 2015-08-19 11:52:05 +05:30
Anand Doshi
90fd6fee23 [fix] generate item code for variant 2015-08-19 10:21:24 +05:30
Anand Doshi
2538e51887 Fixes to Item Variant Attribute. Fixes #3905 2015-08-19 09:33:07 +05:30
Anand Doshi
cf2c624c03 Merge pull request #3902 from rmehta/pos-print
[enhancement] POS print after save #3853
2015-08-18 18:32:04 +05:30
Rushabh Mehta
ad9156a6ae [enhancement] POS print after save #385:wq:wq 2015-08-18 18:05:43 +05:30
Anand Doshi
afbe39a559 [fix] patch and rename Variant Attribute to Item Variant Attribute 2015-08-18 17:30:44 +05:30
Nabin Hait
91e1077e4c [fix] precision issue in stock entry 2015-08-17 17:58:52 +05:30
Nabin Hait
1c98886c85 [fix] Get stock and rate function restored 2015-08-17 17:58:52 +05:30
Anand Doshi
862c36832a Merge pull request #3892 from nabinhait/fix1
[fix] Get stock and rate function restored
2015-08-17 14:26:01 +05:30
Nabin Hait
c01342190c [fix] precision issue in stock entry 2015-08-17 14:18:44 +05:30
Nabin Hait
ac07b1cc07 [fix] Get stock and rate function restored 2015-08-17 10:50:30 +05:30
Neil Trini Lasrado
68f66a7e8b fixed Test Cases 2015-08-13 17:34:25 +05:30
Neil Trini Lasrado
9710eede00 Fixed Test Cases 2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
62dba50e9b Multiple Fixes 2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
cdc060cb7c Allow Editing variant attribute in Variant. Add validation to check duplication. 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
b9b49632f2 Added patch to fetch Item Template Attributes 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
ebf4cbeae3 Fixed Manage Variant 2015-08-13 16:17:01 +05:30
Neil Trini Lasrado
8b608c9043 Search Variants added to Item Master
Added feature for Variants to hande numeric values
2015-08-13 16:17:01 +05:30
Anand Doshi
cb4784c940 Merge pull request #3822 from neilLasrado/item-uom
Changed UOM validation for Item Master
2015-08-13 14:36:37 +05:30
Nabin Hait
58aea1f819 minor fix 2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0 Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7 2015-08-13 14:14:26 +05:30
Neil Trini Lasrado
9a73b7a319 Changed UOM validation for Item Master 2015-08-13 12:21:32 +05:30
Anand Doshi
57ca765d9e Merge pull request #3848 from rmehta/journal-entry-refactor
[refactor] added dynamic link in journal entry, #3847, #3814
2015-08-13 11:39:13 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d discount percentage should not be reset to zero on applying price list 2015-08-11 18:16:10 +05:30
Nabin Hait
ac6d11eb3c minor improvements 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f Fixes in Stock Entry 2015-08-10 19:14:43 +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
dde65752b6 Fixed code to consider partial FG entry 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
f6aad5ed2d Distribute tax amount between items in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172 Show only active BOM in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712 Added tax table in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
8142cd2865 [fix] fifo in stock ledger 2015-08-05 18:57:37 +05:30
bobzz-zone
ff04bf6346 Update stock_entry.py
fixed for null expense account
2015-08-05 11:28:11 +07:00
Rushabh Mehta
5bd394278d [fix] test-case, warehouse mandatory for mix type product bundle 2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975 [enhancement] make service type product bundle: 2015-08-04 14:47:45 +05:30
Anand Doshi
950250d444 Merge pull request #3793 from nabinhait/serial_no
Validate serial no in return entry with against document
2015-08-04 14:45:30 +05:30
Nabin Hait
b7c0c55d61 Validate serial no in return entry with against document 2015-08-04 12:18:12 +05:30
Nabin Hait
7edb951fdb [fix] Get fifo rate only qty exists in batch 2015-08-04 11:09:14 +05:30
Nabin Hait
1755a5f298 [fix] get items from bom in material request 2015-08-03 19:18:21 +05:30
Rushabh Mehta
b16b9cd7a0 [fix] force stock_uom in item and stock ledger entry 2015-08-03 16:13:33 +05:30
Nabin Hait
b30c40ec8a [fix] UOM conversion factor in stock entry 2015-07-31 19:48:57 +05:30
Rushabh Mehta
2f5587ab25 [fix] uom conversion factor in stock entry, #3734 2015-07-31 15:20:29 +05:30
Anand Doshi
2f443a5789 [hotfix] Item checkbox mandatory and removed Module Def Contacts 2015-07-30 14:44:43 +05:30
Nabin Hait
f33787a706 [fix] Get serial nos using FIFO in Return Delivery Note 2015-07-29 18:08:10 +05:30
Nabin Hait
763821d57d Merge pull request #3746 from nabinhait/get_item_details
[fix] Get item details based on selected company
2015-07-29 16:02:39 +05:30
Nabin Hait
453cc374d4 - Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Nabin Hait
e95c18a42d Merge pull request #3744 from nabinhait/return
Sales / Purchase Return Improvements
2015-07-29 15:51:34 +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
Nabin Hait
0edec9d25b Merge pull request #3730 from nabinhait/fix1
minor fixes
2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f [fix] Get item details based on selected company 2015-07-29 15:47:45 +05:30
Rushabh Mehta
8bf0b89595 [minor] currency field in list view for item price 2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055 Return status in listview for return entry 2015-07-29 14:54:33 +05:30
Nabin Hait
1e046aa49a Hide buttons for return entry 2015-07-29 13:16:37 +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
c80059e10e [fix] Ignore making SLE for opening stock reco with zero qty 2015-07-28 11:16:22 +05:30
Nabin Hait
2b7eda8135 Merge pull request #3683 from nabinhait/return
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +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
Nabin Hait
3cf67a462b Cleanup and test cases for serialized item 2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f [fix] Stock Entry permissions 2015-07-24 13:26:54 +05:30
Nabin Hait
061f7079ed Test case for purchase return 2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122 Test cases for sales return 2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a Minor fixes 2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663 Removed Sales/Purchase Return option from Stock Entry 2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096 Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate 2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
f965c5d203 now_datetime changed to nowdate 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
2771b7d828 Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings 2015-07-23 17:39:35 +05:30
Nabin Hait
2820a8749f Merge pull request #3710 from neilLasrado/stock-report
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Neil Trini Lasrado
13df8a40ef Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template 2015-07-23 12:46:59 +05:30
Neil Trini Lasrado
d0387f41df Opening Balance row added to Stock Ledger Report 2015-07-22 18:44:59 +05:30
Anand Doshi
7590aa2524 [minor] raise EmptyStockReconciliationItemsError when no change in any of the items 2015-07-22 14:43:36 +05:30
Rushabh Mehta
823e88d5bd [minor] close button for task and item not found error fix 2015-07-20 10:56:39 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
008d1a0334 Fixes in Stock Entry 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa Fixes in Production Planning Tool 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
700434ff37 has_variants made 'no copy' in Item Master 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
c70109d0c5 Item table made mandatory in Stock Reconciliation 2015-07-13 12:40:57 +05:30
Neil Trini Lasrado
5da4d857c9 Track Operations added to Production Order 2015-07-13 12:01:57 +05:30
Neil Trini Lasrado
cb4b2ec52a Fixes in validate baatch function 2015-07-10 17:31:06 +05:30
Neil Trini Lasrado
03bf529622 Validation added to prevent adding items with expired batch numbers to stock ledger entry 2015-07-10 16:20:21 +05:30
Nabin Hait
db938762c7 [fix] Adding rows not allowed in Variant table in Manage Variants and Item form 2015-07-09 11:55:38 +05:30
Nabin Hait
e2b7f832cc Test case fixed 2015-07-08 17:56:06 +05:30
Nabin Hait
736000c223 Merge pull request #3600 from neilLasrado/batch
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 16:10:21 +05:30
Nabin Hait
4017bfcd2e Merge pull request #3591 from rmehta/salary-manager-fix
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
Neil Trini Lasrado
ebb60f5dbc Fixed issues in Expired Batches while making Stock Entry 2015-07-08 15:24:02 +05:30
Nabin Hait
4439d8264f minor fix 2015-07-08 14:32:56 +05:30
Nabin Hait
00d79eb68d minor fix 2015-07-08 14:32:27 +05:30
Nabin Hait
28a9e35de9 Validate item rate with reference document with tolerance 0.009 2015-07-08 13:10:59 +05:30
Nabin Hait
c450536a2c [fix] Map values in Debit / Credit Note from Stock Entry 2015-07-08 13:10:59 +05:30
Rushabh Mehta
f9b356992a [fixes] salary manager #3554 2015-07-07 16:30:29 +05:30
Nabin Hait
0e6f92efa8 Merge pull request #3571 from neilLasrado/item-varients
Fixes for Item Attributes
2015-07-06 14:56:33 +05:30
Neil Trini Lasrado
1a0e86f11d Update item_attribute.py
Error Description Changed
2015-07-06 14:46:06 +05:30
Nabin Hait
7b5ac6396a Merge pull request #3575 from nabinhait/batch_report
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-06 14:30:23 +05:30
Neil Trini Lasrado
4d64acfafc Autocomplete issues fixed in Manage Variants 2015-07-04 14:50:00 +05:30
Nabin Hait
24efb3122a [fix] Hide zero balance rows in batch-wise balance history report 2015-07-03 15:20:14 +05:30
Neil Trini Lasrado
1faaf71dfc Auto-Capitalize Item Attribute Abbreation, Prevent attribute to be deleated if Variant exists 2015-07-03 12:44:01 +05:30
Nabin Hait
fcee17fd16 Removed purchase item validation 2015-07-02 17:51:35 +05:30
Rushabh Mehta
5105f909d6 [fix] show item description in form grid based on in_list_view 2015-07-02 15:09:18 +05:30
Neil Trini Lasrado
53bd62eafc Validation changed for Item Template cannot have Stock 2015-07-02 14:15:23 +05:30
Neil Trini Lasrado
fe9cd1d875 More Fixes in Manage Varients 2015-07-01 14:41:30 +05:30
Neil Trini Lasrado
64fbe955c7 Modified Date changed for Item Doctype 2015-07-01 14:04:00 +05:30
Neil Trini Lasrado
0988440fd9 Fixes for Manage Variants 2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
274dd4ada0 Fixed Manage Variants Attribute autocomplete appearance. 2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
724fd82419 Fixes in Manage Variants 2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6 Patch for Item Variants 2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
c761fefb78 more fixes in test records 2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
203cb10ef7 fixes in test cases 2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
90c66b1998 test cases added 2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
fed431f908 Code Fixes in Manage Variants 2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
bd9745ba72 Rename Item Variant from Manage Variants feature Added. 2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
8fb123b20e item variants, creation, deleation and update logic added.
logic added to copy changes in template to variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
333ccd212b variants combination generation logic added 2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
c8cc8b7115 manage variants new doctype created 2015-07-01 12:51:10 +05:30
Anand Doshi
0820161157 [fix] Item Variant Attribute autocomplete appearance. Fixes #3488, #3515, #3525 2015-06-29 20:57:06 -07:00
Nabin Hait
93cdee4503 [fix] Escape values in queries 2015-06-27 12:51:00 +05:30
Neil Trini Lasrado
035160c9a6 Added validation to prevent transfer of raw material from an expired batch for manufacturing 2015-06-24 15:25:57 +05:30
Nabin Hait
9cf2910ba1 [fix] validate items in stock entry for subcontracting against purchase order 2015-06-23 11:07:34 +05:30
Nabin Hait
7ee45b4af2 [fix] Batch-wise balance history: show records only with batch-id 2015-06-18 15:29:14 +05:30
Rushabh Mehta
ed9d5cfdaf [minor] cleanup 2015-06-17 02:13:03 +05:30
Rushabh Mehta
bf4547ca5f [fix] dynamic link in BOM Search report 2015-06-17 02:12:06 +05:30
Rushabh Mehta
b45a6bcb88 [report] BOM Search 2015-06-17 01:54:56 +05:30
Anand Doshi
ac59c2b300 [minor] clear Item's introduction section on refresh 2015-06-16 13:06:48 -04:00
Nabin Hait
7c5ba957ac Label changed for discount amount in base currency 2015-06-15 15:47:07 +05:30
Nabin Hait
5c7557914b Removed BOM No from mandatory from Stock Entry against Production Order 2015-06-11 16:50:35 +05:30
Nabin Hait
b937fac3ce [report] Warehouse column added in 'Ordered Items to be Delivered' report 2015-06-10 18:21:57 +05:30
Nabin Hait
a790ba05f4 [fix] Item name, description should not be overwritten on saving of stock entry 2015-06-09 18:42:52 +05:30
Neil Trini Lasrado
f64fae752f fixes 2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
82763f052f Status Indicators fixed in Material Request List 2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
d015195617 fixes in barcode 2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3 Barcode added to Purchase Receipt 2015-06-09 15:18:58 +05:30
Nabin Hait
ebbdd772a9 [fix] Validate and update manufactured qty in Stock Entry 2015-06-05 18:21:35 +05:30
Nabin Hait
6262496e70 [fix] item test case 2015-06-03 18:33:47 +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
4a6c178795 On selection of item, set default qty as 1 2015-06-01 14:01:56 +05:30
Anand Doshi
1b6c3f1a39 [fix] selenium test and changed Creation Document No to a Dynamic Link 2015-05-28 23:06:38 -04:00
Nabin Hait
10026ea85c Merge pull request #3354 from rmehta/discount-field-relabel
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Anand Doshi
8860b9d94d [fix] Check if company exists in re-order item. Fixes #3365. 2015-05-28 01:09:21 -04:00
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
Nabin Hait
eb00cae86c Fiscal Year removed from Material Request 2015-05-27 13:18:09 +05:30
Rushabh Mehta
69fb13f229 [cleanup] rename discount and reserver warehouse #3325 2015-05-27 12:20:07 +05:30
Rushabh Mehta
c7cfa270cd [minor] add import link in item price 2015-05-26 14:07:05 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 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
2c6705ef83 Merge pull request #3322 from nabinhait/test_case
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
4809d36fbe validate fields value with reference docs 2015-05-25 14:13:03 +05:30
Rushabh Mehta
c4d38e2183 [minor] setup wizard language fix and no submit messages for gl/sl entry 2015-05-25 11:29:37 +05:30
Nabin Hait
fe8d107731 stock entry: get item details 2015-05-22 18:04:44 +05:30
Nabin Hait
e2968e9893 minor fixes in test cases 2015-05-22 17:25:55 +05:30
Nabin Hait
fd4bcd855b test case fixes 2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763 test case fixes 2015-05-22 16:55:55 +05:30
Nabin Hait
1d08304ba5 added total row in stock balance report 2015-05-22 11:56:13 +05:30
Neil Trini Lasrado
753e40b4d5 fixes in validation for item varients 2015-05-21 14:38:58 +05:30
Nabin Hait
de7b87ee3a [fix] operations and bom 2015-05-21 13:24:49 +05:30
Nabin Hait
4a929d53bc Merge pull request #3310 from neilLasrado/item-var-validation
validation added to item varients
2015-05-21 13:21:21 +05:30
Nabin Hait
7f8d6b6252 Merge pull request #3303 from rmehta/letter-head-in-stock-entry
[enhancement] letter head in stock entry #3291
2015-05-21 13:20:26 +05:30
Neil Trini Lasrado
4258753ae8 validation added to item varients 2015-05-21 12:22:33 +05:30
Rushabh Mehta
a60984866c [enhancement] letter head in stock entry #3291 2015-05-20 17:45:18 +05:30
Rushabh Mehta
a27cca97b5 [rename] POS Setting > POS Profile #3271 2015-05-20 15:43:17 +05:30
Pratik Vyas
803e998e9d Fix merge mistakes 2015-05-19 13:08:54 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Nabin Hait
fb7140df2f Don't repost future sle while cancelling PR via landed cost voucher 2015-05-19 11:12:06 +05:30
Rushabh Mehta
7231bd76a2 [minor] [fix] default status in Purchase Receipt 2015-05-18 14:36:57 +05:30
Rushabh Mehta
9dd8aab211 [fix] status updater 2015-05-18 11:19:10 +05:30
Nabin Hait
a6ee8290ce Inclusive tax for deduction and manipulation of tax amount to fix rounding issue 2015-05-15 12:02:27 +05:30
Nabin Hait
90fc19ed9a Item image in print view 2015-05-14 12:32:26 +05:30
Nabin Hait
f6e4723101 minor fix in landed cost voucher 2015-05-13 12:53:11 +05:30
Nabin Hait
dd82bf2ad9 Exchange rate issue fixed 2015-05-11 16:49:31 +05:30
Nabin Hait
affb3ec220 Item variants: validation added 2015-05-11 15:11:17 +05:30
Nabin Hait
93e0ec6663 Show only sub-contracted purchase order in stock entry for subcontracting 2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be date issue fixed serial no 2015-05-11 11:32:38 +05:30
Nabin Hait
6752b31091 Fixed issue while updating Requested Qty on stoping material request and patch to recalculate 2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda Fixed issue while updating Requested Qty on stoping material request and patch to recalculate 2015-05-08 12:43:10 +05:30
Nabin Hait
08c0c04ef2 Removed old page style Stock ledger end stock level report 2015-05-07 16:59:51 +05:30
Rushabh Mehta
bcdea3ea51 [rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template 2015-05-06 18:45:47 +05:30
Nabin Hait
64568fb296 Default expense account and cost center are always visible in item 2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0 item list view indicator fix 2015-05-04 16:06:59 +05:30
Rushabh Mehta
5dbf8a7418 [cleanup] frappe.get_user 2015-05-01 11:51:26 +05:30
Nabin Hait
67fdbcf242 precision fixed in batch-wise balance report 2015-04-28 12:53:26 +05:30
Nabin Hait
5ce31174be precision fixed in batch-wise balance report 2015-04-28 12:36:53 +05:30
Rushabh Mehta
50ce9753e0 [minor] added cache in get_value 2015-04-27 13:13:50 +05:30
Nabin Hait
52cf6e947c patch fix 2015-04-24 16:07:32 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Rushabh Mehta
4665f7eb70 [enhancement] added description, batch_no in packing slip 2015-04-21 11:20:24 +05:30
Rushabh Mehta
0939a5ac4c feature to delete company 2015-04-17 11:52:45 +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
3ee1f11771 [cleanup] quality inspection fixes #3061 2015-04-14 17:53:36 +05:30
Neil Trini Lasrado
cf96cc26a0 Fixes for test cases 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe fix- Material Transferred for Manufacturing not Updating in Production Order Error 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a removed unnecesssary functions. Production related feilds made mandatory in TIme Log 2015-04-14 13:00:54 +05:30
Nabin Hait
4642d0697e fixed conflict 2015-04-09 11:42:24 +05:30
Anand Doshi
c994647704 fixed test cases 2015-04-08 21:22:36 +05:30
Nabin Hait
0277ae298a pending amount to be delivered in report 2015-04-07 17:49:53 +05:30
Nabin Hait
6eb55d4d3d allowed import for delivery note 2015-04-07 09:42:44 +05:30
Anand Doshi
c399709789 fixes to test cases 2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
22af7deadd minor fixes 2015-04-05 17:18:07 +05:30
Anand Doshi
6208c49859 Added Company field in various Query Reports 2015-03-30 15:21:20 +05:30
Nabin Hait
54c865e77c Landed cost voucher: fixes for serialized item 2015-03-27 15:39:06 +05:30
Nabin Hait
789ef7e346 stock balance report fixed 2015-03-26 17:40:57 +05:30
Rushabh Mehta
308e6ea21e [fixes] default_website and stock reco 2015-03-24 17:35:16 +05:30
Rushabh Mehta
fea22de3e8 [minor] material request and newsletter list 2015-03-23 15:44:54 +05:30
Nabin Hait
da5cfb1630 Exchange rate upto 9 decimals 2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82 modified date updated 2015-03-23 14:17:59 +05:30
Rushabh Mehta
c2eae25d0e [cleanup] validate_email_add 2015-03-23 14:10:51 +05:30
Nabin Hait
97cc4dd582 precision issue fixed in report 2015-03-23 13:10:50 +05:30
Nabin Hait
544af6d4cf fix 2015-03-23 12:35:39 +05:30
Nabin Hait
63e00dcfd2 Set qty as per stock_uom while mapping Material request to Purchase order 2015-03-20 16:25:53 +05:30
Nabin Hait
2ed71bac20 Batch related cleanup 2015-03-20 15:06:30 +05:30
Nabin Hait
5601d9fbda match condition in get_query 2015-03-20 14:40:36 +05:30
Anand Doshi
2b2b639492 fixes 2015-03-20 14:29:23 +05:30
Nabin Hait
fd2bf93b50 test case fix 2015-03-18 17:56:09 +05:30
Anand Doshi
9d8154dd40 fixed test cases 2015-03-18 16:22:13 +05:30
Nabin Hait
60aee54c6c currency in test records 2015-03-18 16:06:13 +05:30
Nabin Hait
2df422de25 Test case fixes 2015-03-18 14:57:09 +05:30
Neil Trini Lasrado
adb1b2ccef fix - price list none is disabled error if price list is made blank in purchase order 2015-03-18 11:41:58 +05:30
Nabin Hait
a1bf43b1a6 Merged develop into v5 2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de test case fixed 2015-03-17 10:15:19 +05:30
Anand Doshi
9d9e31f4e8 moved get_list_context to module 2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917 Test case cleanup and fixes 2015-03-13 08:14:46 +05:30
Neil Trini Lasrado
6f272f2f53 fixes in Production Order 2015-03-12 17:51:06 +05:30
Sambhaji Kolate
845f1c636e code cleanup 2015-03-10 15:19:29 +05:30
Sambhaji Kolate
98dbccd1d6 added actual_batch_qty at warehouse in DN & SI #1873 2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Anand Doshi
c0eb8c0de3 Fixed some Stock Entry test cases 2015-03-08 12:42:18 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764 Fixed Test Cases 2015-03-05 19:31:40 +05:30
Nabin Hait
b50833a1e8 Fields alignment 2015-03-04 16:14:02 +05:30
Rushabh Mehta
0c677aa151 fix #2847 2015-03-04 12:32:59 +05:30
Nabin Hait
652c7db6e8 Stock entry fixes: incoming rate, toggle display of bom related fields 2015-03-03 18:33:34 +05:30
Rushabh Mehta
e693f794f5 [subcontract] refactor, make stock entry from PO 2015-03-03 15:50:24 +05:30
Nabin Hait
56c6a65a22 argument name fix in sendmail 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
Nabin Hait
43ba7e1a30 allow negative stock issie fixed 2015-03-03 14:07:21 +05:30
Rushabh Mehta
1758357a0a [item] toggle reqd, fixes #2832 2015-03-03 11:08:22 +05:30
Rushabh Mehta
b83fa3bc2d [pos] [barcode] fixes #2831 2015-03-02 18:25:14 +05:30
Nabin Hait
b7ae9b4283 Merge pull request #2866 from neilLasrado/barcode
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Nabin Hait
851c745fdf Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0 2015-02-26 12:32:04 +05:30
Nabin Hait
98a8fae7c2 hotfix for fetching default account and warehouse 2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4abda67a98 Barcode added to stock entry 2015-02-25 19:01:17 +05:30
Nabin Hait
69d874e7d7 Merge pull request #2864 from neilLasrado/delivery-note
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Rushabh Mehta
a8a2fb225d [fixes] item, test site install 2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4 [fix] default account for manufacturing stock entry should be cogs 2015-02-25 17:15:45 +05:30
Rushabh Mehta
2a21bc9fc2 [taxes and charges] refactor 2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c [minor] notifications and other fixes to stock 2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc Allow user to change page_name in Item and Item Group #2397 2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed batch field changed to link feild in packed_item 2015-02-25 12:44:45 +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
Anand Doshi
da858cc587 Website Product Image 2015-02-24 17:52:09 +05:30
Rushabh Mehta
b620fed762 [fixes] [minor] 2015-02-24 16:51:22 +05:30
Nabin Hait
7ce2f55ca9 print_hide for total_taxes_and_charges in buying 2015-02-24 16:06:14 +05:30
Nabin Hait
903c42a130 multiplefixes 2015-02-24 15:24:49 +05:30
Rushabh Mehta
99d0941008 [time logs] fixes 2015-02-24 14:48:11 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02 minor fixes 2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb fixes for base_rate, base_amount, tax_amount: mass search and replace 2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8 Fields added in all sales and purchase doctypes 2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60 Validate taxes and charges input, commonified 2015-02-24 10:02:28 +05:30
Nabin Hait
34afcfb4a1 Print without amount in delivery note 2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028 discount calculation and in print view 2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf Taxes and totals calculation in party currency 2015-02-24 10:02:27 +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
d06c1188a0 [item] patches 2015-02-23 14:43:15 +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
65a2759432 [minor] opportunity / item 2015-02-21 17:35:50 +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
dc93e0adc6 [fixes] stock reco 2015-02-20 15:11:56 +05:30
Nabin Hait
ad3fd5166b update stock uo in sle for DN 2015-02-20 14:23:58 +05:30
Sambhaji Kolate
973f78e7d3 fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802 2015-02-20 13:09:39 +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
Rushabh Mehta
8bb6e530c7 [fixes] accounts, stock changes 2015-02-18 20:22:59 +05:30
Rushabh Mehta
614e7ab757 [cleanup] SMS, and added item filter in stock balance 2015-02-18 19:51:48 +05:30
Rushabh Mehta
4ea1ade7b9 [hub] start 2015-02-18 19:09:56 +05:30
Nabin Hait
06fd10620e Merge pull request #2734 from neilLasrado/kill-html-desc
Kill html desc -WIP
2015-02-18 13:13:52 +05:30
Nabin Hait
5fd1727acd Merge pull request #2752 from neilLasrado/stock-amount
client side - recalculate amount and total amount on change of qty or va...
2015-02-18 13:11:41 +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
Neil Trini Lasrado
3361df709c Image field and view added to all stock doctypes 2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
c48f06c095 Image field and view added to all selling doctypes 2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9 html item desc removed from item master, item image added in oppurtunity 2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1 listview indicator fix 2015-02-18 12:23:18 +05:30
Neil Trini Lasrado
b2c521847e fixes 2015-02-18 12:07:09 +05:30
Nabin Hait
da5f766dd5 fixed conflict 2015-02-18 11:55:13 +05:30
Neil Trini Lasrado
3efc6ab94d fixes 2015-02-18 11:51:09 +05:30
Neil Trini Lasrado
9aafe76f63 client side - recalculate amount and total amount on change of qty or valuation reate of the item 2015-02-18 11:51:09 +05:30
Rushabh Mehta
2e0e711eb2 [minor] stock_ledger_entry.py 2015-02-18 11:38:48 +05:30
Rushabh Mehta
df9e80c87a [refactor] stock entry, minor ux 2015-02-17 19:56:04 +05:30
Rushabh Mehta
0fb678e7cf [stock reco] cleanups 2015-02-17 19:56:04 +05:30
Anand Doshi
8c0f05fbae [minor] grid report loading 2015-02-17 19:53:23 +05:30
Nabin Hait
7945195478 Merge pull request #2761 from neilLasrado/update-finished-goods-fix
Update finished goods fix
2015-02-17 14:21:41 +05:30
Nabin Hait
13e6ac737f Merge pull request #2748 from neilLasrado/get-prod-order
fixes in stock entry
2015-02-17 14:12:00 +05:30
Nabin Hait
133b7ed218 Merge pull request #2743 from neilLasrado/price-list
Price list name made - 'no copy'
2015-02-17 14:08:18 +05:30
Rushabh Mehta
2712e36f08 [stock reco] added items table 2015-02-17 12:50:20 +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
Nabin Hait
b09ed41c52 Fetch default accounts, cost center only if company matches with the transactions 2015-02-17 10:34:17 +05:30
Rushabh Mehta
36b84408a8 [fixes] precision in purchase receipt and item group route 2015-02-16 18:26:38 +05:30
Neil Trini Lasrado
35898d7518 Update finished goods fix 2015-02-16 17:25:28 +05:30
Neil Trini Lasrado
4d4c643b7e fixes in stock entry 2015-02-13 13:09:17 +05:30
Neil Trini Lasrado
62885b3c56 Price list name made -no copy 2015-02-12 17:41:20 +05:30
Nabin Hait
5690be103c Replaced renamed total fields in code files 2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018 Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc 2015-02-12 13:31:48 +05:30
Nabin Hait
461ee2ebae Renamed total fields 2015-02-12 11:47:45 +05:30
Neil Trini Lasrado
daaf5814fa landed cost voucher fix 2015-02-11 16:23:46 +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
Neil Trini Lasrado
845be908d6 function moved to validate 2015-02-06 16:15:45 +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
Anand Doshi
9b30a8626c [minor] removed default filters for sales order and material request, fixed pos css 2015-02-06 12:30:08 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Nabin Hait
e0ce9407cb divisional loss adjustment while doing gl entry for purchase receipt 2015-02-05 15:12:37 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
14e24a947b fixes for batch validations 2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6 validation added in stock entry 2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
75e0f0a153 batch list view fix: 2015-02-03 17:41:11 +05:30
Nabin Hait
7e333c6a31 Merge pull request #2596 from neilLasrado/item-in-bom
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Rushabh Mehta
052bd624c1 [minor] removed company description and don't call apply_price_list if no items 2015-01-30 16:57:24 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
79dc136d50 default target warehouse for subcontract 2015-01-29 12:51:17 +05:30
Nabin Hait
238fd68803 Minor fix 2015-01-28 14:30:03 +05:30
Anand Doshi
6f701b3b6a [minor] Packing Slip get_query 2015-01-27 13:18:01 +05:30
Nabin Hait
4ccd8d3326 Allow nagative batch balance from landed cost voucher 2015-01-23 12:18:14 +05:30
Nabin Hait
963393409e minor fix: child table length 2015-01-21 17:22:11 +05:30
Nabin Hait
9c47efb592 Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts 2015-01-21 16:22:45 +05:30
Nabin Hait
3f671ea60f Landed Cost Voucher: Add field and fixed reposting issue 2015-01-21 14:08:06 +05:30
Neil Trini Lasrado
c784fa219b commit 2015-01-19 17:05:05 +05:30
Neil Trini Lasrado
f37a5ddff5 allow bom field removed from Item Master 2015-01-19 17:05:05 +05:30
Nabin Hait
cff8993478 Merge pull request #2572 from neilLasrado/credit-note
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
6609938483 Removed validation: target_valuation > source_valuation 2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c Hide currency and price list section after submission 2015-01-15 14:22:04 +05:30
Nabin Hait
45a5d52a2a minor changes in packing slip 2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
9235c6d65a update stock_entry.py 2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
50763d58ce frappe.db.exist used 2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c journal entry linked and validation added 2015-01-14 11:54:55 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Rushabh Mehta
135fe3405f [ui] listviews 2015-01-12 16:11:02 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +05:30
Nabin Hait
675276b802 valuation rate mandatory if item is transacting for the first time 2015-01-10 10:27:28 +05:30
Rushabh Mehta
d49a123fd0 [ui] listviews 2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
a17d7cea34 test records fixed 2015-01-07 15:42:59 +05:30
Rushabh Mehta
738d4ef5c8 [ui] [listviews] indicators 2015-01-06 18:09:02 +05:30
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8 [design] POS - item grid and taxes 2015-01-05 16:19:12 +05:30
Nabin Hait
0938b5dec6 FG item and raw material can not be merged 2015-01-02 15:12:30 +05:30
Anand Doshi
3f5e95a99e [design] Fixed Grid Reports 2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
a4e547d71d minor fix 2014-12-31 12:08:13 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c [design] wip 2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +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
b0b7e7fdf8 Merge pull request #2497 from neilLasrado/batch-redesign
batch redesigned
2014-12-23 17:44:41 +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
da4e3fb366 fixed negative batch wty message 2014-12-23 10:58:01 +05:30
Nabin Hait
a04489a72b minor fix no-copy 2014-12-22 14:58:36 +05:30
Nabin Hait
e4c659386a packing list index 2014-12-16 15:16:55 +05:30
Nabin Hait
0f2137be18 no copy property for customer's po no 2014-12-16 10:37:55 +05:30
Neil Trini Lasrado
26320fc755 batch redesigned 2014-12-15 17:42:33 +05:30
Nabin Hait
ad0bd4ca92 Pull all customer's po no in delivery note when made from multiple sales order 2014-12-12 12:49:45 +05:30
Nabin Hait
a94478a618 Merge pull request #2390 from ankitjavalkarwork/fix2314
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
ankitjavalkarwork
5edae0e47b [#2314] Add selectable BOM field for Subcontracted Item 2014-12-04 15:54:54 +05:30
Rushabh Mehta
969069fbf9 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Nabin Hait
789b74257e test case fixes 2014-11-27 15:22:24 +05:30
Nabin Hait
40fffc0f4d fixes during testing version 5 2014-11-26 15:43:27 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Nabin Hait
9ed41b3abb Reordered Item fields 2014-11-26 10:54:11 +05:30
Nabin Hait
db74e316d2 Validate serial no after auto-creation based on naming series 2014-11-24 15:25:13 +05:30
Nabin Hait
2c114b5bb5 Merge pull request #2407 from ankitjavalkarwork/packingsliphead
Add letterhead field and mapper in Packing Slip
2014-11-14 14:50:28 +05:30
ankitjavalkarwork
f60f111afe Add letterhead field and mapper in Packing Slip 2014-11-13 17:28:42 +05:30
ankitjavalkarwork
338eb36811 [#2219] Re-Order Level Validation: Warehouse cannot have two reorders for same item 2014-11-11 13:59:46 +05:30
Nabin Hait
f004077734 Map only pending qty from Material Request to Purchase Order/Stock Entry 2014-11-11 10:51:41 +05:30
Neil Trini Lasrado
6bde5868a9 Test Cases Fixed 2014-11-05 16:34:02 +05:30
Neil Trini Lasrado
6d8f48ff8d Test Cases Added - Work Pending 2014-11-05 15:57:06 +05:30
Neil Trini Lasrado
f9ced8f28f test-cases added 2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
67e9081bbf required modifications done 2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
ce020cfb27 mapper added, type 'Transfer' renamed to 'Material Transfer', patch added 2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
f24407e119 Material Issue added to Material Request Type 2014-11-05 15:46:32 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
f73a7c1d17 Merge pull request #2376 from ankitjavalkarwork/fix2287
Delete Item Price on deletion of linked Item
2014-11-05 11:44:18 +05:30
Nabin Hait
941a965af4 Ordered qty calculation logic 2014-11-04 15:34:03 +05:30
Nabin Hait
4acd431b92 Requested qty calculation logic 2014-11-04 15:34:03 +05:30
ankitjavalkarwork
a03eda54a2 Delete Item Price on deletion of linked Item 2014-11-03 16:00:28 +05:30
Nabin Hait
0d421c1bf1 Minor fixes 2014-11-03 15:46:15 +05:30
Nabin Hait
11e50a8eee Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
Hide totals in DN, Auto set Bank/Cash acc. in JV
2014-11-03 15:38:45 +05:30
Nabin Hait
5288bdeabb Minor fix 2014-11-03 15:08:21 +05:30
ankitjavalkarwork
6e06357dc5 Hide totals on checking print_without_amount field in DN 2014-11-03 11:57:44 +05:30
Rushabh Mehta
98ae5bd9db [form] show website link for website generator 2014-10-31 14:28:47 +05:30
Neil Trini Lasrado
0683fc33ed Fix error in get_default_cost_center() function 2014-10-22 14:51:37 +05:30
Nabin Hait
16e05c321c Removed stock ageing grid report 2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865 Stock ageing report fix 2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39 Minor fix 2014-10-21 20:23:39 +05:30
Rushabh Mehta
39dbf73de7 [merge] item-variants 2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35 Merge pull request #2231 from rmehta/item-variants
Item variants
2014-10-21 12:38:16 +05:30
Nabin Hait
fc2dd44694 Partial payment reconciliation. Fixes #1982 2014-10-17 14:57:20 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315 Guess valuation rate in case of negative stock 2014-10-15 11:34:40 +05:30
Nabin Hait
0dc18f0102 Minor fixes 2014-10-14 17:15:02 +05:30
Nabin Hait
bf492122f8 minor fix 2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a Negative stock allowed for perpetual inventory. Blocked in specific case 2014-10-14 16:08:19 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
Nabin Hait
daf344e5fd Precision fixed in batch-wise balance report 2014-10-13 10:48:26 +05:30
Nabin Hait
70ec88b733 fixed test cases 2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216 Stock balance grid report deprecated and moved to server side 2014-10-10 20:54:57 +05:30
Nabin Hait
30a0e3e8b4 Merge pull request #2275 from ankitjavalkarwork/fix2164
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
Nabin Hait
7c6f990cf9 Minor fix for moving average 2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3 Stock balance grid report deprecated and moved to server side 2014-10-10 18:03:07 +05:30
Nabin Hait
4d74216147 Maintain negative stock balance if balance qty is negative 2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d [#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues 2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
eaae58f507 Transaction.js fixed , code commonified 2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198 fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6 Fixed issues 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5 Fiscal year autofetch added 2014-10-09 15:01:12 +05:30
Nabin Hait
e96e83d557 stock reco and repost vouchers 2014-10-08 18:06:14 +05:30
Rushabh Mehta
ebc6016ffb [tests] fixes 2014-10-08 13:54:19 +05:30
Rushabh Mehta
7472a1147c [tests] fixes 2014-10-08 12:41:06 +05:30
Rushabh Mehta
f850987db0 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:03:19 +05:30
Nabin Hait
6c48ef781b Utility: Repost stock ledger entries and gl entries for all stock transactions 2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b Block negative stock in perpetual inventory 2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9 stock reco fixes 2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd Stock reconciliation sl entries 2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf Stock Reconciliation logic simplified 2014-10-08 11:02:18 +05:30
Rushabh Mehta
b31e90c7a5 [tests] fixes to stock entry 2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05 [fix] remove test for item attribute value 2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3 [item-variants] get table values from template if not set in variant #2224 2014-10-07 15:29:58 +05:30
Rushabh Mehta
baef96b5a2 [item-variants] allow production order of variant #2224 2014-10-07 12:34:19 +05:30
Rushabh Mehta
1a7637459c [item-variants] added more validations, tests #2224 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
Rushabh Mehta
70aa8933b1 [item variant] started 2014-10-07 11:39:54 +05:30
Rushabh Mehta
9974b16c32 [fix] packing slip 2014-10-07 10:52:05 +05:30
Nabin Hait
997a7a1d3e Test case fixes 2014-10-06 13:15:21 +05:30
Nabin Hait
36cf4a4708 Test case fixes 2014-10-06 13:15:02 +05:30
Nabin Hait
894a1b539a Dynamic link in general ledger and stock ledger report 2014-10-06 13:14:22 +05:30
Nabin Hait
db030d1761 Set Receivable/Payable account based on party 2014-10-06 13:13:27 +05:30
Nabin Hait
3a40435f8c Credit days and credit limit option in customer group / supplier type #1354 2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f Credit Limit and credit days fixes #2031 2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678 Deleted master_type, master_name, credit_days, credit_limit fields from account
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
ankitjavalkarwork
e9877a0c48 [fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report 2014-10-01 18:07:25 +05:30
Nabin Hait
4f614b4030 Merge pull request #2195 from neilLasrado/manufacture-and-repack
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Neil Trini Lasrado
29d1a1c593 manufacturing and repack sepreted, test cases fixed, patch fixed 2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f Has Batch No field should be freezed #2023 2014-09-30 12:57:32 +05:30
Rushabh Mehta
86211cd219 Merge pull request #2203 from rmehta/mailbox
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
39764685f0 [fix] material request feed 2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1 [fix] material request feed 2014-09-29 12:53:53 +05:30
Rushabh Mehta
66e08e39f7 [fix] currency moved to frappe 2014-09-29 12:17:03 +05:30
Nabin Hait
d60235e239 minor fix in warehouse-wise stock balance report 2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762 Fixes for item list view 2014-09-29 11:36:06 +05:30
Nabin Hait
5e080f9039 Update utils.py 2014-09-26 15:05:30 +05:30
Nabin Hait
b0bd99266d Fix in landed cost voucher 2014-09-26 14:30:02 +05:30
ankitjavalkarwork
9aa11d2ad7 Add ability to fetch Non stock items in Gross Profit report 2014-09-18 19:08:04 +05:30
Anand Doshi
11b75759d2 Merge pull request #2194 from ankitjavalkarwork/stockbalreport
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Anand Doshi
8950abc36f Merge pull request #2197 from anandpdoshi/anand-september-15
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Rushabh Mehta
bf8715dba4 [refactor] used frappe.sendmail 2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
Nabin Hait
ca260618d8 Minor fix 2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398 [minor] removed Suggest 2014-09-15 16:43:34 +05:30
81552433qqcom
ac0c3fb696 #2190 hotfix, item page 2014-09-15 10:21:36 +08:00
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
ankitjavalkarwork
2e07305616 Update report with Valuation rate, stock values, move to Main report 2014-09-11 16:47:19 +05:30
Anand Doshi
907494c5d4 [fix] transfer_qty in get_stock_and_rate 2014-09-11 16:22:12 +05:30
Anand Doshi
fc33d5a75b Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810 2014-09-09 15:25:43 +05:30
Anand Doshi
dc79334f1c [fix] Clear website cache for Item Group on saving Item 2014-09-09 12:35:15 +05:30
Nabin Hait
ff7e9b6b22 Get items in PO from material requests based on supplier 2014-09-09 11:01:55 +05:30
Anand Doshi
45c9b1c065 [minor] Set in_list_view for Sales and Purchase item tables 2014-09-08 17:42:17 +05:30
Nabin Hait
0f798dda15 Valuation rate for finished goods in repack entries 2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9 Search field fixed in stock entry 2014-09-04 15:21:46 +05:30
Nabin Hait
a84f3663dd removed test records for landed cost voucher 2014-09-02 23:11:06 +05:30
Nabin Hait
96bdc5834c Get valuation rate in manufacturing/repack entry 2014-09-02 20:02:25 +05:30
Nabin Hait
9e563e7b47 Stock reconciliation when valuation rate column is blank 2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca landed cost voucher added in module page 2014-09-01 18:16:24 +05:30
Anand Doshi
40a8ae2907 [fix] get incoming rate 2014-08-29 16:28:31 +05:30
Anand Doshi
43f087c99d [hotfix] Supplier read permission for Purchase User
[Fix] Issue #448

[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Neil Trini Lasrado
9d1e8b61fe [Fix] Issue #980 final 2014-08-25 19:04:30 +05:30
Neil Trini Lasrado
d676491b6e Merge https://github.com/frappe/erpnext into item_group 2014-08-25 16:18:31 +05:30
Neil Trini Lasrado
caba531e89 [fix] issue#980 2014-08-25 13:22:15 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Rushabh Mehta
cb067aa579 [route] refactor, wip 2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d remove website route, wip 2014-08-20 11:43:58 +05:30
Anand Doshi
cca6460e65 [fix] Error Reports 2014-08-19 16:06:09 +05:30
Anand Doshi
6ab831b387 Allow Default Warehouse for Item, even if not a Stock Item 2014-08-18 19:04:19 +05:30
Nabin Hait
448c9b71c1 minot fix in material request 2014-08-18 15:40:36 +05:30
Pratik Vyas
c0d31ce648 Merge pull request #2062 from nabinhait/hotfix
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481 [hotfix] Allow on submit for Projected Qty 2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6 Stock entry minor fix 2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281 Sales/purchase return: fixes for qty validation 2014-08-14 15:15:14 +05:30
Rushabh Mehta
ab8bde0149 [ux] added folds, show actual / projected qty in pos 2014-08-14 11:43:46 +05:30
Anand Doshi
f957cbd8ef [test] Purchase Receipt - update rejected serial no 2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e Landed Cost voucher test case for serialized items 2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f Landed Cost voucher test case for serialized items 2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371 Add rejected serial nos in Purchase Receipt if auto-created based on series 2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a Landed cost voucher minor fixes 2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9 Landed cost voucher fixes 2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb no copy property for landed cost voucher amount field 2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07 pr and pi gl entries 2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c landed cost voucher minor fix 2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980 Purchase receipt gl entries if there is warehouse without account 2014-08-11 16:12:31 +05:30
nabinhait
f807cda375 PR and PI gl entries fixes for landed cost 2014-08-11 16:12:31 +05:30
nabinhait
11594c7927 purchase receipt gl entries 2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc minor fix 2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14 Added help in landed cost voucher 2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48 Removed old landed cost wizard 2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1 Test case for landed cost voucher 2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2 GL entries for sub-contracting and rejected qty 2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714 landed cost fix 2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e Landed Cost on_submit and gl entries for PR 2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae landed cost voucher design changed #1921 2014-08-11 16:12:30 +05:30
nabinhait
4436157da1 Landed cost redesign initial commit #1921 2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4 [hotfix] Allow on Submit - Actual / Projected Qty for Packed Item 2014-08-11 15:54:20 +05:30
Anand Doshi
42335fb2cb [minor] Allow on Submit - Actual / Projected Qty 2014-08-11 13:28:29 +05:30
Anand Doshi
52d1ea83a0 [hotfix] Stock Entry List 2014-08-11 09:16:59 +05:30
Anand Doshi
03eadb74ab Fixes to microtemplate feature 2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a added templates for projects 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
18eb4f5015 added listviews for sales, purchase 2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a built item grids for sales, purchase, stock 2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d [ux] fixed primary action 2014-08-08 11:51:23 +05:30
Nabin Hait
67cd3fb89c Fixes in making credit note from Sales Return 2014-08-07 15:34:53 +05:30
Anand Doshi
29817d6d8b [print] Moved Total Taxes and Charges to the right column 2014-07-31 16:05:19 +05:30
Anand Doshi
fbe37c9158 Labels: Use Date instead of Posting Date 2014-07-31 14:31:25 +05:30
nabinhait
0ad677045a Test record fixed for warehouse 2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863 Validation: Account must belong to the same company 2014-07-31 11:40:40 +05:30
Anand Doshi
627f13ea26 Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text 2014-07-30 13:09:01 +05:30
Anand Doshi
60ee2ea8af [hotfix] Stock Entry search fields 2014-07-29 23:16:24 +05:30
Anand Doshi
0e93352c8d [print] Hide Rate, Amount if Print Without Amount in Delivery Note 2014-07-29 22:03:40 +05:30
nabinhait
92a1e06665 message fix 2014-07-29 12:46:56 +05:30
nabinhait
7555d619f2 Message for frozen stock entries 2014-07-29 11:35:41 +05:30
nabinhait
0a35277c96 Stock reconciliation only for valuation 2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65 Sales / purchase return: Get party details fix 2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d Column added 'Reqd by Date' in po_items_to_be_billed report 2014-07-28 16:41:33 +05:30
Anand Doshi
62b1cbf003 [impact] Limit available functions in jinja environment 2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1 Fixes for print 2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9 many fixes to print 2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c cleanup for print format 2014-07-25 13:01:52 +05:30
Anand Doshi
4c5d7617fb [minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form 2014-07-21 18:02:22 +05:30
Rushabh Mehta
1c6313679b Update material_request.js 2014-07-21 13:08:49 +05:30
Anand Doshi
d141cf7293 Minor fix in reorder item 2014-07-18 10:31:34 +05:30
Anand Doshi
e8332be285 Merge pull request #1949 from anandpdoshi/anand-july-17
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
fa0db761da Fix in Stock Entry test case 2014-07-17 12:30:55 +05:30
nabinhait
d16081c4d9 Batch no get query fix 2014-07-17 11:08:19 +05:30
nabinhait
143400d444 Batch no get query fix 2014-07-17 11:00:13 +05:30
Anand Doshi
b8189d7d23 Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified 2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067 Fixes in Stock Entry test cases 2014-07-16 19:23:58 +05:30
Anand Doshi
d93fa2f78b Fixes in Stock Entry and test cases 2014-07-16 16:08:15 +05:30
nabinhait
d5fd535909 Minor fix, if no default company 2014-07-14 12:39:50 +05:30
nabinhait
614fb750b7 set qty as per stock uom in entire purchase cycle 2014-07-14 10:48:12 +05:30
nabinhait
d5fb5d91e9 overflow validation fixed 2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b Print Hide other charges calculation 2014-07-10 12:16:39 +05:30
nabinhait
89b5e3e2ea Set discount zero while fetching price list rate 2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list 2014-07-08 15:30:25 +05:30
Anand Doshi
e729516af7 Minor fix 2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c Catch FiscalYearError in Re-order Item 2014-07-07 15:21:18 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
nabinhait
23cce731ab Fixes in action, not defined if called from outside document class 2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de Description removed for default cost center 2014-07-03 10:50:35 +05:30
Anand Doshi
e673a664ac Fixes to end_of_life conditions 2014-07-02 18:15:01 +05:30
Anand Doshi
8ac4643fd7 Merge pull request #1867 from nabinhait/v4-hotfix
Multiple fixes
2014-06-30 13:20:49 +05:30
Anand Doshi
c459fe21f8 Merge pull request #1865 from frappe/wip-4.1
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
606c601fc0 Make debit/credit note from sales/purchase return 2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b Item website specification from item group 2014-06-30 11:50:17 +05:30
Anand Doshi
11ada53ed5 Fixes related to Website Route system and other misc fixes 2014-06-28 12:13:11 +05:30
Nabin Hait
a0a18d963d item query fixed in stock entry 2014-06-27 13:04:22 +05:30
Nabin Hait
b7e91ee95e with_doc issue fixes 2014-06-26 15:54:45 +05:30
Anand Doshi
f1af06c00d Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-26 15:05:42 +05:30
Nabin Hait
4a1c897b2d Select field options in serial no 2014-06-26 12:35:14 +05:30
Anand Doshi
5263b1a9c1 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-25 17:06:51 +05:30
Nabin Hait
2b400dc2ad stock entry incoming rate based on precision 2014-06-25 16:57:49 +05:30
Anand Doshi
8b2dfcff29 Naming Series Property Setter Patch 2014-06-25 16:57:49 +05:30
Nabin Hait
061c9744af Set status button in serial no 2014-06-25 16:57:48 +05:30
Nabin Hait
43616619ec Set status button in serial no 2014-06-25 16:57:48 +05:30
Nabin Hait
9daca108b3 Pricing Rule fixes and improvements. Fixes #1795 2014-06-25 16:57:47 +05:30
Nabin Hait
c5e813f9f4 Overwrite from POS Settings if value exists 2014-06-25 16:57:07 +05:30
Nabin Hait
3b7dd0396f Get party details fixes 2014-06-25 16:57:07 +05:30
Nabin Hait
c226292d8e Stocvk entry incoming rate for sales return 2014-06-25 16:57:07 +05:30
Nabin Hait
216e5bb208 Incoming rate for sales return 2014-06-25 16:57:07 +05:30
Nabin Hait
afdc0a5f59 Valuation rate and amount for fg item 2014-06-25 16:57:07 +05:30
Anand Doshi
222b7b660e Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-25 16:57:06 +05:30
Anand Doshi
a469954ef3 Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
2014-06-25 16:57:06 +05:30
Anand Doshi
457515fc08 Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-25 16:57:05 +05:30
Anand Doshi
e3ac8dd5a8 Don't set default for warehouse when creating serial no 2014-06-25 16:57:05 +05:30
Nabin Hait
cea571fc31 Fixes in fetching valuation rate in stock entry 2014-06-25 16:57:03 +05:30
Nabin Hait
7c6c2e0ccf Do not make packing list after submission 2014-06-25 16:57:02 +05:30
Anand Doshi
a740f750c7 Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return 2014-06-25 13:31:02 +05:30
Anand Doshi
610a405c85 Fix in warehouse query 2014-06-25 13:30:26 +05:30
Anand Doshi
e0a7ff77df Merge pull request #1838 from nabinhait/v4-hotfix
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
fdf38dab6f stock entry incoming rate based on precision 2014-06-24 12:42:36 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Nabin Hait
da490e3f53 Set status button in serial no 2014-06-23 15:51:03 +05:30
Nabin Hait
36da171a3d Set status button in serial no 2014-06-23 15:36:31 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Nabin Hait
faf176d78c Overwrite from POS Settings if value exists 2014-06-18 19:52:24 +05:30
Nabin Hait
4d7c4fc0f4 Get party details fixes 2014-06-18 16:40:59 +05:30
Nabin Hait
e7c2f74a07 Stocvk entry incoming rate for sales return 2014-06-18 16:40:59 +05:30
Nabin Hait
a7da6e1480 Incoming rate for sales return 2014-06-18 16:40:59 +05:30
Nabin Hait
ae0d753cad Valuation rate and amount for fg item 2014-06-18 16:40:59 +05:30
Anand Doshi
de12a0941f Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-18 14:05:29 +05:30
Anand Doshi
987a28fc6a Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
2014-06-18 14:05:08 +05:30
Anand Doshi
297939325a Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-18 13:10:10 +05:30
Anand Doshi
2f800521cb Don't set default for warehouse when creating serial no 2014-06-18 12:48:46 +05:30
Nabin Hait
0693937c1e Fixes in fetching valuation rate in stock entry 2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d Do not make packing list after submission 2014-06-18 10:18:50 +05:30
Rushabh Mehta
36881807ed Merge branch 'wip-4.2' into wip-4.1 2014-06-17 17:36:22 +05:30
Rushabh Mehta
9f887b436c fixes new routing, for frappe/frappe#600 2014-06-17 16:53:44 +05:30
Rushabh Mehta
5df521bad5 updated generators for wip-4.2 2014-06-17 14:21:26 +05:30
Nabin Hait
d2e8a0a96a Delivery note update after submission 2014-06-17 12:55:52 +05:30
Nabin Hait
a6fc3f6337 Ignore pricing rule for material request 2014-06-16 15:34:52 +05:30
Nabin Hait
539f352318 Delivery note to packing slip mapping 2014-06-16 15:03:36 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Nabin Hait
f2202fc014 minor fix 2014-06-12 15:20:47 +05:30
Nabin Hait
46dc3b1442 validations added in stock entry 2014-06-12 12:48:28 +05:30
Nabin Hait
2128c98c35 available qty validation. Fixes #1045 2014-06-12 12:42:22 +05:30
Nabin Hait
e98b326ba3 Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932 2014-06-12 12:25:23 +05:30
Anand Doshi
7656377f3f Show website route for generator via set_intro, fix in Support Email Settings 2014-06-10 15:48:37 +05:30
Anand Doshi
b527e54809 Fixed report: Item wise Price List Rate 2014-06-09 18:08:46 +05:30
Anand Doshi
edb9efd9a6 Fixed manifest and website 2014-06-09 15:11:18 +05:30
Anand Doshi
cdfa9a371d Export perm for GL Entry and Stock Ledger Entry 2014-06-09 15:11:17 +05:30
Anand Doshi
482d29dc53 Fixed Purchase Receipt qty trigger 2014-06-06 20:34:08 +05:30
Rushabh Mehta
880b3ef6c0 added qty updating option multi-item selector 2014-06-06 11:45:30 +05:30
Rushabh Mehta
ba83e9cfbe removed sms control and related cleanup, fixes frappe/erpnext#462 2014-06-05 17:56:42 +05:30
Nabin Hait
19d1e499c3 Removed Purchase in transit report #1435 2014-06-04 19:00:56 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Anand Doshi
69eec9e344 Role and User Permissions 2014-06-04 17:48:54 +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
Anand Doshi
ffc28faa51 Merge pull request #1744 from rmehta/develop
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087 added multiple item select and allow non purchase items in Material Request of type transfer 2014-06-04 13:10:41 +05:30
Nabin Hait
ce6977ffe6 Minor fixes in fetching item details 2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6 Parent account mandatory for all non-root accounts 2014-06-03 23:02:02 +05:30
Nabin Hait
b15764ef2c Translation issue fixed in analytics/grid report 2014-06-03 13:02:39 +05:30
Nabin Hait
548cf96c44 Minor fixes in sales return 2014-05-30 19:09:59 +05:30
Nabin Hait
e6ddd28067 Don't execute reorder_item, if initial setup not completed. fixes #1668 2014-05-30 15:53:20 +05:30
Nabin Hait
c1367d9d10 minor fixes 2014-05-30 11:43:00 +05:30
Nabin Hait
7f32cbeb06 Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37 Get valuation rate for fg item base don issued item cost + operation cost. #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824 uom trigger issue in stock entry fixes #1712 2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737 packing slip fixes #1711 2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198 deleted delivery note packing list wise print format 2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea Standard Rate field removed from item. Fixes #1688 2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0 Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706 2014-05-30 11:22:14 +05:30
Nabin Hait
9bc9b8795b Fixes in stock reconciliation 2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb removed print statement 2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37 pricing rule testcase fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd pricing list tets case fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Rushabh Mehta
a7c46e4d83 removed debug in query (packing_slip.py) 2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406 fix to packing slip (validation) 2014-05-26 13:05:19 +05:30
Nabin Hait
edf87a258f Create serial no based on series only if item is serialized 2014-05-21 15:38:56 +05:30
Nabin Hait
2e0620e370 Server side onload functionality in multiple docs 2014-05-19 18:15:58 +05:30
Nabin Hait
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Anand Doshi
39cc1df560 Fixes #1635, Stock Reconcilation 2014-05-14 15:10:00 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
0ff6e3a6bb Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402 Test case fixes for serial no 2014-05-11 12:10:57 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Nabin Hait
d64a952b5d Stock reco: item and warehouse validation and translation fixes 2014-05-09 11:50:24 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd Item managed batch-wise, can not be reconciled through stock reconciliation 2014-05-08 19:08:06 +05:30
Nabin Hait
227db769a0 Item valuation rate on material transfer based on fifo 2014-05-08 19:06:01 +05:30
Anand Doshi
0c85169539 Fixed clear cache for item page 2014-05-08 17:46:00 +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
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Nabin Hait
cea4cd4e5f Pull stock entry difference account from company 2014-05-06 11:57:33 +05:30
Nabin Hait
98c2a052e5 Fixes in pricing rule testcases #565 2014-05-05 18:41:41 +05:30
Nabin Hait
f2db87a766 Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565 2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703 Pricing Rule: if multiple rules, ask to resolve conflict #565 2014-05-05 14:49:40 +05:30
Nabin Hait
f57f0a661a Stock Entry: pulling items from BOM fixed #1579 2014-05-05 10:27:53 +05:30
Anand Doshi
4ab5382d3f Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564 2014-05-04 11:50:10 +05:30
Nabin Hait
296d626e53 Back flush issue fixed in sub contracting #1567 2014-05-02 17:36:13 +05:30
Nabin Hait
1e6c32e95f Address and contact creation from opportunity #1570 2014-05-02 11:42:24 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Anand Doshi
d9f0f27cd4 Fixes in test cases 2014-04-30 22:16:25 +05:30
Rushabh Mehta
a15164750d started client side testing using selenium and other related and unrelated fixes 2014-04-30 19:39:13 +05:30
Nabin Hait
6777efa7fa Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-28 17:09:13 +05:30
Nabin Hait
2594e41462 Removed Stock Ledger doctype 2014-04-28 16:23:45 +05:30
Anand Doshi
6916baa299 BugFix: Item search in Stock UOM Replace Utility 2014-04-28 15:33:34 +05:30
Rushabh Mehta
41d126586e fix get_server_fields in stock_entry.js 2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb Set conversion_factor in stock entry test case 2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c Fixes #1532. Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt. 2014-04-25 18:44:28 +05:30
Anand Doshi
bbffaf78fb BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b 2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes #1526 2014-04-24 18:11:49 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
68d0b7c7ff get_item_details fixed for Material Request 2014-04-22 19:30:53 +05:30
Anand Doshi
07339fc69e Fixes in Setup Wizard and Attachments 2014-04-22 15:30:24 +05:30
Anand Doshi
0549b1c5c9 Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year 2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c Removed controller.py 2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Anand Doshi
5d591ebe83 Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext 2014-04-18 16:20:07 +05:30
Rushabh Mehta
169c1fd93b fixed translation for setup-wizard and removed purchase validation for Material Request #925 2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a Fixes in Taxes, Quotation and Address Territory 2014-04-18 01:32:02 +05:30
Anand Doshi
dbfcd328fb Fixes update_after_submit validation errors 2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152 Fixes Item Price duplicate entry validation 2014-04-17 11:40:22 +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
Nabin Hait
6298536e46 set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi

Conflicts:
	stock/doctype/stock_ledger/stock_ledger.py
	utilities/repost_stock.py
2014-04-16 15:23:08 +05:30
Rushabh Mehta
d85dc868ca more message fixes for translation 2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Pratik Vyas
f37d6fe32b Merge pull request #1514 from frappe/js-translate-refactor
JS translation refactor
2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e remove linebreaks for translation strings (js) 2014-04-15 10:50:36 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e js translations refactor 2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices frappe/frappe#478 2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
Anand Doshi
9fd50bcfb6 Fixed rest of the test cases frappe/frapp#478 2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d Fixed Test Cases frappe/frappe#478 2014-04-08 20:15:22 +05:30
Anand Doshi
2ce39cf770 Fixed Stock Entry Test Cases frappe/frappe#478 2014-04-07 18:51:58 +05:30
Nabin Hait
103cc58cb6 material request testcase #478 2014-04-07 16:40:43 +05:30
Nabin Hait
088dec6c09 testcase fixes #478 2014-04-07 16:00:28 +05:30
Nabin Hait
dc82d4f0cd frappe/frappe#478 fixes 2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0 frappe/frappe#478 replaced doclist in testcases 2014-04-04 13:26:50 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Nabin Hait
312ba99e71 frappe/frappe#478 fixes 2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf frappe/frappe#478 fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
99f914b782 frappe/frappe#478, fixes 2014-04-03 14:47:03 +05:30
Rushabh Mehta
2fbb00fd8d frappe/frappe#478, more changes, removed bean 2014-04-03 14:38:22 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812 frappe/frappe#478 removed more instances of doclist 2014-04-03 12:38:42 +05:30
Rushabh Mehta
cfb6ccfe51 frappe/frappe#478 removed self.doclist 2014-04-03 11:46:52 +05:30
Rushabh Mehta
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
943e614810 frappe/frappe#478 2014-04-02 16:37:35 +05:30
Anand Doshi
5b552b51f1 frappe/frappe#478 2014-04-02 15:03:35 +05:30
Anand Doshi
dd32d6eb1f frappe/frappe#478 2014-04-01 12:22:14 +05:30
Rushabh Mehta
f2227d033c frappe/frappe#478, removed instances of .fields 2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58 frappe/frappe#478 added test_records.json 2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9 frappe/frappe#478 2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc frappe/frappe#478 2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da frappe/frappe#478 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 #478 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - frappe/frappe#478 2014-03-26 18:24:30 +05:30
Nabin Hait
1d630ccaa5 Update serial no maintenance status based on warranty/amc expiry date 2014-03-26 10:23:14 +05:30
Nabin Hait
425bfc5c8d minor fix in serial no 2014-03-21 18:15:26 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30
Nabin Hait
439dceebd8 minor fix in landed cost wizard 2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f Warehouse disable option 2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f set root type from parent or child 2014-03-21 11:25:17 +05:30
Nabin Hait
a18bf07920 updated charts json with proper account and root types 2014-03-21 11:22:41 +05:30
Nabin Hait
49a6f0754e Removed debit_or_credit field 2014-03-21 11:22:38 +05:30
Nabin Hait
4d713ac5ba sql injection fixes 2014-03-21 11:22:37 +05:30
Anand Doshi
4b2692182a Fixes after change in fields handling in Document 2014-03-19 16:58:42 +05:30
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Rushabh Mehta
4541875c81 removed searchfield condition from get_match_cond frappe/erpnext#1457 2014-03-06 11:19:46 +05:30
Nabin Hait
9472247b6e Update stock_entry.js 2014-03-05 17:45:58 +05:30
Anand Doshi
74d0e40bdc Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields 2014-03-05 15:24:29 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Nabin Hait
177b86a15b fix in pricing rule 2014-02-28 15:47:22 +05:30
Nabin Hait
13b93ebed8 pricing rule: fixes in testcase 2014-02-28 15:04:05 +05:30
Nabin Hait
3319170805 pricing rule: condition for tree-type docs 2014-02-28 13:04:19 +05:30
Nabin Hait
ed5f423e65 pricing rule: condition for tree-type docs 2014-02-28 13:04:19 +05:30
Nabin Hait
311079a311 Patch: copy customer discount to pricing rule 2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2 Pricing Rule fixes and reference field in all item table 2014-02-28 13:02:00 +05:30
Nabin Hait
7e8e8ba714 pricing rule 2014-02-28 13:02:00 +05:30
Nabin Hait
c65a0c7197 Allowed stock entry import 2014-02-28 13:02:00 +05:30
Nabin Hait
bc34f3edae shortage qty column added in stock projected qty report 2014-02-28 13:02:00 +05:30
Nabin Hait
615d342056 Pricing Rule: first commit 2014-02-28 13:02:00 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
a6628eee56 rename sitemap to route 2014-02-25 11:08:37 +05:30
Rushabh Mehta
6fbda08583 fixed sitemap patch 2014-02-20 19:03:03 +05:30
Nabin Hait
cda83bba59 Row no fix in stock reconciliation 2014-02-20 15:01:51 +05:30
Nabin Hait
0f2310690e fix in fetch item details and supplier non-mandatory to fetch 2014-02-20 11:27:47 +05:30
Nabin Hait
f5bb9ae1b1 default value in single doctypes 2014-02-19 19:02:40 +05:30
Nabin Hait
9d1f077922 get lead details in quotation 2014-02-19 17:43:24 +05:30
Nabin Hait
05b28eb161 minor fixes 2014-02-19 11:04:32 +05:30
Nabin Hait
36a4db69b8 price list on_trash function 2014-02-18 15:14:46 +05:30
Pratik Vyas
31affc0e67 bump modified dates for purchase receipt and purchase invoice 2014-02-17 11:36:10 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
a038831c45 validate item of item_price record 2014-02-13 15:54:51 +05:30
Nabin Hait
36028bfb56 minor 2014-02-12 19:09:28 +05:30
Nabin Hait
66b2717c54 Merge pull request #1414 from akhileshdarjee/4.0-hotfix
Customer and Supplier dashboard set to company currency
2014-02-12 16:55:17 +05:30
Nabin Hait
eba1bdbcca minor fixes 2014-02-12 16:04:17 +05:30
Nabin Hait
139dc7b9b2 minor fixes 2014-02-12 14:54:16 +05:30
Nabin Hait
0aa71a5c41 minor fixes 2014-02-12 14:54:15 +05:30
Nabin Hait
5aecc538dd Letter Head field added in purchase receipt and invoice 2014-02-12 14:54:15 +05:30
Nabin Hait
5f59726903 Rename fields: replaced in html and txt files 2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a Rename fields: amount related fields 2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21 Field Rename: rate field mass replacement 2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4 Rename fields: initial commit 2014-02-12 14:54:13 +05:30
Nabin Hait
777397489e Fields renamed in schema 2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102 commonify get_item_details and rename fields to sync selling and purchase 2014-02-12 14:54:12 +05:30
Nabin Hait
c28c86dfd8 Validate duplicate serial nos entry 2014-02-12 14:54:11 +05:30
Nabin Hait
9beffb646d Validate duplicate serial nos entry 2014-02-12 14:54:11 +05:30
Akhilesh Darjee
f2b7cd65a9 customer and supplier dashboard set to company currency 2014-02-12 11:29:08 +05:30
Anand Doshi
93fdc670fe Fixes in Test Cases 2014-02-11 14:40:21 +05:30
Anand Doshi
d7cc47e3ac Do not validate Material Request against Sales Order, Moved Setup page to Framework 2014-02-10 17:39:12 +05:30
Nabin Hait
574c7e7c63 item related cleanup 2014-02-06 15:51:01 +05:30
Pratik Vyas
79499e3615 fix syntax error in material request, merge booboo 2014-02-06 15:25:17 +05:30
Rushabh Mehta
307fac8b78 hooks fixes 2014-02-05 17:04:49 +05:30
Rushabh Mehta
cc008cc109 commonified get_party_details 2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233 merge 2014-02-03 14:49:53 +05:30
Nabin Hait
23c28704d2 Field arrangement in child table 2014-02-03 14:36:59 +05:30
Nabin Hait
d7fb6dce89 Stock reconciliation: cost center filters 2014-01-31 17:05:09 +05:30
Nabin Hait
c3211ab394 Merge pull request #1368 from akhileshdarjee/default-tax
Default tax for customer and supplier
2014-01-31 02:40:51 -08:00
Nabin Hait
b5be7bab9b Stock Return: fetch customer and supplier details 2014-01-30 18:47:12 +05:30
Nabin Hait
8dc2c6a16c Default accounts in company should not be copied 2014-01-30 17:00:09 +05:30
Nabin Hait
ec43e4dd33 Merged with develop 2014-01-30 15:22:10 +05:30
Akhilesh Darjee
e0a1039756 merge conflict fixed 2014-01-30 14:44:35 +05:30
Nabin Hait
0ff32e73ba Merged with 4.0.0-wip 2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d webnotes/erpnext#1090 set default tax type in customer and supplier 2014-01-29 16:31:38 +05:30
Akhilesh Darjee
2ced3b07d4 changed fieldname from charge to taxes 2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Anand Doshi
3f8f4ff6cd BugFix: Production Planning Tool - get_raw_materials 2014-01-24 21:47:01 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Nabin Hait
4ba95d0b7a Fix in testcases 2014-01-23 16:45:22 +05:30
Nabin Hait
5ae6a61c4d Fixes related to appifing shopping cart 2014-01-23 15:33:30 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
719f2803b3 Fixed conflict while merging with develop branch 2014-01-20 17:01:28 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
e27717261d merge conflict fixed 2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Nabin Hait
06720dfb90 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip 2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f Fliend rearrangemet in tables 2014-01-01 10:45:42 +05:30
Nabin Hait
6260b58a0a Merge pull request #1253 from nabinhait/4.0.0-wip
4.0.0 wip
2013-12-31 21:13:45 -08:00
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Nabin Hait
139aa71666 Fixed conflict while merging with master 2013-12-31 16:09:22 +05:30
Akhilesh Darjee
829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount 2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c Merge fixes: removed patches, removed Warehouse User 2013-12-27 18:00:28 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +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
caa4380d49 Merge with 3.3.8 2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
2b08985e16 Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:48 +05:30
Rushabh Mehta
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3 fixed template loader webnotes/wnframework#351 2013-12-12 13:57:58 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55 added stock analytics 2012-09-20 19:03:14 +05:30
Anand Doshi
c63f0518d7 removed zoom from grid report 2012-09-20 12:08:47 +05:30
Anand Doshi
09d686f7f6 zoom for stock ledger report 2012-09-19 19:06:38 +05:30
Rushabh Mehta
40a3b46d61 Added code for plot zoom 2012-09-19 17:13:10 +05:30
Rushabh Mehta
b803cbab3d Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 16:48:30 +05:30
Rushabh Mehta
5b5bc97c50 separated tooltip text in plot 2012-09-19 16:47:43 +05:30
Rushabh Mehta
4573515899 added graphs in stock ledger and general ledger 2012-09-19 16:41:19 +05:30
Anand Doshi
bb6d06f64a Merge branch 'master' of github.com:webnotes/erpnext 2012-09-19 12:18:18 +05:30
Anand Doshi
cdd5cfefd5 make item code read-only after saving 2012-09-19 12:17:41 +05:30
Rushabh Mehta
823c021e9c added index patch and updated general_ledger 2012-09-19 12:01:01 +05:30
Rushabh Mehta
eb8673ecc6 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9 Stock Ledger Report 2012-09-18 18:52:05 +05:30
Nabin Hait
9a90c89b3f removed duplicate function from sales invoice 2012-09-18 13:37:27 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Rushabh Mehta
b40e93733c merge with master 2012-09-14 11:29:52 +05:30
Nabin Hait
ebc3b6a68d stock ledger added 2012-09-14 11:25:57 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939 added watch, check progress 2012-09-14 11:08:53 +05:30
Anand Doshi
e08249f3d5 allow multisort with selectable sort order 2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Anand Doshi
ae64c46671 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:46:52 +05:30
Anand Doshi
ff6754ccf4 fix in bin query 2012-09-10 15:46:38 +05:30
Anand Doshi
3b3a42303d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:14:16 +05:30
Anand Doshi
bb2bb03bcc fix in bin reorder item condition 2012-09-10 15:13:22 +05:30
Anand Doshi
1971ca9ecb renamed Report to report 2012-09-10 11:40:06 +05:30
Anand Doshi
10f4ae814c renamed Report name to small case name 2012-09-10 11:34:51 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
2012-09-10 11:31:18 +05:30
Nabin Hait
56419e0d79 Stock ledger report new version 2012-09-07 12:11:41 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Nabin Hait
e343393d73 add/drop index if index key not exists / exists 2012-08-07 10:53:52 +05:30
Anand Doshi
a4f6529801 in item's update page name, if item name is null, create page name with only the name 2012-08-06 13:42:19 +05:30
Anand Doshi
1c2b192be6 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
2012-08-06 13:36:19 +05:30
Nabin Hait
337fef0859 call item on_update from UOM Replace Utility 2012-08-06 13:33:32 +05:30
Anand Doshi
e64d900322 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
Nabin Hait
fd03762445 call item on_update from UOM Replace Utility 2012-08-06 13:18:32 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Anand Doshi
59d37c4bcb Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py
2012-07-31 17:30:49 +05:30
Nabin Hait
f9360ce562 filter on actual qty in stock level report 2012-07-31 17:27:11 +05:30
Nabin Hait
d614a6ea38 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 14:12:41 +05:30
Nabin Hait
8d97290c06 updated bin permission 2012-07-31 14:12:23 +05:30
Anand Doshi
fd684ec247 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 13:58:16 +05:30
Anand Doshi
29c8b3b487 bug fix: strip serial no field before validation to check truthy value 2012-07-31 13:57:06 +05:30
Nabin Hait
76697a5c3b added filter on item group and brand 2012-07-31 12:07:40 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
2012-07-27 14:45:24 +05:30
Nabin Hait
f5b3a44da1 SO and DN mandatory only for stock item if made mandatory in global defaults 2012-07-27 10:54:18 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Nabin Hait
74b30c15ea Update erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py 2012-07-25 18:14:46 +05:30
Anand Doshi
7118086658 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-23 11:28:10 +05:30
Anand Doshi
76ec66dd65 fixes for unicode 2012-07-20 18:11:30 +05:30
Nabin Hait
93e82b8742 error fixed in landed cost wizard 2012-07-20 10:40:14 +05:30
Anand Doshi
1703cc89b4 fixes for unicode 2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Anand Doshi
a60266d780 fix in doclistview group by logic 2012-07-18 15:43:43 +05:30
Nabin Hait
41c922d200 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a packing list issue fixed 2012-07-18 13:19:01 +05:30
Anand Doshi
04fd09c639 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-17 13:33:57 +05:30
Anand Doshi
4612e696b0 mark stock entry as is_submittable 2012-07-17 13:33:41 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Anand Doshi
8c7e76ba44 RSS for blog
Comment addition into blog page's dom
2012-07-11 18:40:57 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Nabin Hait
cfc6bb1d6c consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items 2012-07-11 13:14:52 +05:30
Nabin Hait
0a38e4528b Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce removed depricated commenting style 2012-07-10 10:27:58 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing
Login page rendered via a template
2012-07-09 15:56:12 +05:30
Anand Doshi
c6fce634cf added app frame to todo list 2012-07-09 12:34:02 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
594d63ab5d serial no fix 2012-07-03 12:24:18 +05:30
Anand Doshi
e9a21cbb85 show child table values in doclistview 2012-06-29 18:09:04 +05:30
Anand Doshi
efc055241a Merge branch 'master' into dev 2012-06-29 12:25:02 +05:30
Anand Doshi
08faf5bb7f added field descriptions for packing slip 2012-06-29 12:24:35 +05:30
Anand Doshi
bd025a6cdf added field descriptions for packing slip 2012-06-29 12:23:44 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
2012-06-27 14:13:34 +05:30
Nabin Hait
7ce737be3d Issue fixed in stock reconciliation 2012-06-27 11:33:05 +05:30
Nabin Hait
b8108c68e9 Issue fixed in stock reconciliation 2012-06-27 11:16:28 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89 reserved warehouse in so and delivery warehouse in dn can be different 2012-06-25 18:06:37 +05:30
Nabin Hait
72a6ec8cb3 SO search query in DN: currency check removed 2012-06-25 10:39:38 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Nabin Hait
4676891cbf error fixed in reorder item email notification 2012-06-12 15:04:38 +05:30
Nabin Hait
d8fd8cfe1b error fixed in reorder item email notification 2012-06-12 14:30:57 +05:30
Nabin Hait
ea8ff071cb error fixed in reorder item email notification 2012-06-12 14:23:48 +05:30
Nabin Hait
9b0178acae error fixed in reorder item email notification 2012-06-12 14:16:21 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Nabin Hait
e91d8ccc5c Custom query for item in serial no 2012-06-04 10:47:44 +05:30
Nabin Hait
1835ee6c8b issue fixed 2012-05-31 12:28:07 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
2c4cd08844 more listviews 2012-05-21 18:40:53 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Anand Doshi
fd3b19defa Merge branch 'shf_rename' 2012-05-18 18:08:44 +05:30
Anand Doshi
67a2e0123c moved po number and po date to basic info section of delivery note 2012-05-18 18:08:28 +05:30
Anand Doshi
00175612ac Merge branch 'shf_rename'
Conflicts:
	erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1 new listviews 2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename'
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
fc9145425d Fixes in Print Formats - discount in description 2012-05-17 18:11:54 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-15 18:22:55 +05:30
Nabin Hait
f044526b92 json error fixed in stock entry 2012-05-15 15:29:47 +05:30
Nabin Hait
901e92d8fa rejected qty issue fixed 2012-05-15 13:40:26 +05:30
Nabin Hait
ed02a85184 fixed issue 2012-05-15 12:15:19 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Nabin Hait
ef85c4e556 posting time fixes in stock ledger entry 2012-05-10 17:48:34 +05:30
Nabin Hait
6fb498ebcd changed field position of net total(import) 2012-05-10 14:03:39 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	erpnext/patches/patch_list.py
2012-05-10 12:40:58 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Nabin Hait
6d6ca4bdb8 mapper fix 2012-05-08 11:51:35 +05:30
Nabin Hait
c22bd05bb5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 17:35:45 +05:30
Nabin Hait
5375627bca stock reco issue fixed 2012-05-07 17:35:15 +05:30
Anand Doshi
a00852ce19 fix in purchase receipt - show challan no for indian customers 2012-05-07 16:59:28 +05:30
Nabin Hait
875ccac151 stock reco cancellation issue fxed 2012-05-04 18:48:30 +05:30
Anand Doshi
bc1d74dbfe fix in landed cost master query 2012-05-04 13:13:44 +05:30
Anand Doshi
837baee1b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 13:05:36 +05:30
Anand Doshi
cc1583de88 fix in landed cost master 2012-05-04 13:04:40 +05:30
Nabin Hait
ff81c37689 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 11:46:38 +05:30
Nabin Hait
0fb4eeb5bb cancellation issue fixed in stock reco 2012-05-04 11:46:07 +05:30
Rushabh Mehta
22cd09beb3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 10:02:51 +05:30
Rushabh Mehta
5a774db021 delivery, not and sales_bom 2012-05-04 10:02:09 +05:30
Nabin Hait
a67f706c92 options did not updated in stock entry 2012-05-03 18:09:15 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Rushabh Mehta
28bb342f96 list view for purchase receipt 2012-05-03 10:41:19 +05:30
Rushabh Mehta
3d0c9ba22d added listview for stock entry, listview templates 2012-05-03 10:35:51 +05:30
Rushabh Mehta
182569feb0 shipping address on top for delivery note 2012-05-03 10:28:23 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Nabin Hait
00ba2ce8b4 fixes in sales and pur return 2012-05-02 16:04:42 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Nabin Hait
796505a83e field arrangement in purchase and stock cycle 2012-05-01 16:26:16 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Nabin Hait
228d03ec01 posting time fix 2012-04-30 16:59:39 +05:30
Rushabh Mehta
542acf6757 website, product and grid bugfix 2012-04-30 14:23:12 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Nabin Hait
d4c5a9e2c4 fixes in bin 2012-04-30 11:50:34 +05:30
Nabin Hait
3e8f35c09e fixes in bin 2012-04-30 11:47:45 +05:30
Nabin Hait
fc51f995c8 fixes in bin 2012-04-30 11:43:16 +05:30
Nabin Hait
201f8ca821 fixed conflict in sales bom using ours 2012-04-27 14:03:06 +05:30
Nabin Hait
b931f37735 fixed conflict using ours 2012-04-27 13:59:39 +05:30
Nabin Hait
0d1daa8875 fld order change 2012-04-27 13:56:58 +05:30
Nabin Hait
de975ff307 fixed filtering issue in gs 2012-04-27 13:53:20 +05:30
Nabin Hait
762056aaa8 sales bom amendment issue fixed 2012-04-27 11:06:12 +05:30
Nabin Hait
b9d3ade2f4 sales bom issue fixed 2012-04-27 11:04:11 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565 fixed batch issue 2012-04-26 11:11:34 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Nabin Hait
ed7de5fee2 posting time format validation 2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038 updated sales bom document 2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082 fixed wrong serial no qty validation 2012-04-24 14:07:04 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
4c9525139d Error fixed in stock ledger netry batch related 2012-04-24 10:38:37 +05:30
Nabin Hait
f19bb52b2a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Nabin Hait
b9984c8995 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 10:25:33 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Rushabh Mehta
a11bc07a7f new report builder - todo: sort, save 2012-04-19 17:48:57 +05:30
Anand Doshi
b50a7a5ff9 Fix in rate fetching on get item details, when using inclusive rate 2012-04-19 12:00:49 +05:30
Nabin Hait
6da191de03 negative stock fixes 2012-04-18 16:18:20 +05:30
Nabin Hait
7afc2124a6 allow negative qty feature 2012-04-18 12:04:20 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
0a8a487230 Update erpnext/stock/doctype/item/item.js 2012-04-10 16:50:23 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename
Conflicts:
	erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Anand Doshi
0442b4e207 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-29 15:22:15 +05:30
Anand Doshi
66722dfe69 some buying listviews 2012-03-29 15:20:35 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8 Merge branch 'master' into handlerupdate 2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Rushabh Mehta
bb769c5461 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:04:17 +02:00
Nabin Hait
13f789701e erro fixed in reorder_item 2012-03-28 11:33:25 +05:30
Nabin Hait
df77a1f619 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 11:32:58 +05:30
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890 Merge branch 'master' of github.com:webnotes/erpnext into shf_merge 2012-03-27 15:02:38 +05:30
Anand Doshi
063fe503db fix in queries in stock reconciliation 2012-03-26 22:32:34 +05:30
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +05:30
Rushabh Mehta
9d0ea6a5f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:25:22 +02:00
Anand Doshi
964dee9f18 fix in stock reconciliation 2012-03-26 10:54:05 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge
Conflicts:
	erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Rushabh Mehta
aaac794a8e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:08:04 +01:00
Nabin Hait
40d4b4d939 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:34:13 +05:30
Nabin Hait
2f82219fd0 item query changes in stock entry 2012-03-22 10:32:06 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Nabin Hait
bad13149b2 item query changes in stock entry 2012-03-22 10:24:26 +05:30
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Rushabh Mehta
c1f8af58d1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:29:06 +01:00
Nabin Hait
2a68bdf231 Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:50:14 +05:30
Rushabh Mehta
e07c38f5f5 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:06:38 +01:00
Nabin Hait
c37cb4d7c3 Update erpnext/stock/doctype/stock_entry/stock_entry.js 2012-03-21 15:35:41 +05:30
Nabin Hait
ac9adff1bb Update erpnext/stock/doctype/stock_entry/stock_entry.py 2012-03-21 15:35:04 +05:30
Nabin Hait
7ff14ede3c Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:33:50 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
0d1e918177 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 06:33:35 +01:00
Nabin Hait
39a24794eb Purpose others to other 2012-03-21 11:02:50 +05:30
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Nabin Hait
93654a3e04 stock entry: new purpose others added 2012-03-20 14:31:14 +05:30
Rushabh Mehta
8d8fa66e8f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31 Update erpnext/stock/doctype/delivery_note/delivery_note.js 2012-03-19 18:35:57 +05:30
Rushabh Mehta
a0a53c90f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557 Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt 2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9 Update erpnext/stock/doctype/delivery_note/delivery_note.txt 2012-03-19 10:20:22 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-14 13:25:19 +01:00
Anand Doshi
0e2461fa7c fix in qa inspection report link 2012-03-14 17:53:53 +05:30
Rushabh Mehta
0dd5da2299 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30
Nabin Hait
a528f54dcb serial no fld print_hide=0 2012-03-05 17:45:38 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Nabin Hait
07e9ff3d30 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05 field order changed 2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987 fix in delivery note detail double entry 2012-03-03 16:27:48 +05:30
Anand Doshi
146f17bf57 fix in delivery note submission - error caused due to default packed qty 2012-03-03 15:01:41 +05:30
Nabin Hait
0d155a9135 print hide issue 2012-03-02 14:57:44 +05:30
Nabin Hait
1841d8defa pr/dn no mapping through sales/pur return 2012-03-02 14:57:27 +05:30
Nabin Hait
88986ca007 column break print hide issue 2012-03-02 12:29:08 +05:30
Nabin Hait
760e91e949 print hide issue fixed in dn 2012-03-01 19:23:21 +05:30
Nabin Hait
f237a67183 transaction date issue in mapper 2012-03-01 18:03:47 +05:30
Anand Doshi
496d9a0980 Merge branch 'master' into navupdate 2012-03-01 14:55:22 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Nabin Hait
eaf144a545 form cleanup in pur cycle 2012-03-01 13:05:04 +05:30
Nabin Hait
e73db0e331 set serial_no status="In Store" if purchase return cancelled 2012-03-01 12:26:12 +05:30
Nabin Hait
bb4539e458 fixed conflict in version 2012-03-01 10:58:48 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
085617ed12 merge latest 2012-02-21 17:31:04 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Anand Doshi
ff33677624 Packing Slip Fix 2012-02-21 16:26:08 +05:30
Nabin Hait
1a7cd16dba reorder qty fld in item 2012-02-21 13:26:49 +05:30
Nabin Hait
5fe6760406 reorder level checking based on stores and reserved warehouse 2012-02-21 13:25:27 +05:30
Anand Doshi
e31d94ffc4 fix in control panel issue of sales and purchase return wizard 2012-02-17 10:27:46 +05:30
Nabin Hait
195b620787 callback issue in packing slip 2012-02-16 15:21:39 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
82cfe4b28d Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 15:30:24 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
b0fd0b3615 Edited through patch 2012-02-13 11:34:36 +05:30
Anand Doshi
15d2d45b36 Merge branch 'stable' into latest 2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b Debit/Credit note creation on purchase/sales return 2012-02-10 10:48:35 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Anand Doshi
99e7f3d7a4 Fix in valuation_control.py: eval requires a string. does not accept None. 2012-02-06 18:06:34 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Anand Doshi
4f948e03be Set docstatus as 2 for a purchase returned serial no 2012-02-01 11:27:36 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Anand Doshi
6afc6818a3 Check for duplicate challan number only in submitted purchase receipts 2012-01-31 17:21:04 +05:30
Anand Doshi
0717ca63b2 Fix in Purchase Return - Serial No. status issue 2012-01-31 16:20:37 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
c655e37f1a Fixes in production and stock modules 2012-01-25 09:58:06 +05:30
Anand Doshi
869c7bcbb2 Validate if another GRN exists having same supplier and challan no. - then throw exception 2012-01-19 18:31:21 +05:30
Anand Doshi
d3a23b5e8c Item Manufacturer/Supplier Details in item doctype 2012-01-17 18:46:43 +05:30
Anand Doshi
2bc9423cd1 Fix: Backflush issue due to missing BOM 2012-01-12 12:32:13 +05:30
Nabin Hait
c5d6bcbb8f Production module cleanup 2012-01-11 16:41:16 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Nabin Hait
a9cca2e2e9 error fixed in reorder indent 2012-01-05 14:10:14 +05:30
Nabin Hait
2abc6026f2 reload po-pr mapper 2012-01-05 11:24:49 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Nabin Hait
a21156d4d3 Removed msgprint 2011-12-30 11:16:15 +05:30
Nabin Hait
9e08c12a10 Default price list currency issue in delivery note fixed 2011-12-28 16:30:48 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Nabin Hait
9e8249fea1 Error fixed in bin 2011-12-22 12:54:13 +05:30
Nijil Y
f800dc02f1 fix 2011-12-21 16:20:39 +05:30
Nijil Y
07b03fbe09 Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 14:54:34 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
b36bebe9f0 Update erpnext/stock/doctype/bin/bin.py 2011-12-21 14:53:04 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +05:30
Nabin Hait
60fc54a9ba Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form 2011-12-20 18:59:26 +05:30
Nijil Y
04da8741c3 fix 2011-12-20 18:09:43 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
f21ceb283c Arranged field order in item table 2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount
appended in description
2011-12-13 15:57:09 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648 Discount in purchase cycle 2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5 Discount in purchase cycle 2011-12-08 16:09:18 +05:30
Nijil Y
630256f65b purchase recipt detail 2011-12-08 13:01:43 +05:30
Nabin Hait
142af06d19 update serial no incoming rate through landing cost wizard 2011-11-25 16:37:21 +05:30
Nabin Hait
28b793c88a incoming rate in serial no should be valuation rate instead of pur rate 2011-11-25 14:43:11 +05:30
Nijil
1530b93a6e purchase recipt 2011-11-24 15:53:56 +05:30
Nabin Hait
d6ed0748a3 help content midified 2011-11-24 14:47:18 +05:30
Nabin Hait
816383056f On deletion of warehouse, delete bin and sle if no qty 2011-11-23 12:58:03 +05:30
Nabin Hait
04176e62d8 fixed error in internal reco 2011-11-23 12:15:42 +05:30
Nabin Hait
fc26f64011 rewritten stock reconciliation 2011-11-21 17:13:53 +05:30
Nabin Hait
a8da0fecb5 Account link query changed in LC wizard 2011-11-17 14:47:05 +05:30
Nabin Hait
f164b269db Merge branch 'master' of github.com:webnotes/erpnext 2011-11-16 16:39:16 +05:30
Nabin Hait
9dd6330418 updated landed cost wizard 2011-11-16 16:38:55 +05:30
Nabin Hait
815a75f917 Rewritten landed cost wizard 2011-11-16 16:34:53 +05:30
Nabin Hait
b0fa2af45b Rewritten landed cost wizard 2011-11-16 16:20:37 +05:30
Anand Doshi
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Nabin Hait
e098481f45 Pull items from BOM for production issue 2011-11-10 10:56:53 +05:30
Nabin Hait
93ba4fbaa4 Fixes related to finding prev sle 2011-11-08 15:30:04 +05:30
Nabin Hait
235439df5b bin fixes for reposting future entries 2011-11-08 12:52:51 +05:30
Nabin Hait
76228f1c79 bin fixes for reposting future entries 2011-11-08 12:49:24 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Rushabh Mehta
9666e657ce fixed fpe in bin 2011-10-24 14:35:04 +05:30
Rushabh Mehta
06f432f4c7 fixes to valuation control 2011-10-24 11:59:22 +05:30
Rushabh Mehta
09dba5cf1d fixes to valuation control 2011-10-24 11:17:36 +05:30
Nabin Hait
57dd62d790 project column moved to item table in pur cycle 2011-10-20 19:19:07 +05:30
Nabin Hait
7762bdaf77 Letter head issue fixed in print format 2011-10-19 15:05:26 +05:30
Nabin Hait
0c005421fe Packing slip issues fixed and modified print format 2011-10-18 16:44:20 +05:30
Nabin Hait
a315a31919 Issue fixed in get stock qty if bin not exists 2011-10-17 15:01:31 +05:30
Nabin Hait
ee9efb568b flds added in mapper 2011-10-12 12:42:07 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163 packing slip related changes and test case for item 2011-10-11 13:57:48 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Rushabh Mehta
6edb4635e6 fixed bugs 2011-10-11 10:50:23 +05:30
Nabin Hait
15cad19d7c Serial No moved to Stock module from Support module 2011-10-10 17:10:24 +05:30
Nabin Hait
d08fe6099a map schedule date from po to pr 2011-10-07 12:11:19 +05:30
Nabin Hait
1971942db8 purchase tax mapping while pulling 2011-10-05 14:56:16 +05:30
Nabin Hait
88f9cb5d24 Test case added for MTN 2011-09-30 17:20:06 +05:30
Nabin Hait
79e8247d82 fix in stock ledger 2011-09-29 10:40:04 +05:30
Nabin Hait
fff40599e8 test field deleted from warehouse 2011-09-29 10:39:44 +05:30
Nabin Hait
8c9a5af231 Error fixed in bin 2011-09-16 12:51:19 +05:30
Nabin Hait
ecc75123e8 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:40:53 +05:30
Nabin Hait
6ae7f8fe58 check serial nos bin qty only if serial no entered into the document 2011-09-15 15:40:27 +05:30
Rushabh Mehta
53ba83158c fixes to startup 2011-09-15 15:06:23 +05:30
Rushabh Mehta
2773940db1 merged from master 2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30