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

3024 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Rohit Waghchaure
5e4e2dbd03 fix: stock entry qty must be positive 2020-03-19 14:53:37 +05:30
Rohan
ce90848161 fix: allow target warehouses to be changed for work order stock entries 2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher (#20977) 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item (#20796) 
* fix: Item alternative must have similar fields as orignal item

* fix: Using db.get_values and meta instead of get_value and get_doc

* fix: Made code more DRY

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:56:59 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item (#20851) 2020-03-16 16:29:10 +05:30
Saqib
6ec4618914
fix: travis (#20903) 2020-03-11 16:04:00 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858) 2020-03-09 18:13:41 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup (#20772) 
* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma
 2020-03-02 15:51:14 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no (#20778) 
* feat: link serial no to batch no

* fix: test cases
 2020-03-02 15:02:58 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue (#20747) 2020-02-27 18:18:10 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689) 
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 13:21:14 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 (#20731) 2020-02-26 12:48:36 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order (#20717) 2020-02-26 11:28:08 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account 
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
 2020-02-26 10:49:48 +13:00
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644) 
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
 2020-02-20 12:57:21 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop 
fix: HSN/SAC Error while creating a new item and not selecting the fi…
 2020-02-19 19:23:10 +05:30