mbauskar
|
e0271a8331
|
[minor] ReferenceError:doc fixes for delivery note
|
2017-04-11 17:54:22 +05:30 |
|
mbauskar
|
236f7aac7f
|
[minor] track changes for transaction documents
|
2017-04-10 14:48:54 +05:30 |
|
Rushabh Mehta
|
9365641777
|
[added] frappe.safe_eval
|
2017-04-06 18:24:34 +05:30 |
|
Rushabh Mehta
|
9264313f0e
|
[fix] ordering for Edit Posting Time check
|
2017-04-05 12:49:01 +05:30 |
|
Rushabh Mehta
|
ffc807cd57
|
[minor] check below posting date in delivery note
|
2017-04-05 12:27:41 +05:30 |
|
Nabin Hait
|
c469f2c954
|
Get POS profile fix
|
2017-04-03 13:01:11 +05:30 |
|
Rushabh Mehta
|
f0b4562a95
|
[refactor] move purchase_common.js -> public/js/controllers/buying.js
|
2017-03-31 17:36:48 +05:30 |
|
Rushabh Mehta
|
cc8b2b2fdb
|
[fix] [refactor] demo for v8 and remove purchase common
|
2017-03-31 17:36:48 +05:30 |
|
Rushabh Mehta
|
9d9cb8b7b1
|
Revert "Add link field Package Code (fixes #8094)"
|
2017-03-31 14:35:23 +05:30 |
|
Nabin Hait
|
620bde7144
|
Updated modified date to reload sales uom
|
2017-03-30 19:50:45 +05:30 |
|
mbauskar
|
90d82be966
|
[minor] make varient fixes in item.js
|
2017-03-30 15:36:46 +05:30 |
|
Nabin Hait
|
f912317fae
|
Stock Balance: Show records based on all child item groups if filters set based on group node
|
2017-03-29 18:08:10 +05:30 |
|
Nabin Hait
|
e2fef16d78
|
Made join_table query optional based on item group filter
|
2017-03-29 17:51:05 +05:30 |
|
Javier Wong
|
41bf1ba7b3
|
[enhancement] Stock Balance Report - Added Item Group Filter
|
2017-03-29 17:51:05 +05:30 |
|
Makis Etzoglou
|
82e6bc45e4
|
tax_id add to Sales Order, Delivery Note, and Sales Invoice
|
2017-03-29 17:39:08 +05:30 |
|
rohitwaghchaure
|
afa93c624b
|
[fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203)
|
2017-03-29 17:29:20 +05:30 |
|
Nabin Hait
|
79731360ed
|
Merge pull request #8126 from kickapoo/issue8094
Add link field Package Code (fixes #8094)
|
2017-03-28 20:48:39 +05:30 |
|
Stavros Anastasiadis
|
b9bbb3c3db
|
Add link field Package Code (fixes #8093)
|
2017-03-28 16:09:52 +03:00 |
|
Neil Trini Lasrado
|
193c8919b9
|
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
|
2017-03-28 17:43:23 +05:30 |
|
Nabin Hait
|
6c3eb36c35
|
Merge branch 'develop' into customs_tariff_number
|
2017-03-28 13:51:44 +05:30 |
|
Nabin Hait
|
77b2fef41e
|
Fixed test cases
|
2017-03-28 13:39:26 +05:30 |
|
Dominik Ottenbreit
|
fc9ed4da24
|
Add Customs Tariff Number
|
2017-03-24 15:53:03 +01:00 |
|
Dominik Ottenbreit
|
6eb202ef3a
|
fix patch after test, fix variant based on manufacturer, add json for item_manufacturer
|
2017-03-24 14:49:52 +01:00 |
|
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 |
|