Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,439 Commits 3 Branches 0 Tags 1 GiB
47c8ddb29b
Commit Graph

3753 Commits

Author SHA1 Message Date
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance 
fix: Pick List Enhancements
 2020-04-08 12:09:10 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance 2020-04-07 18:04:39 +05:30
rohitwaghchaure
0672b6b2e8
Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop 
fix: get serial nos based on posting date and time
 2020-04-07 18:02:49 +05:30
Nabin Hait
c9f08bed2b fix: set batch qty in batch master and test cases 2020-04-07 17:33:10 +05:30
Rohan Bansal
f92a5f32bd fix: set batch ID as title instead of item code 2020-04-07 17:33:10 +05:30
Rohan Bansal
d2d73e6cb7 fix: prioritize empty over expired as batch status 2020-04-07 17:33:10 +05:30
Rohan Bansal
ba03853b2a fix: update Batch schema 2020-04-07 17:33:10 +05:30
Rohan Bansal
ced78cf116 fix(stock): make requested changes 2020-04-07 17:33:10 +05:30
Rohan Bansal
92669eae66 fix(stock): batch list view statuses 2020-04-07 17:33:10 +05:30
Rohan Bansal
4a50c99867 fix(stock): Update batch quantity whenever stock in it is moved 2020-04-07 17:33:10 +05:30
Rohan Bansal
1bd7ea99f4 fix(batch): Only consider valid stock ledger entries 2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40 feat(batch): Add total quantity and dashboard to Batch 2020-04-07 17:33:10 +05:30
rohitwaghchaure
d313a239de
Merge pull request #21065 from marination/bin-requested-qty 
fix: Updated Bin Requested Qty logic
 2020-04-07 14:50:19 +05:30
Rohit Waghchaure
560f822dbf fix: get serial nos based on posting date and time 2020-04-07 14:42:02 +05:30
rohitwaghchaure
55ea142afd
Merge pull request #21181 from marination/purchase-receipt-scan-barcode 
feat: Scan Barcode in Purchase Receipt
 2020-04-07 14:36:56 +05:30
Marica
c732e9967d
fix: Validate Serial/Batch No naming series in Item itself (#21167) 
* fix: Validate Serial/Batch No naming series in Item itself

* fix: Consider '#' too
 2020-04-07 14:16:14 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop 
fix: material request type manufacture shows items with Is Purchase I…
 2020-04-07 12:06:18 +05:30
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30
Rohit Waghchaure
5317907e15 fix: material request type manufacture shows items with Is Purchase Item enabled 2020-04-06 17:53:16 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty 2020-04-06 15:54:51 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142) 
* fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer

* fix: Use cint
 2020-04-06 10:23:06 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM (#21054) 
* fix: Update Received Qty in Material Request as per Stock UOM

* fix: Process each PR only once

* fix: minor suggested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-03 10:07:06 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078) 
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
 2020-04-03 10:02:56 +05:30
marination
9a39bcd031 fix: Fixed Test Cases for Material Request 
- Reduce quantity on Material Transfer/Issue
- No effect on Customer Provided Material Request
 2020-04-02 19:36:21 +05:30
marination
686a09620d fix: Commonified code and added server side validation 2020-04-02 13:51:25 +05:30
marination
6f0dc8257c fix: Typo in stock level validation in Stock Ledger 2020-04-01 11:04:14 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom 
fix: UOM fixes in Sales Order,Material Request & Production Plan
 2020-03-31 16:24:37 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation 
feat: allow BOM to use same item as raw material (develop)
 2020-03-31 16:04:26 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation 
fix: allow target warehouses to be changed for work order stock entries (develop)
 2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac (#20995) 
* fix: warehouse_account_map not getting reset for diff company transaction

* fix: potential key errors while fetching warehouse_account_map

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 15:31:15 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry (#21083) 2020-03-31 15:26:45 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher (#21073) 
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
 2020-03-31 10:45:32 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev 
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
 2020-03-29 21:55:25 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter 
chore: [ux] filter warehouse based on company
 2020-03-28 21:09:46 +05:30
Saqib Ansari
ed3553f795 chore: [ux] filter warehouse based on company 2020-03-28 19:12:59 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev 2020-03-27 21:51:00 +05:30
Nabin Hait
fe000e20e8 fix: Add item defaults based on global settings only if default company and warehouse is mentioned 2020-03-27 19:24:47 +05:30
marination
815c36a4eb fix: Updated Bin Requested Qty logic 2020-03-26 15:46:27 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044) 2020-03-26 13:29:02 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable (#20999) 2020-03-26 13:23:49 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection (#20757) 
* feat: auto set batch no on serial no selection

* fix: dialog not shown if set warehouse selected

* fix: typo

* fix: merge conflict

* fix: callback no getting called after serial no selected

* fix: available batch qty not fetched without set_warehouse selected

* fix: item batch not synced with dialog batch table
 2020-03-26 13:18:57 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop 
fix: batch selection popup not coming for stock entry
 2020-03-24 16:32:21 +05:30
Rohit Waghchaure
5c1404e878 fix: batch selection popup not coming for stock entry 2020-03-24 11:40:03 +05:30
Rohan
7ea79933b3
fix: handle error handling (#20815) 2020-03-23 14:54:33 +05:30
Rohan
879c6bfb44
Merge branch 'develop' into dev-stock-entry-fg-validation 2020-03-23 14:50:02 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop 
fix: stock entry qty must be positive
 2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8 fix: add warehouse check for FG item 2020-03-20 18:49:11 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30